Hello community,
here is the log from the commit of package swipl for openSUSE:Factory checked
in at 2012-05-07 22:52:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/swipl (Old)
and /work/SRC/openSUSE:Factory/.swipl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "swipl", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/swipl/swipl.changes 2011-09-23
12:47:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.swipl.new/swipl.changes 2012-05-07
22:53:06.000000000 +0200
@@ -1,0 +2,5 @@
+Sun May 6 20:21:15 UTC 2012 - poletti.ma...@gmail.com
+
+- Make pkg-config detect the right include directory (bug 758354).
+
+-------------------------------------------------------------------
New:
----
pkgconfig.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ swipl.spec ++++++
--- /var/tmp/diff_new_pack.RGUS2Z/_old 2012-05-07 22:53:07.000000000 +0200
+++ /var/tmp/diff_new_pack.RGUS2Z/_new 2012-05-07 22:53:07.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package swipl
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,27 +18,39 @@
Name: swipl
-BuildRequires: freetype2-devel gcc-c++ gmp-devel libjpeg-devel libpng-devel
-BuildRequires: mysql-devel openssl-devel postgresql-devel readline-devel
-BuildRequires: unixODBC-devel xorg-x11 xorg-x11-Xvfb xorg-x11-devel
-BuildRequires: java-1_6_0-openjdk-devel texlive texlive-latex
BuildRequires: fdupes
-License: GPL-2.0+ ; LGPL-2.1+
-AutoReqProv: on
+BuildRequires: freetype2-devel
+BuildRequires: gcc-c++
+BuildRequires: gmp-devel
+BuildRequires: java-1_6_0-openjdk-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: mysql-devel
+BuildRequires: openssl-devel
+BuildRequires: postgresql-devel
+BuildRequires: readline-devel
+BuildRequires: texlive
+BuildRequires: texlive-latex
+BuildRequires: unixODBC-devel
+BuildRequires: xorg-x11
+BuildRequires: xorg-x11-Xvfb
+BuildRequires: xorg-x11-devel
Version: 5.10.2
-Release: 1
+Release: 0
Summary: Prolog Compiler
+License: GPL-2.0+ ; LGPL-2.1+
+Group: Development/Languages/Other
Source: pl-%{version}.tar.bz2
Source1: refman.pdf
Patch0: pl.patch
+Patch1: pkgconfig.patch
# This is now upstream
Patch2: internal_fix.patch
Url: http://www.swi-prolog.org
-Provides: swi_pl = %{version}
Provides: swi-prolog = %{version}
-Obsoletes: swi_pl < %{version}
+Provides: swi_pl = %{version}
Obsoletes: swi-prolog < %{version}
-Group: Development/Languages/Other
+Obsoletes: swi_pl < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -57,6 +69,7 @@
%prep
%setup -q -n pl-%{version}
%patch0 -p 1
+%patch1 -p 1
%patch2 -p 1
%build
@@ -64,7 +77,7 @@
export COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-./build --prefix=%{_prefix} --config --enable-shared --libdir=%{_libdir}
+./build --prefix=%{_prefix} --config --libdir=%{_libdir} --enable-shared
./build --prefix=%{_prefix} --make %{?jobs:-j %{jobs}}
unset COFLAGS
++++++ pkgconfig.patch ++++++
diff -Pdru pl-5.10.2.orig/src/swipl.pc.in pl-5.10.2/src/swipl.pc.in
--- pl-5.10.2.orig/src/swipl.pc.in 2012-04-20 20:40:53.810629746 +0100
+++ pl-5.10.2/src/swipl.pc.in 2012-04-20 20:48:51.314727003 +0100
@@ -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@
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
