rpms/ppl/F-7 ppl.spec,1.1,1.2

[Roberto Bagnara (bagnara)]

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21333

Modified Files:
	ppl.spec 
Log Message:
The `gprolog' package is not available on ppc64:
the GNU Prolog interface must thus be disabled for that architecture.
Disable YAP support until bug 246815 is fixed.
Bug 243084 has been fixed: `ppl-swiprolog' dependency on `readline-devel'
removed.



Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-7/ppl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppl.spec	4 Jul 2007 19:38:08 -0000	1.1
+++ ppl.spec	5 Jul 2007 14:34:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		ppl
 Version:	0.9
-Release:	10%{?dist}
+Release:	12%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
@@ -54,7 +54,10 @@
 This package contains the (mixed integer) linear programming solver ppl_lpsol
 and the program ppl_lcdd for vertex/facet enumeration of convex polyhedra.
 
+%ifnarch ppc64
 %package gprolog
+# The `gprolog' package is not available on ppc64:
+# the GNU Prolog interface must thus be disabled for that architecture.
 Summary:	The GNU Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
 BuildRequires:	gprolog >= 1.2.19
@@ -62,7 +65,9 @@
 %description gprolog
 This package adds GNU Prolog support to the Parma Polyhedra Library (PPL).
 Install this package if you want to use the library in GNU Prolog programs.
+%endif
 
+%ifnarch ppc64
 %package gprolog-static
 Summary:	The static archive for the GNU Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
@@ -70,11 +75,12 @@
 %description gprolog-static
 This package contains the static archive for the GNU Prolog interface
 of the Parma Polyhedra Library.
+%endif
 
 %package swiprolog
 Summary:	The SWI-Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
-BuildRequires:	pl >= 5.6.0, readline-devel
+BuildRequires:	pl >= 5.6.0
 Requires:	ppl = %{version}-%{release}, ppl-pwl = %{version}-%{release}, pl >= 5.6.0, readline-devel
 %description swiprolog
 This package adds SWI-Prolog support to the Parma Polyhedra Library.
@@ -89,7 +95,9 @@
 This package contains the static archive for the SWI-Prolog interface
 of the Parma Polyhedra Library.
 
+%if 0
 %package yap
+# Disable YAP support until bug 246815 is fixed.
 Summary:	The YAP Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
 BuildRequires:	yap-devel >= 5.1.1
@@ -97,7 +105,9 @@
 %description yap
 This package adds YAP Prolog support to the Parma Polyhedra Library (PPL).
 Install this package if you want to use the library in YAP Prolog programs.
+%endif
 
+%if 0
 %package yap-static
 Summary:	The static archive for the YAP Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
@@ -106,6 +116,7 @@
 %description yap-static
 This package contains the static archive for the YAP Prolog interface
 of the Parma Polyhedra Library.
+%endif
 
 %package docs
 Summary:	Documentation for the Parma Polyhedra Library
@@ -149,7 +160,14 @@
 %patch2 -p1
 
 %build
-%configure --enable-shared --disable-rpath CPPFLAGS="-I%{_includedir}/glpk -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include -I%{_includedir}/Yap"
+CPPFLAGS="-I%{_includedir}/glpk"
+%ifnarch ppc64
+CPPFLAGS="$CPPFLAGS -I%{_libdir}/gprolog-`gprolog --version 2>&1 | head -1 | sed -e "s/.* \([^ ]*\)$/\1/g"`/include"
+%endif
+%if 0
+CPPFLAGS="$CPPFLAGS -I%{_includedir}/Yap"
+%endif
+%configure --enable-shared --disable-rpath CPPFLAGS="$CPPFLAGS"
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
@@ -198,16 +216,20 @@
 %{_mandir}/man1/ppl_lcdd.1.gz
 %{_mandir}/man1/ppl_lpsol.1.gz
 
+%ifnarch ppc64
 %files gprolog
 %defattr(-,root,root,-)
 %doc interfaces/Prolog/GNU/README.gprolog
 %{_bindir}/ppl_gprolog
 %{_libdir}/%{name}/ppl_gprolog.pl
 %{_libdir}/%{name}/libppl_gprolog.so
+%endif
 
+%ifnarch ppc64
 %files gprolog-static
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libppl_gprolog.a
+%endif
 
 %files swiprolog
 %defattr(-,root,root,-)
@@ -220,15 +242,19 @@
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libppl_swiprolog.a
 
+%if 0
 %files yap
 %defattr(-,root,root,-)
 %doc interfaces/Prolog/YAP/README.yap
 %{_libdir}/%{name}/ppl_yap.pl
 %{_libdir}/%{name}/ppl_yap.so
+%endif
 
+%if 0
 %files yap-static
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/ppl_yap.a
+%endif
 
 %files docs
 %defattr(-,root,root,-)
@@ -262,6 +288,15 @@
 rm -rf %{buildroot}
 
 %changelog
+* Thu Jul 05 2007 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-12
+- Disable YAP support until bug 246815 is fixed.
+- Bug 243084 has been fixed: `ppl-swiprolog' dependency on `readline-devel'
+  removed.
+
+* Thu Jul 05 2007 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-11
+- The `gprolog' package is not available on the ppc64 architecture:
+  so do `ppl-gprolog' and `ppl-gprolog-static'.
+
 * Tue Jul 03 2007 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-10
 - Use `%%{buildroot}' consistently, instead of  `$RPM_BUILD_ROOT'.