Hello community, here is the log from the commit of package redland for openSUSE:Leap:15.2 checked in at 2020-03-13 10:55:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/redland (Old) and /work/SRC/openSUSE:Leap:15.2/.redland.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "redland" Fri Mar 13 10:55:07 2020 rev:12 rq:782179 version:1.0.17 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/redland/redland.changes 2020-01-15 15:56:56.475718200 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.redland.new.3160/redland.changes 2020-03-13 10:55:09.224339646 +0100 @@ -1,0 +2,7 @@ +Fri Mar 1 14:56:41 UTC 2019 - Reinhard Max <[email protected]> + +- PostrgeSQL's pg_config is meant for linking server extensions, + use libpq's pkg-config instead (redland-postgresql.patch). + This is needed to fix build with PostgreSQL 11. + +------------------------------------------------------------------- New: ---- redland-postgresql.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ redland.spec ++++++ --- /var/tmp/diff_new_pack.g5W6Ma/_old 2020-03-13 10:55:09.736340011 +0100 +++ /var/tmp/diff_new_pack.g5W6Ma/_new 2020-03-13 10:55:09.740340014 +0100 @@ -1,7 +1,7 @@ # # spec file for package redland # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,7 +23,7 @@ Version: 1.0.17 Release: 0 Summary: Libraries that provide support for the Resource Description Framework (RDF) -License: LGPL-2.1+ and Apache-2.0 +License: LGPL-2.1-or-later AND Apache-2.0 Group: System/Libraries Url: http://www.librdf.org @@ -34,6 +34,7 @@ Patch1: redland-ocloexec.patch %endif Patch2: redland-db6.diff +Patch3: redland-postgresql.patch BuildRequires: autoconf BuildRequires: db-devel BuildRequires: librasqal-devel @@ -89,6 +90,7 @@ %if 0%{?suse_version} >= 1210 %patch1 -p1 %endif +%patch3 # # If multiple libdb-X.Y.so are installed, redland's logic in configure.ac picks # the library by the numbers it knows (and it may not know future versions!), ++++++ redland-postgresql.patch ++++++ --- configure.ac.orig +++ configure.ac @@ -727,30 +727,26 @@ else AC_MSG_RESULT(no) fi -AC_ARG_WITH(postgresql, [ --with-postgresql(=CONFIG|yes|no) Location of pg_config (default=auto)], pg_config="$withval", postgresql_config="") -if test "X$pg_config" != "Xno"; then - if test "X$pg_config" != "Xyes" ; then - PG_CONFIG=$pg_config - fi - pg_config=yes -fi -if test $pg_config = yes -a "X$PG_CONFIG" = "X" ; then - AC_CHECK_PROGS(PG_CONFIG, pg_config) + +AC_ARG_WITH(postgresql, [ --with-postgresql(=yes|no) Enable PostgreSQL store (default=auto)], with_postgresql="$withval", with_postgresql="auto") + +if test "X$with_postgresql" != Xno; then + PKG_CHECK_MODULES([POSTGRESQL],[libpq],[ + POSTGRESQL_VERSION=`$PKG_CONFIG libpq --modversion` + with_postgresql=yes + ],[with_postgresql=no]) fi AC_MSG_CHECKING(for postgresql library) -if test "X$PG_CONFIG" != X ; then - postgresql_version=`$PG_CONFIG --version | sed -e 's/^.* //'` - storages_available="$storages_available postgresql($postgresql_version)" +if test "X$with_postgresql" != Xno ; then + storages_available="$storages_available postgresql($POSTGRESQL_VERSION)" postgresql_storage_available=yes + AC_MSG_RESULT(yes - version $POSTGRESQL_VERSION) - AC_MSG_RESULT(yes - version $postgresql_version) - - CPPFLAGS="$LIBRDF_CPPFLAGS -I`$PG_CONFIG --includedir`" + CPPFLAGS="$LIBRDF_CPPFLAGS $POSTGRESQL_CFLAGS" AC_CHECK_HEADERS(libpq-fe.h) CPPFLAGS="$LIBRDF_CPPFLAGS" - - LIBS="$LIBRDF_LIBS -L`$PG_CONFIG --libdir` -lpq" + POSTGRESQL_CPPFLAGS="$POSTGRESQL_CFLAGS" else AC_MSG_RESULT(no) fi @@ -1082,8 +1078,8 @@ if test $tstore_storage = yes; then TSTORE_LIBS="`$TSTORE_CONFIG --libs` `$PKG_CONFIG glib --libs`" fi if test $postgresql_storage = yes; then - POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" - POSTGRESQL_LIBS="-L`$PG_CONFIG --libdir` -lpq" + POSTGRESQL_CPPFLAGS="`$PKG_CONFIG libpq --cflags`" + POSTGRESQL_LIBS="`$PKG_CONFIG libpq --libs`" fi if test $virtuoso_storage = yes; then VIRTUOSO_CPPFLAGS="$ODBC_CFLAGS"
