diff --git a/0001-Fix-compiler-warnings-in-matrix.cpp.patch b/0001-Fix-compiler-warnings-in-matrix.cpp.patch new file mode 100644 index 0000000..13fca96 --- /dev/null +++ b/0001-Fix-compiler-warnings-in-matrix.cpp.patch @@ -0,0 +1,48 @@ +From c67e8c9246ba6e51fb9f35da4bec8e23a744f4f7 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 25 Dec 2017 14:21:54 +0100 +Subject: [PATCH] Fix compiler warnings in matrix.cpp + +Add a return clause, because assert() may be replaced with nothing by +the preprocessor under -DNDEBUG. + +matrix.cpp: In member function 'std::vector libnormaliz::Matrix::VxM_div(const +std::vector&, const Integer&, bool&) const [with Integer = double]': +matrix.cpp:942:1: warning: no return statement in function returning non-void [-Wreturn-type] +matrix.cpp:2262:1: warning: no return statement in function returning non-void [-Wreturn-type] +matrix.cpp:2696:1: warning: no return statement in function returning non-void [-Wreturn-type] +--- + source/libnormaliz/matrix.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/source/libnormaliz/matrix.cpp b/source/libnormaliz/matrix.cpp +index ebec2958..c551c4d2 100644 +--- a/source/libnormaliz/matrix.cpp ++++ b/source/libnormaliz/matrix.cpp +@@ -939,6 +939,7 @@ vector Matrix::VxM_div(const vector& v, const Integer + template<> + vector Matrix::VxM_div(const vector& v, const nmz_float& divisor, bool& success) const{ + assert(false); ++ return {}; + } + + //--------------------------------------------------------------------------- +@@ -2259,6 +2260,7 @@ template<> + bool Matrix::SmithNormalForm_inner(size_t& rk, Matrix& Right){ + + assert(false); ++ return {}; + } + + // Converts "this" into Smith normal form, returns column transformation matrix +@@ -2693,6 +2695,7 @@ vector Matrix::optimal_subdivision_point() const{ + template<> + vector Matrix::optimal_subdivision_point_inner() const{ + assert(false); ++ return {}; + } + + /* +-- +2.15.1 + diff --git a/normaliz-3.4.1.tar.gz b/normaliz-3.4.1.tar.gz deleted file mode 100644 index 8d2ec8b..0000000 --- a/normaliz-3.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20d1c0061ed589eb61591e04ef3449f5a54c4f4c9c191e7c53ce05468c96e415 -size 3468964 diff --git a/normaliz-3.5.0.tar.gz b/normaliz-3.5.0.tar.gz new file mode 100644 index 0000000..b87f0f3 --- /dev/null +++ b/normaliz-3.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:731c0ed673a0124149e1950be389694d5ed3d0e9810515380ba537aec03e4aca +size 3912117 diff --git a/normaliz.changes b/normaliz.changes index d9430c9..8e1db62 100644 --- a/normaliz.changes +++ b/normaliz.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 25 13:13:38 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 3.5.0 + * Euclidean volume of polytopes + * Expansion of series + * Projection of cones and polyhedra + * LLL reduced coordinates for project-and-lift +- Add 0001-Fix-compiler-warnings-in-matrix.cpp.patch + ------------------------------------------------------------------- Wed Nov 22 09:25:13 UTC 2017 - badshah400@gmail.com diff --git a/normaliz.spec b/normaliz.spec index 90278a1..cb978ba 100644 --- a/normaliz.spec +++ b/normaliz.spec @@ -17,7 +17,7 @@ Name: normaliz -Version: 3.4.1 +Version: 3.5.0 Release: 0 Summary: Tools for computations in affine monoids and rational cones License: GPL-3.0+ @@ -25,10 +25,13 @@ Group: Productivity/Scientific/Math Url: https://www.normaliz.uni-osnabrueck.de/ Source: https://github.com/Normaliz/Normaliz/releases/download/v%version/%name-%version.tar.gz +Patch1: 0001-Fix-compiler-warnings-in-matrix.cpp.patch BuildRequires: boost-devel BuildRequires: cmake >= 2.6 +#maybe with flint-devel later on BuildRequires: gcc-c++ BuildRequires: gmp-devel +BuildRequires: mpfr-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -75,6 +78,7 @@ the Normaliz computations from any C++ program. %prep %setup -q +%patch -P 1 -p1 %build pushd source/