diff --git a/gfan-permissive.patch b/gfan-permissive.patch index 1f630ef..ea5bc61 100644 --- a/gfan-permissive.patch +++ b/gfan-permissive.patch @@ -1,6 +1,6 @@ -diff -up gfan0.5/app_main.cpp.orig gfan0.5/app_main.cpp ---- gfan0.5/app_main.cpp.orig 2012-07-05 12:10:18.377378026 -0400 -+++ gfan0.5/app_main.cpp 2012-07-05 12:10:24.414378093 -0400 +diff -up app_main.cpp.orig app_main.cpp +--- app_main.cpp.orig 2012-07-05 12:10:18.377378026 -0400 ++++ app_main.cpp 2012-07-05 12:10:24.414378093 -0400 @@ -76,14 +76,6 @@ public: int main() diff --git a/gfan.spec b/gfan.spec index 22d5ea3..f64ab76 100644 --- a/gfan.spec +++ b/gfan.spec @@ -13,13 +13,14 @@ Patch1: %{name}-format.patch # Sent upstream 2011 Apr 27. Fix warnings that could indicate runtime # problems. Patch2: %{name}-warning.patch -# Treate plain "gfan" call as "gfan_bases" call (as done in previous versions) -# instead of priting warning telling to call it as "gfan_bases" and exiting +# Treat plain "gfan" call as "gfan_bases" call (as done in previous versions) +# instead of warning that "gfan_bases" should be called and exiting Patch3: %{name}-permissive.patch BuildRequires: cddlib-devel BuildRequires: gmp-devel +Suggests: TOPCOM %description The software computes all marked reduced Gröbner bases of an ideal. @@ -43,7 +44,7 @@ Gfan examples and documentation files. %patch0 %patch1 %patch2 -%patch3 -p1 +%patch3 # manual is non-free rm -rf doc @@ -77,7 +78,7 @@ rm -f homepage/Makefile %build # Linking with RPM_LD_FLAGS fails because -z now breaks cddlib's aliasing make %{?_smp_mflags} \ - OPTFLAGS="%{optflags} -DGMPRATIONAL -I/usr/include/cddlib" \ + OPTFLAGS="%{optflags} -DGMPRATIONAL -I/usr/include/cddlib -std=gnu++98" \ PREFIX=%{_prefix} \ SOPLEX_LINKOPTIONS="-Wl,-z,relro"