diff --git a/.gitignore b/.gitignore index 55c5b15..5ee070e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ crypt-1.17.tar.bz2 /libtomcrypt-cd6e602.tar.gz /libtomcrypt-ab8c5b8.tar.gz /libtomcrypt-32d60ac.tar.gz +/libtomcrypt-0ceb1c1.tar.gz diff --git a/libtomcrypt.spec b/libtomcrypt.spec index 2504ffc..f44aae9 100644 --- a/libtomcrypt.spec +++ b/libtomcrypt.spec @@ -1,12 +1,12 @@ # Post rc3 from the 1.18 release branch: # https://github.com/libtom/libtomcrypt/tree/release/1.18.0 -%global commit0 32d60ac134711d4743e1bd67bbdad0a89074d66b -%global date 20170910 +%global commit0 0ceb1c1213afea1ef96f23d9791a245fe8f4e04e +%global date 20170915 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: libtomcrypt Version: 1.18 -Release: 1%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 2%{?shortcommit0:.%{date}git%{shortcommit0}}%{?dist} Summary: A comprehensive, portable cryptographic toolkit License: Public Domain or WTFPL URL: http://www.libtom.net/ @@ -16,14 +16,12 @@ Source0: https://github.com/libtom/%{name}/archive/%{commit0}/%{name}-%{c BuildRequires: ghostscript BuildRequires: libtommath-devel >= 1.0 BuildRequires: libtool - -%if 0%{?fedora} || 0%{?rhel} >= 7 -BuildRequires: tex(dvips) -BuildRequires: tex(latex) -%else -BuildRequires: tetex-dvips -BuildRequires: tetex-latex -%endif +BuildRequires: texlive-latex-bin-bin +BuildRequires: texlive-makeindex-bin +BuildRequires: texlive-mfware-bin +BuildRequires: tex(cmr10.tfm) +BuildRequires: tex(fancyhdr.sty) +BuildRequires: tex(hyphen.tex) %description A comprehensive, modular and portable cryptographic toolkit that provides @@ -57,42 +55,33 @@ The %{name}-doc package contains documentation for use with %{name}. %prep %setup -qn %{name}-%{commit0} -# Remove spurious permissions -find . -name '*.c' -exec chmod 644 {} \; - %build -export CFLAGS="%{optflags}" +export PREFIX="%{_prefix}" +export INCPATH="%{_includedir}" +export LIBPATH="%{_libdir}" +export LDFLAGS="%{?__global_ldflags}" export EXTRALIBS="-ltommath" -%make_build -f makefile.shared library -%make_build -f makefile docs +export CFLAGS="%{optflags} -DLTM_DESC -DUSE_LTM" +%make_build V=1 -f makefile.shared library +%make_build V=1 -f makefile docs +%make_build V=1 -f makefile.shared test -#%check -#export CFLAGS="%{optflags} -DLTM_DESC -DUSE_LTM" -#export EXTRALIBS="-ltommath" -#export LDFLAGS="-ltommath" -#%make_build -f makefile.shared test -#./test +%check +./test %install -export INSTALL_USER=$(id -un) -export INSTALL_GROUP=$(id -gn) -export INCPATH="%{_includedir}" -export LIBPATH="%{_libdir}" -%make_install -f makefile.shared +%make_install INSTALL_OPTS="-m 755" INCPATH="%{_includedir}" LIBPATH="%{_libdir}" -f makefile.shared + +# Remove unneeded files +find %{buildroot} -name '*.la' -delete +find %{buildroot} -name '*.a' -delete # Fix pkgconfig path sed -i \ -e 's|^prefix=.*|prefix=%{_prefix}|g' \ - -e 's|^libdir=.*|libdir=%{_libdir}|g' \ + -e 's|^libdir=.*|libdir=${prefix}/%{_lib}|g' \ %{buildroot}%{_libdir}/pkgconfig/%{name}.pc -# Make library executable -chmod 755 %{buildroot}%{_libdir}/%{name}.so.* - -# Remove unneeded files -find %{buildroot} -name '*.la' -delete -find %{buildroot} -name '*.a' -delete - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -110,6 +99,12 @@ find %{buildroot} -name '*.a' -delete %doc doc/crypt.pdf %changelog +* Sun Sep 17 2017 Simone Caronni - 1.18-2.20170915git0ceb1c1 +- Update to latest snapshot post rc3. +- Remove RHEL 6 support. +- Clean up SPEC file. +- Trim changelog. + * Mon Sep 11 2017 Simone Caronni - 1.18-1.20170910git32d60ac - Update to latest snapshot (post rc3). - Version is now at 1.18. @@ -156,93 +151,3 @@ find %{buildroot} -name '*.a' -delete * Thu Feb 04 2016 Fedora Release Engineering - 1.17-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.17-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 1.17-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.17-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 15 2014 Paul Howarth - 1.17-22 -- Add two-key 3DES support, needed by pycrypto. - -* Sun Sep 29 2013 Simone Caronni - 1.17-21 -- Move headers to default location. - -* Thu Aug 08 2013 Simone Caronni - 1.17-20 -- Make doc package noarch. -- Remove executable bits from LICENSE file and source files. -- Require isaed library for devel subpackage. -- Require CVE fixed libtommath library. - -* Sat Aug 03 2013 Fedora Release Engineering - 1.17-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jun 06 2013 Simone Caronni - 1.17-18 -- Fix build requirements for RHEL 6 and Fedora 17. - -* Tue Jun 04 2013 David Woodhouse - 1.17-17 -- Fix tex/latex BuildRequires - -* Mon Jun 03 2013 Simone Caronni - 1.17-16 -- Update SPEC, remove obsolete tags, fix formatting. -- Add patch for pkg config (libtomcrypt.pc). -- Add correct build requirements for Fedora 19+ and RHEL 7+. - -* Thu Feb 14 2013 Fedora Release Engineering - 1.17-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 1.17-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 1.17-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 1.17-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jul 25 2009 Fedora Release Engineering - 1.17-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 1.17-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Feb 19 2008 Fedora Release Engineering - 1.17-9 -- Autorebuild for GCC 4.3 - -* Sun Nov 25 2007 Jeremy Hinegardner - 1.17-8 -- Resolve multilib conflicts from Bug #342431 by splitting out - documentation to libtomcrypt-docs subpackage -- fix rpmlint Summary: warning - -* Wed Aug 29 2007 Fedora Release Engineering - 1.17-7 -- Rebuild for selinux ppc32 issue. - -* Tue Jul 10 2007 Jeremy Hinegardner - 1.17-6 -- turn off optimization for ppc64 to work around Bug #239003 - -* Sat Jun 30 2007 Jeremy Hinegardner - 1.17-5 -- removed package name from summary -- fixed URL and Source0 links -- really fixed linkage flag this time, added it to the build section not - just the check. - -* Fri Jun 29 2007 Jeremy Hinegardner - 1.17-4 -- fixed linkage flag with correct tommath name -- added check section -- removed libtomcrypt_prof libraries from package -- remove package name from summary - -* Wed Jun 27 2007 Jeremy Hinegardner - 1.17-3 -- create makefile patch to ensure RPM_OPT_FLAGS is honored -- install headers into _includedir/tomcrypt -- add location of libtommath headers to CFLAGS - -* Sat Jun 23 2007 Jeremy Hinegardner - 1.17-2 -- update build process to pass LIBPATH to make - -* Fri Jun 22 2007 Jeremy Hinegardner - 1.17-1 -- Initial spec file creation diff --git a/sources b/sources index f3e8391..56af8e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libtomcrypt-32d60ac.tar.gz) = 245eb0c28cbe9e0b38146d4a53148b7bde456b6f3d40930d49de436be02ac4b3a9e55db5525f02033a072be4f958079d6b8d9c21da0fd50adc1645f866378132 +SHA512 (libtomcrypt-0ceb1c1.tar.gz) = dc80ea69789c7c0b5e88e1c5fc784e4a779748a8653fddc6ce676bc9710ad51da99ead3e7010029c28178372488fa6340813a22b845a38cb1a5feab5f3f7a28d