[cloog] revert cloog update

Mon Dec 3 21:55:59 UTC 2012

commit 6f6f1fdacfe0f6fadea4f9612830843521798386
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Dec 3 16:57:55 2012 -0500

    revert cloog update

 cloog-ppl-0.15.11-ppl-verfix.patch |   24 ++++++++++++
 cloog.spec                         |   69 ++++++++++++++++++++++++++---------
 sources                            |    2 +-
 3 files changed, 76 insertions(+), 19 deletions(-)
---

diff --git a/cloog-ppl-0.15.11-ppl-verfix.patch b/cloog-ppl-0.15.11-ppl-verfix.patch
new file mode 100644
index 0000000..d0a2adc
--- /dev/null
+++ b/cloog-ppl-0.15.11-ppl-verfix.patch
@@ -0,0 +1,24 @@
+diff -up cloog-ppl-0.15.11/configure.in.verfix cloog-ppl-0.15.11/configure.in
+--- cloog-ppl-0.15.11/configure.in.verfix	2012-12-03 16:46:17.295807008 -0500
++++ cloog-ppl-0.15.11/configure.in	2012-12-03 16:46:59.010827161 -0500
+@@ -338,7 +338,7 @@ if test "x$with_ppl" != "x" -a "x$with_p
+ 
+ 	AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL])
+ 	AC_TRY_COMPILE([#include "ppl_c.h"],[
+-	#if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
++	#if (PPL_VERSION_MAJOR != 1) || (PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 10)
+ 	choke me
+ 	#endif
+ 	], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ])
+diff -up cloog-ppl-0.15.11/configure.verfix cloog-ppl-0.15.11/configure
+--- cloog-ppl-0.15.11/configure.verfix	2012-12-03 16:47:21.996837121 -0500
++++ cloog-ppl-0.15.11/configure	2012-12-03 16:47:34.893842170 -0500
+@@ -11222,7 +11222,7 @@ int
+ main ()
+ {
+ 
+-	#if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
++	#if (PPL_VERSION_MAJOR != 1) || (PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 10)
+ 	choke me
+ 	#endif
+ 
diff --git a/cloog.spec b/cloog.spec
index ee308ee..b39b9f5 100644
--- a/cloog.spec
+++ b/cloog.spec
@@ -1,15 +1,25 @@
 Name:           cloog
-Version:        0.16.1
-Release:        4%{?dist}
+%define         tarball_name %{name}-ppl
+Version:        0.15.11
+Release:        5%{?dist}
+Epoch:		1
 Summary:        The Chunky Loop Generator
+
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.cloog.org
-Source0:        ftp://gcc.gnu.org/pub/gcc/infrastructure/%{name}-parma-%{version}.tar.gz
+Source0:        ftp://gcc.gnu.org/pub/gcc/infrastructure/%{tarball_name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{tarball_name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		cloog-ppl-0.15.11-ppl-verfix.patch
+
 BuildRequires:  ppl-devel >= 0.10
 BuildRequires:  gmp-devel >= 4.1.3
+BuildRequires:  texinfo >= 4.12
 BuildRequires:  libtool
 
+Requires(post): info
+Requires(preun): info
+
 %description
 CLooG is a software which generates loops for scanning Z-polyhedra. That is,
 CLooG finds the code or pseudo-code where each integral point of one or more
@@ -17,52 +27,75 @@ parametrized polyhedron or parametrized polyhedra union is reached. CLooG is
 designed to avoid control overhead and to produce a very efficient code.
 
 %package ppl
-Summary:	Parma Polyhedra Library backend (ppl) based version of the Cloog binaries
-Group:		Development/Libraries
-
+Summary: Parma Polyhedra Library backend (ppl) based version of the Cloog binaries
+Group: Development/Libraries
 %description ppl
 The dynamic shared libraries of the Chunky Loop Generator
 
 %package ppl-devel
 Summary:        Development tools for the ppl based version of Chunky Loop Generator
 Group:          Development/Libraries
-Requires:       %{name}-ppl%{?_isa} = %{version}-%{release}
-Requires:       ppl-devel%{?_isa} >= 0.10, gmp-devel%{?_isa} >= 4.1.3
-
+Requires:       %{name}-ppl = %{epoch}:%{version}-%{release}
+Requires:       ppl-devel >= 0.10, gmp-devel >= 4.1.3
 %description ppl-devel
 The header files and dynamic shared libraries of the Chunky Loop Generator.
 
 %prep
-%setup -q -n %{name}-parma-%{version}
+%setup -q -n %{tarball_name}-%{version}
+%patch0 -p1 -b .verfix
 
 %build
 %configure --with-ppl
 
+# Remove the cloog.info in the tarball
+# to force the re-generation of a new one
+test -f doc/cloog.info && rm doc/cloog.info
+
 # Remove the -fomit-frame-pointer compile flag
 # Use system libtool to disable standard rpath
 make %{?_smp_mflags} AM_CFLAGS= LIBTOOL=%{_bindir}/libtool
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" install
+rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files ppl
-%doc cloog-core/README
+%defattr(-,root,root,-)
+%doc README LICENSE
+%{_infodir}/cloog.info*gz
 %{_bindir}/cloog
-%{_libdir}/libcloog-ppl.so.*
+%{_libdir}/libcloog.so.*
 
 %files ppl-devel
+%defattr(-,root,root,-)
 %{_includedir}/cloog
-%{_libdir}/libcloog-ppl.so
-%{_libdir}/pkgconfig/cloog-ppl.pc
-%exclude %{_libdir}/libcloog-ppl.a
-%exclude %{_libdir}/libcloog-ppl.la
-
-%post ppl -p /sbin/ldconfig
+%{_libdir}/libcloog.so
+%exclude %{_libdir}/libcloog.a
+%exclude %{_libdir}/libcloog.la
+
+%post ppl
+/sbin/ldconfig
+test -f %{_infodir}/%{name}.info \
+     && /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun ppl
+if [ $1 = 0 ] ; then
+  test -f %{_infodir}/%{name}.info && \
+      /sbin/install-info \
+          --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
 
 %postun ppl -p /sbin/ldconfig
 
 %changelog
+* Mon Dec  3 2012 Tom Callaway <spot at fedoraproject.org> - 1:0.15.11-5
+- roll back to 0.15.11
+
 * Mon Dec  3 2012 Tom Callaway <spot at fedoraproject.org> - 0.16.1-4
 - undo hacks
 
diff --git a/sources b/sources
index d435997..8529de1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f483539b30a60a3478eea70c77b26bef  cloog-parma-0.16.1.tar.gz
+060ae4df6fb8176e021b4d033a6c0b9e  cloog-ppl-0.15.11.tar.gz
