[cddlib] New upstream release. All patches upstreamed. Non-free sources removed from upstream tarball.

[Jerry James]

commit c0f927819b9c5ece3c11be78453e8cb510750f94
Author: Jerry James <loganjerry at gmail.com>
Date:   Tue Apr 24 08:39:44 2012 -0600

    New upstream release.
    All patches upstreamed.
    Non-free sources removed from upstream tarball.

 .gitignore             |    2 +-
 cddlib-configure.patch |77236 ------------------------------------------------
 cddlib-const.patch     |   58 -
 cddlib-memleak.patch   |   57 -
 cddlib.spec            |   46 +-
 sources                |    2 +-
 6 files changed, 21 insertions(+), 77380 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 977608b..de0966d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-cddlib-094f-free.tar.bz2
+/cddlib-094g.tar.gz
diff --git a/cddlib.spec b/cddlib.spec
index 2c4c205..a96b845 100644
--- a/cddlib.spec
+++ b/cddlib.spec
@@ -1,24 +1,11 @@
 Name:           cddlib
-Version:        094f
-Release:        15%{?dist}
+Version:        094g
+Release:        1%{?dist}
 Summary:        A library for generating all vertices in convex polyhedrons
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://www.ifor.math.ethz.ch/~fukuda/cdd_home/
-#Source0:       ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/%%{name}-094f.tar.gz
-#tar -xzf cddlib-094f.tar.gz
-#rm cddlib-094f/examples-ml/Combinatorica5.m
-#tar -czf cddlib-094-free.tar.gz cddlib-094f/
-Source0:        %{name}-094f-free.tar.bz2
-# This patch was last sent upstream on 7 Apr 2011.  It adds the ability to
-# create a shared library, rather than a static library only.
-Patch0:         cddlib-configure.patch
-# This patch was sent upstream on 24 Feb 2012.  It adds const qualifiers to
-# some parameters of public methods.  Their absence caused some compilation
-# problems in C++ clients.
-Patch1:         cddlib-const.patch
-# Patch from upstream to fix some memory leaks.
-Patch2:         cddlib-memleak.patch
+Source0:        ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/%{name}-%{version}.tar.gz
 
 BuildRequires:  gmp-devel
 BuildRequires:  tex(latex)
@@ -72,16 +59,11 @@ Sample binaries that use cddlib.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1
-%patch2
 
 # Clean up the examples
-rm -rf src/~
-rm -rf src*/.DS_Store* src*/.gdb_history examples*/.DS_Store*
-rm -rf src-gmp/~
-chmod -x -R examples*/* src*/*
-rm doc/cddlibman.pdf
+rm -rf src/~ src-gmp/~
+find . -name \.DS_Store\* | xargs rm -f
+rm doc/cddlibman.{aux,blg,dvi,log,pdf,ps}
 
 # Fix the FSF's address
 for f in `find . -type f | xargs grep -Fl '675 Mass'`; do
@@ -96,12 +78,18 @@ done
 %build
 %configure
 
+# Get rid of undesirable hardcoded rpaths
+sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    -i libtool
+
 # Configure finds libgmp and tries to link it with everything.
 sed -i 's/ -lgmp//' lib-src/Makefile
 
 make %{?_smp_mflags}
 cd doc
-  pdflatex cddlibman.tex
+pdflatex cddlibman.tex
+pdflatex cddlibman.tex
 
 
 %install
@@ -124,8 +112,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %files devel
-%doc doc/cddlibman.pdf
-%doc examples* src-mathlink*
+%doc doc/cddlibman.pdf examples*
 %{_includedir}/cddlib
 %{_libdir}/*.so
 
@@ -140,6 +127,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %changelog
+* Tue Apr 24 2012 Jerry James <loganjerry at gmail.com> - 094g-1
+- New upstream release
+- All patches upstreamed
+- Non-free sources removed from upstream tarball
+
 * Fri Apr 20 2012 Jerry James <loganjerry at gmail.com> - 094f-15
 - Package the sample binaries in -tools for the use of projects such as LattE
 - Add memleak patch from upstream
diff --git a/sources b/sources
index a118f6d..47924fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d99720204d87ea767666178bc17cb8c  cddlib-094f-free.tar.bz2
+b5b1a6cc5a82beac814418907602bfeb  cddlib-094g.tar.gz