The package rpms/soci.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/soci.git/commit/?id=c88af8d2790d2....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit c88af8d2790d27a258b68c2304200dc4f35adb68
Author: Denis Arnaud <denis.arnaud_fedora(a)m4x.org>
Date: Sat Oct 26 14:18:48 2019 +0200
Exclude ARMv7hl, as theere is a weird GCC 7.1 related compilation error
diff --git a/soci.spec b/soci.spec
index 9f7d301..c1ec403 100644
--- a/soci.spec
+++ b/soci.spec
@@ -33,6 +33,10 @@ License: Boost
URL: http://%{name}.sourceforge.net
Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{full_version}.tar.gz
+# For some reason, as of October 2019, it does not compile on ARMv7hl
+# See
https://koji.fedoraproject.org/koji/taskinfo?taskID=38562666
+ExcludeArch: armv7hl
+
BuildRequires: dos2unix
BuildRequires: gcc gcc-c++
BuildRequires: cmake
commit 060bcf37ffcf119ca5c9c890edd3b75f698d8fd4
Author: Denis Arnaud <denis.arnaud_fedora(a)m4x.org>
Date: Sat Oct 26 12:56:29 2019 +0200
Update to upstream release 4.0.0-rc1
Slightly modernized the RPM spec file
diff --git a/.gitignore b/.gitignore
index 584c1ff..8d7d3eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
soci-*.tar.*
soci-*.zip
soci-*.src.rpm
-.gitignore
clog
.build-*
-/soci-3.?.?
+/soci-?.?.?
+/soci-?.?.?-rc*
/noarch
/x86_64
diff --git a/soci.spec b/soci.spec
index 0b4ec7e..9f7d301 100644
--- a/soci.spec
+++ b/soci.spec
@@ -32,10 +32,8 @@ Summary: The database access library for C++ programmers
License: Boost
URL: http://%{name}.sourceforge.net
Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{full_version}.tar.gz
-#Patch0: soci-001-fix-auto_ptr-c++11.patch
-#Patch1: sqlite-params-default-init-fix.patch
-
+BuildRequires: dos2unix
BuildRequires: gcc gcc-c++
BuildRequires: cmake
BuildRequires: boost-devel
@@ -184,8 +182,6 @@ library. The documentation is the same as at the %{name} web page.
%prep
%setup -q -n %{name}-%{full_version}
-#%%patch0 -p1
-#%%patch1 -p1
# Rename change-log and license file, so that they comply with
# packaging standard
@@ -195,7 +191,11 @@ mv LICENSE_1_0.txt COPYING
echo "2019-10-26:" > NEWS
echo "- Version 4.0.0-rc1" >> NEWS
echo "- See the ChangeLog file for more details." >> NEWS
-
+# Remove the spurious executable permission
+chmod a-x AUTHORS README ChangeLog COPYING NEWS
+find docs -type f -exec chmod a-x {} \;
+# Unix ends of line
+dos2unix AUTHORS README ChangeLog COPYING NEWS
%build
# Support for building tests.
@@ -210,7 +210,6 @@ echo "- See the ChangeLog file for more details." >>
NEWS
mkdir tmpbuild
pushd tmpbuild
-# -DCMAKE_INSTALL_PREFIX:PATH=$RPM_BUILD_ROOT
%cmake \
-DSOCI_EMPTY=%{?with_empty:ON}%{?without_empty:OFF} \
-DSOCI_SQLITE3=%{?with_sqlite3:ON}%{?without_sqlite3:OFF} \
@@ -219,17 +218,20 @@ pushd tmpbuild
-DSOCI_ODBC=%{?with_odbc:ON}%{?without_odbc:OFF} \
-DWITH_ORACLE=%{?with_oracle:ON %{?_with_oracle_incdir}
%{?_with_oracle_libdir}}%{?without_oracle:OFF} \
%{soci_testflags} ..
-make VERBOSE=1 %{?_smp_mflags}
+%make_build
popd
%install
-rm -rf $RPM_BUILD_ROOT
pushd tmpbuild
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
popd
-##
-# Remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
+
+# CMake helpers
+mkdir -p %{buildroot}%{_datadir}/%{name}
+mv -f %{buildroot}%{_prefix}/cmake %{buildroot}%{_datadir}/%{name}/CMake
+
+# Remove unpackaged files from the buildroot
+rm -f %{buildroot}%{_libdir}/*.a
%ldconfig_scriptlets
@@ -283,37 +285,33 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
%{?with_empty:%{_includedir}/%{name}/empty/}
%{_libdir}/lib%{name}_core.so
%{?with_empty:%{_libdir}/lib%{name}_empty.so}
+%{_datadir}/%{name}/CMake
%{?with_sqlite3:%files sqlite3-devel
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/sqlite3/
%{_libdir}/lib%{name}_sqlite3.so}
%{?with_mysql:%files mysql-devel
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/mysql
%{_libdir}/lib%{name}_mysql.so}
%{?with_postgresql:%files postgresql-devel
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/postgresql
%{_libdir}/lib%{name}_postgresql.so}
%{?with_odbc:%files odbc-devel
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/odbc/
%{_libdir}/lib%{name}_odbc.so}
%{?with_oracle:%files oracle-devel
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/oracle
@@ -321,12 +319,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
%files doc
-%doc AUTHORS ChangeLog COPYING NEWS README doc
+%doc AUTHORS ChangeLog COPYING NEWS README docs
%changelog
* Sat Oct 26 2019 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 4.0.0-1
- Update to upstream release 4.0.0-rc1
+- Slightly modernized the RPM spec file
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.3-20
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 6e86a4e9bc63beb3d4635f7d0e93886edeaf9f77
Author: Denis Arnaud <denis.arnaud_fedora(a)m4x.org>
Date: Sat Oct 26 02:21:02 2019 +0200
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(a)m4x.org> 4.0.0-rc1-1
+* Sat Oct 26 2019 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 4.0.0-1
- Update to upstream release 4.0.0-rc1
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.3-20
commit d91712d4c735a681ca43303536c98fdaea1fa5fa
Author: Denis Arnaud <denis.arnaud_fedora(a)m4x.org>
Date: Sat Oct 26 02:07:20 2019 +0200
Fixed typos in version scheme
diff --git a/soci.spec b/soci.spec
index 7f296e5..a0842a3 100644
--- a/soci.spec
+++ b/soci.spec
@@ -22,13 +22,15 @@
#
Name: soci
Version: 4.0.0
-Release: rc1%{?dist}
+%define rc_ver rc1
+%define full_version %{version}-%{rc_ver}
+Release: %{rc_ver}%{?dist}
Summary: The database access library for C++ programmers
License: Boost
URL: http://%{name}.sourceforge.net
-Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{release}.ta...
+Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{full_version}.tar.gz
#Patch0: soci-001-fix-auto_ptr-c++11.patch
#Patch1: sqlite-params-default-init-fix.patch
commit 2aa45fc56aa00190dc3131fd884c662e0ff20672
Author: Denis Arnaud <denis.arnaud_fedora(a)m4x.org>
Date: Sat Oct 26 01:55:05 2019 +0200
Fixed a typo in the source URL
diff --git a/soci.spec b/soci.spec
index e00a046..7f296e5 100644
--- a/soci.spec
+++ b/soci.spec
@@ -28,9 +28,9 @@ Summary: The database access library for C++ programmers
License: Boost
URL: http://%{name}.sourceforge.net
-Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{version}i-%{release}.t...
-Patch0: soci-001-fix-auto_ptr-c++11.patch
-Patch1: sqlite-params-default-init-fix.patch
+Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{release}.ta...
+#Patch0: soci-001-fix-auto_ptr-c++11.patch
+#Patch1: sqlite-params-default-init-fix.patch
BuildRequires: gcc gcc-c++
@@ -183,8 +183,8 @@ library. The documentation is the same as at the %{name} web page.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
+#%%patch0 -p1
+#%%patch1 -p1
# Rename change-log and license file, so that they comply with
# packaging standard
commit 464bf39db68f4f7d70d045f5a3f83a5ba11d313c
Author: Denis Arnaud <denis.arnaud_fedora(a)m4x.org>
Date: Sat Oct 26 01:43:57 2019 +0200
Update to upstream release 4.0.0-rc1
diff --git a/soci.spec b/soci.spec
index c161871..e00a046 100644
--- a/soci.spec
+++ b/soci.spec
@@ -21,19 +21,19 @@
##
#
Name: soci
-Version: 3.2.3
-Release: 20%{?dist}
+Version: 4.0.0
+Release: rc1%{?dist}
Summary: The database access library for C++ programmers
License: Boost
URL: http://%{name}.sourceforge.net
-Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:
http://downloads.sourceforge.net/%{name}/%{name}-%{version}i-%{release}.t...
Patch0: soci-001-fix-auto_ptr-c++11.patch
Patch1: sqlite-params-default-init-fix.patch
-BuildRequires: gcc-c++
+BuildRequires: gcc gcc-c++
BuildRequires: cmake
BuildRequires: boost-devel
@@ -324,6 +324,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
%changelog
+* Sat Oct 26 2019 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> 4.0.0-rc1-1
+- Update to upstream release 4.0.0-rc1
+
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.3-20
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
@@ -357,7 +360,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
* Fri Jan 27 2017 Jonathan Wakely <jwakely(a)redhat.com> - 3.2.3-10
- Rebuilt for Boost 1.63
-* Fri Jan 13 2017 Denis Arnaud Denis Arnaud <denis.arnaud_fedora(a)m4x.org> -
3.2.3-9
+* Fri Jan 13 2017 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 3.2.3-9
- Fixed compilation issues with C++11 (deprecation of auto_ptr)
* Mon May 16 2016 Jonathan Wakely <jwakely(a)redhat.com> - 3.2.3-8
diff --git a/sources b/sources
index 4e63e92..0f4df36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-acfbccf176cd20e06833a8037a2d3699 soci-3.2.3.tar.gz
+SHA512 (soci-4.0.0-rc1.tar.gz) =
14ff955e74cd293406451a7483b409e47bc92d16faf9f3db85680e36b6e499d2f85e82047b3a62eb76725117b79c26a415335a754973631c6c0f521309fc64a6