[TOPCOM] New upstream release. Drop upstreamed GCC 4.7 patch. Adapt to upstream modification of gmpxx.h. Move

Wed Aug 8 15:45:57 UTC 2012

commit 288988155b1b88e40ad26e757bd959b9f28ba92e
Author: Jerry James <loganjerry at gmail.com>
Date:   Wed Aug 8 09:45:27 2012 -0600

    New upstream release.
    Drop upstreamed GCC 4.7 patch.
    Adapt to upstream modification of gmpxx.h.
    Move man page installation to the Makefile.

 .gitignore         |    2 +-
 TOPCOM-Makefile    |   12 +++++++++++-
 TOPCOM-gcc47.patch |   11 -----------
 TOPCOM.spec        |   41 ++++++++++++++---------------------------
 sources            |    2 +-
 5 files changed, 27 insertions(+), 41 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 070d0d9..9ddae03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/TOPCOM-0.17.1.tar.gz
 /TOPCOM-man.tar.xz
+/TOPCOM-0.17.4.tar.gz
diff --git a/TOPCOM-Makefile b/TOPCOM-Makefile
index d3d8b80..f398f64 100644
--- a/TOPCOM-Makefile
+++ b/TOPCOM-Makefile
@@ -14,12 +14,13 @@ LDFLAGS = -Wl,--as-needed -L. -lTOPCOM -lcddgmp -lgmpxx -lgmp
 SHFLAGS = -shared -Wl,-h,libTOPCOM.so.$(major)
 bindir = @bindir@
 libdir = @libdir@
+mandir = @mandir@
 includedir = @includedir@/TOPCOM
 
 library_sources = \
-	lib-src-reg/SPXinterface.cc \
 	lib-src-reg/LPinterface.cc \
 	lib-src-reg/RegularityCheck.cc \
+	lib-src-reg/SPXinterface.cc \
 	lib-src/Admissibles.cc \
 	lib-src/CheckTriang.cc \
 	lib-src/Circuits.cc \
@@ -130,3 +131,12 @@ install: $(bin_exes)
 	install -p -m 0644 wrap-gmp-gmpxx/*.h $(DESTDIR)$(includedir)
 	install -p -m 0644 lib-src-reg/*.hh $(DESTDIR)$(includedir)
 	install -p -m 0644 lib-src/*.hh $(DESTDIR)$(includedir)
+	install -d $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man7
+	for f in man/*.1; do \
+	  sed "s/#version#/$(version)/" $$f > $(DESTDIR)$(mandir)/$${f/man/man1}; \
+	  touch -r $$f $(DESTDIR)$(mandir)/$${f/man/man1}; \
+	done
+	for f in man/*.7; do \
+	  sed "s/#version#/$(version)/" $$f > $(DESTDIR)$(mandir)/$${f/man/man7}; \
+	  touch -r $$f $(DESTDIR)$(mandir)/$${f/man/man7}; \
+	done
diff --git a/TOPCOM.spec b/TOPCOM.spec
index 0297154..895a674 100644
--- a/TOPCOM.spec
+++ b/TOPCOM.spec
@@ -1,6 +1,6 @@
 Name:           TOPCOM
-Version:        0.17.1
-Release:        4%{?dist}
+Version:        0.17.4
+Release:        1%{?dist}
 Summary:        Triangulations Of Point Configurations and Oriented Matroids
 
 Group:          Applications/Engineering
@@ -12,8 +12,6 @@ Source0:        http://www.rambau.wm.uni-bayreuth.de/Software/%{name}-%{version}
 Source1:        %{name}-man.tar.xz
 # A replacement Makefile.  See the %%build section for more information.
 Source2:        %{name}-Makefile
-# Patch sent upstream 28 Mar 2012.  Adapt to restricted C++ lookups in GCC 4.7.
-Patch0:         %{name}-gcc47.patch
 
 BuildRequires:  cddlib-devel
 BuildRequires:  gmp-devel
@@ -48,21 +46,16 @@ Command line tools that expose %{name} library functionality.
 %prep
 %setup -q
 %setup -q -T -D -a 1
-%patch0
 
 # Fix character encoding
 iconv -f iso8859-1 -t utf8 -o README.utf8 README
 touch -r README README.utf8
 mv -f README.utf8 README
 
-# Fix the FSF's address
-for f in COPYING README; do
-  sed -i.orig \
-    's/59 Temple Place, Suite 330, Boston, MA  02111-1307/51 Franklin Street, Suite 500, Boston, MA  02110-1335/' \
-    $f
-  touch -r $f.orig $f
-  rm -f $f.orig
-done
+# Mimic upstream's modification of gmpxx.h, using the system gmpxx.h
+mkdir -p external/include
+sed "s|// \(q\.canonicalize\)|\1|" %{_includedir}/gmpxx.h > \
+  external/include/gmpxx.h
 
 %build
 # We cannot use upstream's build system.  It has the following problems.
@@ -82,10 +75,12 @@ done
 sed -e "s|@RPM_OPT_FLAGS@|${RPM_OPT_FLAGS}|" \
     -e "s|@bindir@|%{_bindir}|" \
     -e "s|@libdir@|%{_libdir}|" \
+    -e "s|@mandir@|%{_mandir}|" \
     -e "s|@includedir@|%{_includedir}|" \
     -e "s|@version@|%{version}|" \
     -e "s|@major@|%{topcom_major}|" \
     -e "s|@minor@|%{topcom_minor}|" \
+    -e "s|#version#|@version@|" \
     %{SOURCE2} > Makefile
 make %{?_smp_mflags}
 
@@ -98,20 +93,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/bench $RPM_BUILD_ROOT%{_bindir}/%{name}_bench
 # Get rid of the Makefiles in the examples dir before packaging
 rm -f examples/Makefile*
 
-# Install the man pages
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man7
-cd man
-for f in *.1; do
-  sed -i "s/@version@/%{version}/" $f > $RPM_BUILD_ROOT%{_mandir}/man1/$f
-  touch -r $f $RPM_BUILD_ROOT%{_mandir}/man1/$f
-done
-for f in *.7; do
-  sed -i "s/@version@/%{version}/" $f > $RPM_BUILD_ROOT%{_mandir}/man7/$f
-  touch -r $f $RPM_BUILD_ROOT%{_mandir}/man7/$f
-done
-
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -131,6 +112,12 @@ done
 %{_libdir}/*.so.*
 
 %changelog
+* Wed Aug  8 2012 Jerry James <loganjerry at gmail.com> - 0.17.4-1
+- New upstream release
+- Drop upstreamed GCC 4.7 patch
+- Adapt to upstream modification of gmpxx.h
+- Move man page installation to the Makefile
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index fc8df10..48a8af9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-eb9472f9ad66e00c568744a19156fccd  TOPCOM-0.17.1.tar.gz
+831ba56a8438327580c7ca4ec55e4d41  TOPCOM-0.17.4.tar.gz
 56e58edcc50ade7594bb37e41351b1c9  TOPCOM-man.tar.xz
