diff --git a/.gitignore b/.gitignore index 8c8fbb6..20b17ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/cddlib-094g.tar.gz -/cddlib-094h.tar.gz -/cddlib-094i.tar.gz +/cddlib-*.tar.gz diff --git a/cddlib-sagemath.patch b/cddlib-sagemath.patch index 3354ac6..f8f1cc3 100644 --- a/cddlib-sagemath.patch +++ b/cddlib-sagemath.patch @@ -1,42 +1,26 @@ -diff -up cddlib-094h/src-gmp/Makefile.am.orig cddlib-094h/src-gmp/Makefile.am ---- cddlib-094h/src-gmp/Makefile.am.orig 2012-03-23 02:51:35.000000000 -0600 -+++ cddlib-094h/src-gmp/Makefile.am 2015-05-18 07:00:00.000000000 -0600 -@@ -11,7 +11,8 @@ testcdd1_gmp \ - testcdd2_gmp \ - testlp1_gmp \ - testlp2_gmp \ --testlp3_gmp -+testlp3_gmp \ -+cdd_both_reps_gmp - #cddmathlink - - scdd_gmp_SOURCES = simplecdd.c -@@ -27,6 +28,7 @@ testcdd2_gmp_SOURCES = tes - testlp1_gmp_SOURCES = testlp1.c - testlp2_gmp_SOURCES = testlp2.c - testlp3_gmp_SOURCES = testlp3.c -+cdd_both_reps_gmp_SOURCES = cdd_both_reps.c - # cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c - - LDADD = ../lib-src-gmp/libcddgmp.la -diff -up cddlib-094h/src/Makefile.am.orig cddlib-094h/src/Makefile.am ---- cddlib-094h/src/Makefile.am.orig 2012-03-23 02:51:13.000000000 -0600 -+++ cddlib-094h/src/Makefile.am 2015-05-18 07:00:00.000000000 -0400 -@@ -11,7 +11,8 @@ testshoot \ - testcdd2 \ +diff -up cddlib-0.94j/src/Makefile.am.orig cddlib-0.94j/src/Makefile.am +--- cddlib-0.94j/src/Makefile.am.orig 2018-05-23 02:18:27.000000000 -0600 ++++ cddlib-0.94j/src/Makefile.am 2018-09-30 20:47:15.877935594 -0600 +@@ -12,6 +12,7 @@ testcdd2 \ testlp1 \ testlp2 \ --testlp3 -+testlp3 \ -+cdd_both_reps - #cddmathlink + testlp3 \ ++cdd_both_reps \ + cddexec - scdd_SOURCES = simplecdd.c -@@ -27,6 +28,7 @@ testcdd2_SOURCES = testcdd - testlp1_SOURCES = testlp1.c - testlp2_SOURCES = testlp2.c - testlp3_SOURCES = testlp3.c -+cdd_both_reps_SOURCES = cdd_both_reps.c - # cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c + # Build these binaries but do not install them; these are sample applications +diff -up cddlib-0.94j/src/Makefile.gmp.am.orig cddlib-0.94j/src/Makefile.gmp.am +--- cddlib-0.94j/src/Makefile.gmp.am.orig 2018-05-23 02:18:27.000000000 -0600 ++++ cddlib-0.94j/src/Makefile.gmp.am 2018-09-30 20:46:40.062003312 -0600 +@@ -72,6 +72,11 @@ testlp3_gmp_SOURCES = testlp3.c + testlp3_gmp_LDADD = $(gmp_ldflags) + testlp3_gmp_CPPFLAGS = $(gmp_cppflags) - LDADD = ../lib-src/libcdd.la ++bin_PROGRAMS += cdd_both_reps_gmp ++cdd_both_reps_gmp_SOURCES = cdd_both_reps.c ++cdd_both_reps_gmp_LDADD = $(gmp_ldflags) ++cdd_both_reps_gmp_CPPFLAGS = $(gmp_cppflags) ++ + bin_PROGRAMS += cddexec_gmp + cddexec_gmp_SOURCES = cddexec.c + cddexec_gmp_LDADD = $(gmp_ldflags) diff --git a/cddlib.spec b/cddlib.spec index 2c879cc..ca282fe 100644 --- a/cddlib.spec +++ b/cddlib.spec @@ -1,10 +1,11 @@ Name: cddlib -Version: 094i -Release: 2%{?dist} +Epoch: 1 +Version: 0.94j +Release: 1%{?dist} Summary: A library for generating all vertices in convex polyhedrons License: GPLv2+ URL: https://www.inf.ethz.ch/personal/fukudak/cdd_home/ -Source0: ftp://ftp.math.ethz.ch/users/fukudak/cdd/%{name}-%{version}.tar.gz +Source0: https://github.com/cddlib/cddlib/releases/download/%{version}/%{name}-%{version}.tar.gz # Extracted from http://www.sagemath.org/packages/standard/cddlib-094f.p11.spkg Source1: cdd_both_reps.c # Patch from sagemath to build and test cdd_both_reps @@ -37,7 +38,7 @@ a linear function over P. %package devel Summary: Headers for cddlib Requires: gmp-devel%{?_isa} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = 1:%{version}-%{release} %description devel Include files for cddlib. @@ -52,7 +53,7 @@ Static libraries for cddlib. %package tools Summary: Sample binaries that use cddlib -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = 1:%{version}-%{release} %description tools Sample binaries that use cddlib. @@ -67,12 +68,6 @@ autoreconf -ifs # Install sagemath extra source cp -p %{SOURCE1} src -ln -sf ../src/cdd_both_reps.c src-gmp/cdd_both_reps.c - -# Clean up the examples -rm -rf src/~ src-gmp/~ -find . -name .DS_Store\* -exec rm -f {} \+ -rm doc/cddlibman.{aux,blg,dvi,log,pdf,ps} # Fix the FSF's address for f in `find . -type f -print0 | xargs -0 grep -Fl '675 Mass'`; do @@ -83,38 +78,38 @@ for f in `find . -type f -print0 | xargs -0 grep -Fl '675 Mass'`; do rm -f $f.orig done -# The 094h release shipped with some debug flags accidentally left on -for fil in lib-src/cddlp.c lib-src-gmp/cddlp.c lib-src-gmp/cddlp_f.c; do - sed -ri.orig 's/(localdebug=ddf?_)TRUE/\1FALSE/g' $fil - touch -r ${fil}.orig $fil - rm -f ${fil}.orig -done +# Force rebuilding of the documentation +rm -f doc/cddlibman.pdf %build %configure -# Get rid of undesirable 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 -# Configure finds libgmp and tries to link it with everything. -sed -i 's/ -lgmp//' lib-src/Makefile - make %{?_smp_mflags} -cd doc -pdflatex cddlibman.tex -pdflatex cddlibman.tex + +# Need one more invocation of pdflatex to get cross references correct +pushd doc +pdflatex cddlibman +popd %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" mkdir $RPM_BUILD_ROOT%{_includedir}/cddlib -mv $RPM_BUILD_ROOT%{_includedir}/{cdd,cdd_f,cddmp,cddmp_f,cddtypes,cddtypes_f,setoper}.h \ +mv $RPM_BUILD_ROOT%{_includedir}/{cdd,cdd_f,cddmp,cddmp_f,cddtypes,cddtypes_f,setoper,splitmix64}.h \ $RPM_BUILD_ROOT%{_includedir}/cddlib/ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +# Do not prematurely install documentation +rm -fr $RPM_BUILD_ROOT%{_pkgdocdir} + %ldconfig_scriptlets @@ -141,6 +136,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %changelog +* Mon Oct 1 2018 Jerry James - 0.94j-1 +- New upstream release +- Add Epoch to deal with new dot in the version number + * Thu Jul 12 2018 Fedora Release Engineering - 094i-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index a255caf..4147ebf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cddlib-094i.tar.gz) = 25a896110246ddfe210d2b96f0380ef6fe78fb84852fef8e055139774dc95155a0459f7998468e9251aaaa227bb2d0036c1dc7d4ff42522889cea181af8e3a24 +SHA512 (cddlib-0.94j.tar.gz) = b82d5e06538a29143a79f7ba7287a1784292e28f086071041e500fd81387a30c3fca6fae9049752f57b62d50b385d73681276d42d24941e3a43893da00452ea6