diff --git a/pl-5.10.2-pc.patch b/pl-5.10.2-pc.patch new file mode 100644 index 0000000..a4881cf --- /dev/null +++ b/pl-5.10.2-pc.patch @@ -0,0 +1,11 @@ +--- a/src/swipl.pc.in ++++ b/src/swipl.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@ ++includedir=${libdir}/@PL@-@PLVERSION@/include + + PLBASE=${libdir}/@PL@-@PLVERSION@ + PLARCH=@ARCH@ diff --git a/pl-5.7.11-pc.patch b/pl-5.7.11-pc.patch deleted file mode 100644 index a067672..0000000 --- a/pl-5.7.11-pc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up pl-5.7.11/src/pl.pc.in.pc pl-5.7.11/src/pl.pc.in ---- pl-5.7.11/src/pl.pc.in.pc 2009-08-14 18:00:33.000000000 +0200 -+++ pl-5.7.11/src/pl.pc.in 2009-08-14 18:01:03.000000000 +0200 -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ --includedir=@includedir@ -+includedir=${libdir}/@PL@-@PLVERSION@/include - - PLBASE=${libdir}/@PL@-@PLVERSION@ - PLARCH=@ARCH@ diff --git a/pl.spec b/pl.spec index c836a54..f8add58 100644 --- a/pl.spec +++ b/pl.spec @@ -25,7 +25,7 @@ Source1: http://www.swi-prolog.org/download/stable/doc/SWI-Prolog-%{version}. Patch1: %{name}-5.10.2-jpl-configure.patch Patch2: %{name}-5.10.2-man-files.patch Patch3: %{name}-5.10.2-jni.patch -Patch4: %{name}-5.7.11-pc.patch +Patch4: %{name}-5.10.2-pc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Base @@ -127,7 +127,7 @@ in Prolog. In both setups it provides a reentrant bidirectional interface. %patch1 -p1 -b .libjvm %patch2 -p1 -b .man-files %patch3 -p1 -b .jni -#%patch4 -p1 -b .pc +%patch4 -p1 -b .pc ( mkdir doc-install cd doc-install @@ -302,6 +302,7 @@ rm -rf $RPM_BUILD_ROOT - Adjust jpl-configure.patch to 5.10.2 - Adjust man-files.patch to 5.10.2 - Adjust jni.patch to 5.10.2 +- Adjust pc.patch to 5.10.2 * Wed Dec 8 2010 Petr Pisar - 5.7.11-6 - Inhibit XPCE by macro to silent rpmlint