From bce03662b39724bb8f6dc37673cc3ce8a952578a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Aug 11 2018 04:16:05 +0000 Subject: New upstream release. --- diff --git a/normaliz-cocoa.patch b/normaliz-cocoa.patch new file mode 100644 index 0000000..a8003b5 --- /dev/null +++ b/normaliz-cocoa.patch @@ -0,0 +1,11 @@ +--- source/libnormaliz/nmz_integral.cpp.orig 2018-06-27 03:42:43.000000000 -0600 ++++ source/libnormaliz/nmz_integral.cpp 2018-08-09 09:50:27.587238270 -0600 +@@ -403,7 +403,7 @@ try{ + vector test_grading=C.getSublattice().to_sublattice_dual_no_div(C.getGrading()); + Integer corr_factor=v_gcd(test_grading); + mpz_class corr_mpz=convertTo(corr_factor); +- I*=BigInt(corr_mpz.get_mpz_t()); ++ I*=BigIntFromMPZ(corr_mpz.get_mpz_t()); + + string result="Integral"; + if(do_virt_mult) diff --git a/normaliz.spec b/normaliz.spec index c563f86..b01503a 100644 --- a/normaliz.spec +++ b/normaliz.spec @@ -1,11 +1,13 @@ Name: normaliz -Version: 3.5.4 -Release: 3%{?dist} +Version: 3.6.2 +Release: 1%{?dist} Summary: A tool for mathematical computations License: GPLv3+ URL: https://www.normaliz.uni-osnabrueck.de/ Source0: https://github.com/Normaliz/Normaliz/releases/download/v%{version}/%{name}-%{version}.tar.gz +# Adapt to recent versions of cocoalib +Patch0: %{name}-cocoa.patch BuildRequires: boost-devel BuildRequires: cocoalib-devel @@ -40,7 +42,7 @@ Header files and library links to develop applications that use the Normaliz internals as a library (libnormaliz). %prep -%setup -q +%autosetup -p0 # Use our compiler flags sed -i 's|-O3|%{optflags} -I%{_includedir}/gfanlib|' source/CMakeLists.txt @@ -51,6 +53,13 @@ if [ "%{_libdir}" = "%{_prefix}/lib64" ]; then sed -i 's,lib/,lib64/,' source/cmake/Modules/FindCOCOA.cmake fi +# The 3.6 versions up through 3.6.2 failed to change the version +minornum=$(cut -d. -f2 <<< %{version}) +patchnum=$(cut -d. -f3 <<< %{version}) +sed -e "s/\(VERSION_MINOR \)5/\1${minornum}/" \ + -e "s/\(VERSION_PATCH \)4/\1${patchnum}/" \ + -i source/CMakeLists.txt + %build if [ "%{_libdir}" = "/usr/lib64" ]; then LIBDEF="-DLIB_SUFFIX=64" @@ -89,11 +98,11 @@ chrpath -d %{buildroot}%{_bindir}/normaliz %ldconfig_scriptlets -n libnormaliz %files -%doc docs/* doc/Normaliz.pdf +%doc CHANGELOG docs/* doc/Normaliz.pdf %{_bindir}/normaliz %files -n libnormaliz -%license source/COPYING +%license COPYING %{_libdir}/libnormaliz.so.* %files -n libnormaliz-devel @@ -102,6 +111,9 @@ chrpath -d %{buildroot}%{_bindir}/normaliz %{_includedir}/libnormaliz/ %changelog +* Fri Aug 10 2018 Jerry James - 3.6.2-1 +- New upstream release + * Fri Jul 13 2018 Fedora Release Engineering - 3.5.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index f1702e7..2ab3871 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (normaliz-3.5.4.tar.gz) = 91d532cd770e46e296b0c7a693be7594707e6a90faecf816a398f91302d67f9480271b8a9f530106d4f383a1cad2c3337ecf10843d0329f6418bf6f4c2eb2691 +SHA512 (normaliz-3.6.2.tar.gz) = 0559d3a69890b85c709542b53050d509d15b29ca55a58a0d50962470f73f429a8f4b3e8558c174df3e8c05fb13f45eadec0054b60a85ce5ad9e72d23408df826