[Singular] apply ntl6 patch conditionally (f20+)
Rex Dieter
rdieter at fedoraproject.org
Mon Nov 25 23:02:31 UTC 2013
commit f4827232c1085e38eece1f1b4830ff9a53e3b958
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Nov 25 16:55:05 2013 -0600
apply ntl6 patch conditionally (f20+)
Singular.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/Singular.spec b/Singular.spec
index 5a04455..525c456 100644
--- a/Singular.spec
+++ b/Singular.spec
@@ -1,6 +1,10 @@
%global singulardir %{_libdir}/Singular
%global upstreamver 3-1-5
+%if 0%{?fedora} > 19
+%define ntl6 1
+%endif
+
Name: Singular
Version: %(tr - . <<<%{upstreamver})
Release: 8%{?dist}
@@ -13,8 +17,7 @@ BuildRequires: emacs
BuildRequires: flex
BuildRequires: gmp-devel
BuildRequires: ncurses-devel
-# patch12 means we need ntl v6 now
-BuildRequires: ntl-devel >= 6.0
+BuildRequires: ntl-devel%{?ntl6: >= 6.0}
BuildRequires: readline-devel
# Need uudecode for documentation images in tarball
BuildRequires: sharutils
@@ -156,7 +159,9 @@ Emacs mode for Singular.
%patch10 -p1
%patch11 -p1
+%if 0%{?ntl6:1}
%patch12 -p1
+%endif
%patch20 -p1 -b .M2_factory
%patch21 -p1 -b .M2_memutil_debuggging
More information about the scm-commits
mailing list