The package rpms/cryptopp.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/cryptopp.git/commit/?id=c684a5f20de2....
Change: +%ifarch i686 x86_64
Thanks.
Full change: ============
commit c684a5f20de2836d0c538247d4db3c466109815d Author: Nicolas Chauvet kwizart@gmail.com Date: Mon Jan 8 21:20:36 2018 +0100
Add to cryptopp vanilla sources
diff --git a/.gitignore b/.gitignore index b8ae719..deed2ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -cryptopp-5.6.1.svn479.tar.bz2 -/cryptopp561.zip -/cryptopp562.zip -/cryptopp563.zip +cryptopp*.zip diff --git a/cryptopp-soversion.patch b/cryptopp-soversion.patch new file mode 100644 index 0000000..65a5b03 --- /dev/null +++ b/cryptopp-soversion.patch @@ -0,0 +1,12 @@ +diff -up cryptopp-5.6.5/GNUmakefile.soversion cryptopp-5.6.5/GNUmakefile +--- cryptopp-5.6.5/GNUmakefile.soversion 2016-10-11 01:49:54.000000000 +0200 ++++ cryptopp-5.6.5/GNUmakefile 2018-02-19 16:15:40.891402342 +0100 +@@ -404,7 +404,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) + # Full version suffix for shared library + SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) + # Different patchlevels are compatible, minor versions are not +-SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR) ++SOLIB_COMPAT_SUFFIX=.6 + SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX) + endif # HAS_SOLIB_VERSION + diff --git a/cryptopp.pc b/cryptopp.pc index 418b93e..1e6a73a 100644 --- a/cryptopp.pc +++ b/cryptopp.pc @@ -4,7 +4,7 @@ libdir=@LIBDIR@
Name: Crypto++ Description: A free C++ class library of cryptographic schemes -Version: 5.6.3 +Version: @VERSION@ URL: http://www.cryptopp.com Requires: Conflicts: diff --git a/cryptopp.spec b/cryptopp.spec index 2aa8da7..de704a9 100644 --- a/cryptopp.spec +++ b/cryptopp.spec @@ -1,22 +1,22 @@ Name: cryptopp -Version: 5.6.3 -Release: 11%{?dist} +Version: 5.6.5 +Release: 1%{?dist} Summary: C++ class library of cryptographic schemes License: Boost -Group: System Environment/Libraries URL: http://www.cryptopp.com/ -Source0: http://www.cryptopp.com/cryptopp563.zip +Source0: http://www.cryptopp.com/cryptopp565.zip Source1: cryptopp.pc -Patch0: cryptopp-autotools.patch -# Debian patch installs TestVectors and TestData in /usr/share/cryptopp/ -# http://groups.google.com/group/cryptopp-users/browse_thread/thread/6fe219234... -Patch1: cryptopp-data-files-location.patch -Patch2: cryptopp-fix_the_Rijndael_timing_attack_counter_measure.patch -Patch3: cryptopp-improve_constant_propagation.patch -# Upstream patch to fix RDSEED test exception -# http://comments.gmane.org/gmane.comp.encryption.cryptopp/8028 -Patch4: cryptopp-5.6.3-fix-RDSEED-test-exception.patch -BuildRequires: doxygen, autoconf, libtool +# Upstream doesn't use a common scheme for ABI compatibility +# 5.6.x serie is compatible and uses a .5.6 so number +# ... but we previously forged a SONAME using .6 so keep it that way. +Patch0: cryptopp-soversion.patch + +BuildRequires: doxygen +BuildRequires: gcc-c++ +%ifarch i686 x86_64 +BuildRequires: nasm +%endif +
%description Crypto++ Library is a free C++ class library of cryptographic schemes. @@ -28,9 +28,8 @@ compilation, the individual files in it are in the public domain.
%package devel Summary: Header files and development documentation for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig +Requires: %{name}%{?_isa} = %{version}-%{release} + %description devel Crypto++ Library is a free C++ class library of cryptographic schemes.
@@ -39,7 +38,6 @@ for %{name}.
%package doc Summary: Documentation for %{name} -Group: Documentation BuildArch: noarch
%description doc @@ -49,8 +47,7 @@ This package contains documentation for %{name}.
%package progs Summary: Programs for manipulating %{name} routines -Group: Development/Tools -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release}
%description progs Crypto++ Library is a free C++ class library of cryptographic schemes. @@ -58,55 +55,50 @@ Crypto++ Library is a free C++ class library of cryptographic schemes. This package contains programs for manipulating %{name} routines.
%prep -%setup -q -c -rm -f GNUmakefile -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p0 -autoreconf --verbose --force --install +%autosetup -c -p1 perl -pi -e 's/\r$//g' License.txt Readme.txt
%build -%configure --disable-static - -make %{?_smp_mflags} +%ifarch i686 x86_64 +./rdrand-nasm.sh +%endif +%make_build -f GNUmakefile CXXFLAGS="-DNDEBUG %{optflags} -fPIC -DPIC" LDFLAGS="%{?__global_ldflags}" shared cryptest.exe doxygen
%install -rm -rf $RPM_BUILD_ROOT - -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c " -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +%make_install INSTALL="install -p -c " PREFIX="%{_prefix}" LIBDIR="%{_libdir}"
# Install the pkg-config file install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc # Fill in the variables sed -i "s|@PREFIX@|%{_prefix}|g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc sed -i "s|@LIBDIR@|%{_libdir}|g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc +sed -i "s|@VERSION@|%{version}}|g" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cryptopp.pc
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/TestVectors mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/TestData install -m644 TestVectors/* $RPM_BUILD_ROOT%{_datadir}/%{name}/TestVectors install -m644 TestData/* $RPM_BUILD_ROOT%{_datadir}/%{name}/TestData
-rm -f $RPM_BUILD_ROOT%{_bindir}/cryptestcwd +# Rename cryptest +mv $RPM_BUILD_ROOT%{_bindir}/cryptest.exe \ + $RPM_BUILD_ROOT%{_bindir}/cryptest
-%check -./cryptestcwd v
-%post -p /sbin/ldconfig +%check +./cryptest.exe v
-%postun -p /sbin/ldconfig +%ldconfig_scriptlets
%files %{_libdir}/libcryptopp.so.6* +%{_libdir}/libcryptopp.so.5.6* %doc License.txt Readme.txt
%files devel %{_includedir}/cryptopp %{_libdir}/libcryptopp.so +%exclude %{_libdir}/libcryptopp.a %{_libdir}/pkgconfig/cryptopp.pc
%files doc @@ -117,6 +109,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/cryptestcwd %{_datadir}/%{name}
%changelog +* Mon Feb 19 2018 Nicolas Chauvet kwizart@gmail.com - 5.6.5-1 +- Update to 5.6.5 (vanilla) + * Wed Feb 07 2018 Fedora Release Engineering releng@fedoraproject.org - 5.6.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources index bedba9b..3b09c58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aea6483a1af49497dc7900d8e09a05da cryptopp563.zip +SHA512 (cryptopp565.zip) = f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
commit 754ee1d68f7dd3a240133ef4d0479dfd748f95af Author: Fedora Release Engineering releng@fedoraproject.org Date: Wed Feb 7 05:59:16 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/cryptopp.spec b/cryptopp.spec index a3d794b..2aa8da7 100644 --- a/cryptopp.spec +++ b/cryptopp.spec @@ -1,6 +1,6 @@ Name: cryptopp Version: 5.6.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: C++ class library of cryptographic schemes License: Boost Group: System Environment/Libraries @@ -117,6 +117,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/cryptestcwd %{_datadir}/%{name}
%changelog +* Wed Feb 07 2018 Fedora Release Engineering releng@fedoraproject.org - 5.6.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering releng@fedoraproject.org - 5.6.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild