From 39109d40c0e8d8ea7ab881711e14f2ea2d9ed236 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Dec 10 2019 21:35:00 +0000 Subject: Version 1.3.0. --- diff --git a/.gitignore b/.gitignore index 10f4f6d..4163a16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/gf2x-1.1.tar.gz -/gf2x-1.2.tar.gz +/gf2x-*.tar.gz diff --git a/gf2x.rpmlintrc b/gf2x.rpmlintrc new file mode 100644 index 0000000..e2c1558 --- /dev/null +++ b/gf2x.rpmlintrc @@ -0,0 +1,5 @@ +# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON +# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors + +# The dictionary is missing some technical terms +addFilter(r'W: spelling-error .* trinomials') diff --git a/gf2x.spec b/gf2x.spec index 02a1661..744866f 100644 --- a/gf2x.spec +++ b/gf2x.spec @@ -1,11 +1,11 @@ Name: gf2x -Version: 1.2 -Release: 6%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: Polynomial multiplication over the binary field License: GPLv2+ URL: http://gf2x.gforge.inria.fr/ -Source0: https://gforge.inria.fr/frs/download.php/file/36934/%{name}-%{version}.tar.gz +Source0: https://gforge.inria.fr/frs/download.php/file/38243/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ @@ -22,7 +22,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Headers and library files for developing applications that use %{name}. %prep -%setup -q +%autosetup # Fix the FSF's address for badfile in `grep -FRl 'Fifth Floor' .`; do @@ -47,7 +47,8 @@ fixtimestamp() { # Support for pclmul would be nice, but not all x86s support it. %ifarch %{ix86} x86_64 %configure --disable-static --disable-hardware-specific-code --enable-sse2 \ - --disable-sse3 --disable-ssse3 --disable-sse41 --disable-pclmul + --disable-sse3 --disable-ssse3 --disable-sse41 --disable-pclmul \ + --disable-silent-rules --enable-fft-interface # Workaround broken configure macros sed -i.orig 's,/\* #undef \(GF2X_HAVE_SSE2_SUPPORT\) \*/,#define \1 1,' \ gf2x/gf2x-config.h gf2x/gf2x-config-export.h @@ -59,36 +60,46 @@ sed -e "s/GF2X_SSE2_AVAILABLE_TRUE=$/&'#'/" \ -e "/GF2X_SSE2_AVAILABLE_FALSE/s/'#'//" \ -i configure %configure --disable-static --disable-hardware-specific-code --disable-sse2 \ - --disable-sse3 --disable-ssse3 --disable-sse41 --disable-pclmul + --disable-sse3 --disable-ssse3 --disable-sse41 --disable-pclmul \ + --disable-silent-rules --enable-fft-interface %endif -# Eliminate hardcoded rpaths +# Get rid of undesirable hardcoded rpaths; workaround libtool reordering +# -Wl,--as-needed after all the libraries. sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + -e 's|CC="\(.*g..\)"|CC="\1 -Wl,--as-needed"|' \ -i libtool -make %{?_smp_mflags} --eval='.SECONDARY:' + +%make_build --eval='.SECONDARY:' %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install INSTALL="install -p" rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %check -LD_LIBRARY_PATH=$PWD/.libs make check - -%ldconfig_scriptlets +LD_LIBRARY_PATH=$PWD/.libs:$PWD/fft/.libs make check %files -%doc AUTHORS BUGS README TODO +%doc AUTHORS BUGS NEWS README TODO %license COPYING -%{_libdir}/lib%{name}.so.1 -%{_libdir}/lib%{name}.so.1.* +%{_libdir}/lib%{name}.so.3 +%{_libdir}/lib%{name}.so.3.* +%{_libdir}/lib%{name}-fft.so.3 +%{_libdir}/lib%{name}-fft.so.3.* %files devel +%doc ChangeLog %{_includedir}/%{name}/ %{_includedir}/%{name}.h %{_libdir}/lib%{name}.so +%{_libdir}/lib%{name}-fft.so +%{_libdir}/pkgconfig/%{name}.pc %changelog +* Tue Dec 10 2019 Jerry James - 1.3.0-1 +- Version 1.3.0 + * Thu Jul 25 2019 Fedora Release Engineering - 1.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 61695d1..2149997 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gf2x-1.2.tar.gz) = efddad2b99fa103fa77caed4a62f4a763dbff67bc7cf4527bbbf33ca826829e4a4f94e97454ef1a6498bdc2cee8934ff43f9dabf41a4a4f256721527a1dffa30 +SHA512 (gf2x-1.3.0.tar.gz) = 4991568032483e0ecb4552a698e5b7d09f80875e54584a0060a9473be1f87e4e8f714e657f08fec0b9fcf493d969408e5a9000f900623b3694aba1ecf6dc239e