[rpms/soci] update-to-4.1.4: define -> global

[rpms/soci] update-to-4.1.4: define -> global

[Denis Arnaud]

A new commit has been pushed.

Repo   : rpms/soci
Branch : update-to-4.1.4
Commit : 6e86a4e9bc63beb3d4635f7d0e93886edeaf9f77
Author : Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date   : 2019-10-26T02:21:02+02:00
Stats  : +9/-10 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/soci/c/6e86a4e9bc63beb3d4635f7d0e93886edeaf9f77?branch=update-to-4.1.4

Log:
define -> global

---
diff --git a/soci.spec b/soci.spec
index a0842a3..0b4ec7e 100644
--- a/soci.spec
+++ b/soci.spec
@@ -14,7 +14,7 @@
 %bcond_without odbc
 %bcond_with oracle
 
-%define _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1
+%global _default_oracle_dir /opt/oracle/app/oracle/product/11.1.0/db_1
 %{!?_with_oracle_incdir: %define _with_oracle_incdir --with-oracle-include=%{_default_oracle_dir}/rdbms/public}
 %{!?_with_oracle_libdir: %define _with_oracle_libdir --with-oracle-lib=%{_default_oracle_dir}/lib}
 #
@@ -22,9 +22,10 @@
 #
 Name:           soci
 Version:        4.0.0
-%define rc_ver rc1
-%define full_version %{version}-%{rc_ver}
-Release:        %{rc_ver}%{?dist}
+%global version_suffix rc1
+%global full_version %{version}-%{version_suffix}
+
+Release:        1%{?dist}
 
 Summary:        The database access library for C++ programmers
 
@@ -172,9 +173,7 @@ to install %{name}-oracle.}
 
 %package        doc
 Summary:        HTML documentation for the %{name} library
-%if 0%{?fedora} || 0%{?rhel} > 5
 BuildArch:      noarch
-%endif
 #BuildRequires:  tex(latex)
 #BuildRequires:  doxygen, ghostscript
 
@@ -184,7 +183,7 @@ library. The documentation is the same as at the %{name} web page.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{full_version}
 #%%patch0 -p1
 #%%patch1 -p1
 
@@ -193,8 +192,8 @@ library. The documentation is the same as at the %{name} web page.
 mv README.md README
 mv CHANGES ChangeLog
 mv LICENSE_1_0.txt COPYING
-echo "2013-04-13:" > NEWS
-echo "- Version 3.2.1" >> NEWS
+echo "2019-10-26:" > NEWS
+echo "- Version 4.0.0-rc1" >> NEWS
 echo "- See the ChangeLog file for more details." >> NEWS
 
 
@@ -326,7 +325,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 
 %changelog
-* Sat Oct 26 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> 4.0.0-rc1-1
+* Sat Oct 26 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> 4.0.0-1
 - Update to upstream release 4.0.0-rc1
 
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.3-20