[normaliz] 2.7

[Rex Dieter]

commit 3473857ecc0eaaf3396194d5f97660a6f576e0a5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri May 27 12:56:37 2011 -0500

    2.7

 .gitignore    |    3 ++-
 normaliz.spec |   30 +++++++++++-------------------
 sources       |    2 +-
 3 files changed, 14 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 425c81e..05810d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-Normaliz2.2Linux64.zip
+/Normaliz2.2Linux64.zip
+/Normaliz2.7.zip
diff --git a/normaliz.spec b/normaliz.spec
index f85d211..3e511af 100644
--- a/normaliz.spec
+++ b/normaliz.spec
@@ -1,14 +1,14 @@
 Name:           normaliz
-Version:        2.2
-Release:        4%{?dist}
+Version:        2.7
+Release:        1%{?dist}
 Summary:        A tool for mathematical computations
 
 Group:          Applications/Engineering
 License:        GPLv3
 URL:            http://www.mathematik.uni-osnabrueck.de/normaliz/
-# Warning: This zip-ball contains binaries, source only zip-ball not
+# Warning: This zip-ball contains .jar binaries, source only zip-ball not
 # available
-Source0:        http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz%{version}Linux64.zip
+Source0:        http://www.mathematik.uni-osnabrueck.de/normaliz/Normaliz%{version}/Normaliz%{version}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gmp-devel
@@ -23,16 +23,14 @@ in particular you may find Normaliz%{version}Documentation.pdf useful.
 An example configuration file normaliz.cfg is also included.
 
 %prep
-%setup -q -n Normaliz%{version}Linux
-# Delete the compiled version
-rm -f norm32 norm64 normbig
+%setup -q -n Normaliz%{version}
 
 %build
 pushd source
 # We want to use our build flags
 sed -i 's/^\(CXXFLAGS\s*=\)/#\1/' Makefile
 # Static linking should be avoided
-sed -i 's/^\(N[A-Z0-9]*FLAGS\s*=.*\s\)-static/\1/' Makefile
+sed -i 's/^\(N[A-Z0-9]*FLAGS\s*=.*\s\)-static/\1/' Makefile Makefile.configuration
 
 CXXFLAGS="%{optflags}" \
 make %{?_smp_mflags}
@@ -53,17 +51,11 @@ mv doc/Normaliz%{version}Documentation.pdf docs
 mv "doc/Computing the integral closure of an affine semigroup.pdf" \
     docs/Computing_the_integral_closure_of_an_affine_semigroup.pdf
 
-sed -i 's/\r//' normaliz.cfg
 
 %install
 rm -rf %{buildroot}
 
-pushd source
-mkdir -p %{buildroot}%{_bindir}
-install -m 755 norm32 %{buildroot}%{_bindir}
-install -m 755 norm64 %{buildroot}%{_bindir}
-install -m 755 normbig %{buildroot}%{_bindir}
-popd
+install -D -m 755 source/normaliz %{buildroot}%{_bindir}/normaliz
 
 %clean
 rm -rf %{buildroot}
@@ -72,12 +64,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING
 %doc docs/*
-%doc normaliz.cfg
-%{_bindir}/norm32
-%{_bindir}/norm64
-%{_bindir}/normbig
+%{_bindir}/normaliz
 
 %changelog
+* Fri May 27 2011 Rex Dieter <rdieter at fedoraproject.org> 2.7-1
+- 2.7
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 65fcc7b..202f033 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-47ec06a2e228e1153041a2c240ed9601  Normaliz2.2Linux64.zip
+2ed0c6ce3d4d5ebdd43f750260e19b39  Normaliz2.7.zip