[normaliz] New upstream release.

Jerry James jjames at fedoraproject.org
Mon Nov 10 22:19:43 UTC 2014


commit 61ad1a65aa21da7f01e3ee08d359bf47db8a459b
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Mon Nov 10 15:19:27 2014 -0700

    New upstream release.

 .gitignore    |    2 +-
 normaliz.spec |   23 +++++++++++++++--------
 sources       |    2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b505999..8517bda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Normaliz2.11.2.zip
+/Normaliz2.12.1.zip
diff --git a/normaliz.spec b/normaliz.spec
index b4bbcd0..66b3f2c 100644
--- a/normaliz.spec
+++ b/normaliz.spec
@@ -1,6 +1,6 @@
 Name:           normaliz
-Version:        2.11.2
-Release:        2%{?dist}
+Version:        2.12.1
+Release:        1%{?dist}
 Summary:        A tool for mathematical computations
 
 License:        GPLv3+
@@ -14,6 +14,7 @@ BuildRequires:  apache-commons-exec
 BuildRequires:  apache-commons-exec-javadoc
 BuildRequires:  appframework
 BuildRequires:  boost-devel
+BuildRequires:  chrpath
 BuildRequires:  cmake
 BuildRequires:  gmp-devel
 BuildRequires:  java-devel >= 1:1.6.0
@@ -93,14 +94,13 @@ popd
 # Don't add a Class-Path to the jar
 sed -i '/Class-Path/d' source/jNormaliz/nbproject/build-impl.xml
 
-# Fix underlinked library
-sed -i '/APPLE/d;/  ENDIF/d' source/libnormaliz/CMakeLists.txt
-
 # Use our compiler flags
 sed -i '/funroll-loops/d' source/CMakeLists.txt
 
-# Fix an incorrect version number in 2.11.2
-sed -i 's/PATCH_VERSION 1/PATCH_VERSION 2/' source/CMakeLists.txt
+# Fix the library path
+if [ "%{_libdir}" = "%{_prefix}/lib64" ]; then
+  sed -i "s,/lib,/lib64," source/CMakeLists.txt
+fi
 
 %build
 # Build the C library and the binaries
@@ -133,6 +133,10 @@ pushd build
 make install DESTDIR=%{buildroot}
 popd
 
+# Remove spurious rpaths
+chrpath -d %{buildroot}%{_libdir}/libnormaliz.so.%{version}
+chrpath -d %{buildroot}%{_bindir}/normaliz
+
 # Install the jar
 mkdir -p %{buildroot}%{_javadir}
 cp -p source/jNormaliz/dist/jNormaliz.jar %{buildroot}%{_javadir}
@@ -147,7 +151,7 @@ cp -a source/jNormaliz/dist/javadoc %{buildroot}%{_javadocdir}/jnormaliz
 
 %files
 %doc docs/* doc/Algorithms*.pdf doc/Challenging*.pdf doc/Computing*.pdf
-%doc doc/Normaliz_*.pdf doc/The*.pdf
+%doc doc/Normaliz.pdf doc/The*.pdf
 %{_bindir}/normaliz
 
 %files -n libnormaliz
@@ -167,6 +171,9 @@ cp -a source/jNormaliz/dist/javadoc %{buildroot}%{_javadocdir}/jnormaliz
 %{_javadocdir}/jnormaliz
 
 %changelog
+* Mon Nov 10 2014 Jerry James <loganjerry at gmail.com> - 2.12.1-1
+- New upstream release
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index af3f69c..03ed00b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e98bae501c1addb6048b0a832397db8  Normaliz2.11.2.zip
+7e00f9589da0d7641d6284b2be6dddcf  Normaliz2.12.1.zip


More information about the scm-commits mailing list