rpms/ppl/F-9 ppl-0.9-swiprolog.patch,NONE,1.1 ppl.spec,1.11,1.12

[Roberto Bagnara]

Author: bagnara

Update of /cvs/pkgs/rpms/ppl/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6161

Modified Files:
	ppl.spec 
Added Files:
	ppl-0.9-swiprolog.patch 
Log Message:
Implemented a workaround to cope with the new location of SWI-Prolog.h.
Fixed the SWI-Prolog interface dependencies.


ppl-0.9-swiprolog.patch:

--- NEW FILE ppl-0.9-swiprolog.patch ---
diff -ur ppl-0.9/configure ppl-0.9-patched/configure
--- ppl-0.9/configure	2006-03-12 09:11:32.000000000 +0100
+++ ppl-0.9-patched/configure	2008-09-08 15:38:34.000000000 +0200
@@ -14929,7 +14929,7 @@
   swi_prolog_version=`$swi_prolog -dump-runtime-variables | grep PLVERSION= | sed 's/PLVERSION="\(.*\)";/\1/'`
 
 
-  SWI_PROLOG_INCLUDE_OPTIONS="-I${swi_prolog_base}/include"
+  SWI_PROLOG_INCLUDE_OPTIONS="-I${swi_prolog_base}/include -I/usr/include/pl"
   ac_save_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $SWI_PROLOG_INCLUDE_OPTIONS"
   ac_ext=cc
diff -ur ppl-0.9/interfaces/Prolog/SWI/Makefile.in ppl-0.9-patched/interfaces/Prolog/SWI/Makefile.in
--- ppl-0.9/interfaces/Prolog/SWI/Makefile.in	2006-03-12 09:11:44.000000000 +0100
+++ ppl-0.9-patched/interfaces/Prolog/SWI/Makefile.in	2008-09-08 16:16:05.000000000 +0200
@@ -728,7 +728,7 @@
 # Notice: we are linking statically until we understand whether
 # and if libtool and plld can interoperate.
 @BUILD_SWI_PROLOG_INTERFACE_TRUE at ppl_pl$(EXEEXT): ppl_swiprolog.o ppl_pl.o | libppl_swiprolog.la
- at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -cc $(CC) -c++ $(CXX) -ld $(CXX) \
+ at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -v -cc $(CC) -c++ $(CXX) -ld $(CXX) \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " ","` \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-o $@ $+ \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-L$(top_builddir)/src/.libs -lppl \
@@ -736,7 +736,7 @@
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		@extra_libraries@
 
 @BUILD_SWI_PROLOG_INTERFACE_TRUE at pl_clpq$(EXEEXT): ppl_swiprolog.o pl_clpq.o pl_clpq.pl ../tests/clpq.pl | libppl_swiprolog.la 
- at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -cc $(CC) -c++ $(CXX) -ld $(CXX) \
+ at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -v -cc $(CC) -c++ $(CXX) -ld $(CXX) \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " ","` \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-o $@ $+ \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-L$(top_builddir)/src/.libs -lppl \
@@ -744,7 +744,7 @@
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		@extra_libraries@
 
 @BUILD_SWI_PROLOG_INTERFACE_TRUE at pl_clpq2$(EXEEXT): ppl_swiprolog.o pl_clpq.o pl_clpq.pl ../tests/clpq2.pl | libppl_swiprolog.la 
- at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -cc $(CC) -c++ $(CXX) -ld $(CXX) \
+ at BUILD_SWI_PROLOG_INTERFACE_TRUE@	plld -v -cc $(CC) -c++ $(CXX) -ld $(CXX) \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " ","` \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-o $@ $+ \
 @BUILD_SWI_PROLOG_INTERFACE_TRUE@		-L$(top_builddir)/src/.libs -lppl \


Index: ppl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ppl/F-9/ppl.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ppl.spec	19 May 2008 16:18:36 -0000	1.11
+++ ppl.spec	8 Sep 2008 14:49:21 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		ppl
 Version:	0.9
-Release:	20%{?dist}
+Release:	24%{?dist}
 
 Summary:	The Parma Polyhedra Library: a library of numerical abstractions
 Group:		Development/Libraries
@@ -14,6 +14,7 @@
 Patch1:		ppl-0.9-configure.patch
 Patch2:		ppl-0.9-makefiles.patch
 Patch3:		ppl-0.9-cstdlib.patch
+Patch4:		ppl-0.9-swiprolog.patch
 #Icon:
 #Requires:
 Requires(post): /sbin/ldconfig
@@ -83,27 +84,23 @@
 of the Parma Polyhedra Library.
 %endif
 
-%ifnarch ppc64
 %package swiprolog
 Summary:	The SWI-Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
-BuildRequires:	pl >= 5.6.0
+BuildRequires:	pl-devel >= 5.6.57-2
 Requires:	ppl = %{version}-%{release}, ppl-pwl = %{version}-%{release}, pl >= 5.6.0
 %description swiprolog
 This package adds SWI-Prolog support to the Parma Polyhedra Library.
 Install this package if you want to use the library in SWI Prolog programs.
-%endif
 
-%ifnarch ppc64
 %package swiprolog-static
 Summary:	The static archive for the SWI-Prolog interface of the Parma Polyhedra Library
 Group:		Development/Libraries
-BuildRequires:	pl >= 5.6.0
+BuildRequires:	pl-devel >= 5.6.57-2, pl-static >= 5.6.57-2
 Requires:	ppl-swiprolog = %{version}-%{release}
 %description swiprolog-static
 This package contains the static archive for the SWI-Prolog interface
 of the Parma Polyhedra Library.
-%endif
 
 %package yap
 Summary:	The YAP Prolog interface of the Parma Polyhedra Library
@@ -166,6 +163,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 CPPFLAGS="-I%{_includedir}/glpk"
@@ -260,20 +258,16 @@
 %{_libdir}/%{name}/libppl_gprolog.a
 %endif
 
-%ifnarch ppc64
 %files swiprolog
 %defattr(-,root,root,-)
 %doc interfaces/Prolog/SWI/README.swiprolog
 %{_bindir}/ppl_pl
 %{_libdir}/%{name}/libppl_swiprolog.so
 %{_libdir}/%{name}/ppl_swiprolog.pl
-%endif
 
-%ifnarch ppc64
 %files swiprolog-static
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/libppl_swiprolog.a
-%endif
 
 %files yap
 %defattr(-,root,root,-)
@@ -317,6 +311,19 @@
 rm -rf %{buildroot}
 
 %changelog
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-24
+- Changed ppl-0.9-swiprolog.patch so as to invoke `plld' with
+  the `-v' option.
+
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-23
+- Fixed ppl-0.9-swiprolog.patch.
+
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-22
+- Implemented a workaround to cope with the new location of SWI-Prolog.h.
+
+* Mon Sep 8 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-21
+- Fixed the SWI-Prolog interface dependencies.
+
 * Mon May 19 2008 Roberto Bagnara <bagnara at cs.unipr.it> 0.9-20
 - Added Requires /sbin/ldconfig.