[Macaulay2] drop unused patches (4ti2, normalize)

[Rex Dieter]

commit e49e8c91b5b9aa5358167cb2c308987dfb6cfd1e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Jan 24 11:20:52 2014 -0600

    drop unused patches (4ti2, normalize)

 Macaulay2-1.5-system_normaliz.patch |   12 ------------
 Macaulay2.spec                      |   15 +++++----------
 2 files changed, 5 insertions(+), 22 deletions(-)
---
diff --git a/Macaulay2.spec b/Macaulay2.spec
index 84a1e7a..ac69438 100644
--- a/Macaulay2.spec
+++ b/Macaulay2.spec
@@ -13,7 +13,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2 or GPLv3
 Group:   Applications/Engineering
@@ -53,9 +53,6 @@ Patch4: Macaulay2-1.5-default_make_targets.patch
 Patch5: Macaulay2-1.5-no_gftables.patch
 # don't use -Werror 
 Patch6: Macaulay2-1.5-no_Werror.patch
-# use fedora/system copy of normaliz
-%global system_normaliz 1
-Patch8: Macaulay2-1.5-system_normaliz.patch
 # link to gmp, not mpir to avoid possible issues with gmp'ed pari
 Patch9: Macaulay2-1.5-use_gmp_instead_of_mpir.patch
 # fix build against factory-3.1.5
@@ -100,10 +97,8 @@ Requires: 4ti2
 Requires: gfan
 Requires: factory-gftables
 
-%if 0%{?system_normaliz}
 BuildRequires: normaliz
 Requires: normaliz
-%endif
 
 %if 0%{?common}
 Requires:  Macaulay-common = %{version}-%{release}
@@ -157,9 +152,6 @@ install -D -p %{SOURCE100} BUILD/tarfiles/
 %patch4 -p1 -b .default_make_targets
 %patch5 -p1 -b .no_gftables
 %patch6 -p1 -b .no_Werror
-%if 0%{?system_normaliz}
-%patch8 -p1 -b .system_normaliz
-%endif
 %patch9 -p1 -b  .use_gmp_instead_of_mpir
 %patch10 -p1 -b .factory_315
 
@@ -204,7 +196,7 @@ CXXFLAGS="%{optflags}" \
   --disable-fc-lib-ldflags \
   --disable-strip \
   %{?_enable_frobby}%{!?_enable_frobby:--disable-frobby} \
-  --with-unbuilt-programs="cddplus gfan 4ti2 lrslib nauty %{?system_normaliz:normaliz}" 
+  --with-unbuilt-programs="cddplus gfan 4ti2 lrslib nauty normaliz" 
 popd
 
 # Not smp-safe
@@ -322,6 +314,9 @@ fi
 
 
 %changelog
+* Fri Jan 24 2014 Rex Dieter <rdieter at fedoraproject.org> - 1.5-5
+- drop unused patches (4ti2, normalize)
+
 * Tue Jan 21 2014 Rex Dieter <rdieter at fedoraproject.org> - 1.5-4
 - utilize %%_libexecdir/Macaulay2/... for helper/system binaries
 - libdir: %%_libdir => %%_prefix/lib