Hello community, here is the log from the commit of package apr-util for openSUSE:Factory checked in at 2019-12-23 22:41:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apr-util (Old) and /work/SRC/openSUSE:Factory/.apr-util.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apr-util" Mon Dec 23 22:41:43 2019 rev:9 rq:757731 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/apr-util/apr-util.changes 2019-03-12 09:50:14.519576008 +0100 +++ /work/SRC/openSUSE:Factory/.apr-util.new.6675/apr-util.changes 2019-12-23 22:43:34.821980041 +0100 @@ -1,0 +2,7 @@ +Wed Dec 18 10:46:26 UTC 2019 - pgaj...@suse.com + +- fix linking with libpq +- modified patches + % apr-util-postgresql.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apr-util.spec ++++++ --- /var/tmp/diff_new_pack.OZWCab/_old 2019-12-23 22:43:36.449980746 +0100 +++ /var/tmp/diff_new_pack.OZWCab/_new 2019-12-23 22:43:36.465980753 +0100 @@ -1,7 +1,7 @@ # # spec file for package apr-util # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ Summary: Apache Portable Runtime (APR) Utility Library License: Apache-2.0 Group: Development/Libraries/C and C++ -Url: http://apr.apache.org/ +URL: http://apr.apache.org/ Source: http://www.apache.org/dist/apr/apr-util-%{version}.tar.bz2 Patch1: apr-util-1.4.1-testmemcache-initialize-values-array.patch Patch2: apr-util-visibility.patch @@ -113,7 +113,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 +%patch4 -p1 %build echo 'HTML_TIMESTAMP=NO' >> docs/doxygen.conf ++++++ apr-util-postgresql.patch ++++++ --- /var/tmp/diff_new_pack.OZWCab/_old 2019-12-23 22:43:36.501980769 +0100 +++ /var/tmp/diff_new_pack.OZWCab/_new 2019-12-23 22:43:36.505980771 +0100 @@ -1,6 +1,8 @@ ---- build/dbd.m4.orig -+++ build/dbd.m4 -@@ -29,124 +29,48 @@ AC_DEFUN([APU_CHECK_DBD], [ +Index: apr-util-1.6.1/build/dbd.m4 +=================================================================== +--- apr-util-1.6.1.orig/build/dbd.m4 2019-12-18 12:24:45.282233734 +0100 ++++ apr-util-1.6.1/build/dbd.m4 2019-12-18 12:44:30.092965482 +0100 +@@ -29,125 +29,49 @@ AC_DEFUN([APU_CHECK_DBD], [ old_ldflags="$LDFLAGS" AC_ARG_WITH([pgsql], APR_HELP_STRING([--with-pgsql=DIR], [specify PostgreSQL location]), @@ -45,7 +47,11 @@ - fi - elif test "$withval" = "no"; then - : -- else ++ if test "x$PGSQL_CONFIG" != 'x'; then ++ pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" ++ pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" ++ pgsql_LIBS="`$PGSQL_CONFIG --libs` -lpq" + else - AC_PATH_PROG([PGSQL_CONFIG],[pg_config],,[$withval/bin]) - if test "x$PGSQL_CONFIG" != 'x'; then - pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" @@ -54,19 +60,15 @@ - pgsql_CPPFLAGS="-I$withval/include" - pgsql_LDFLAGS="-L$withval/lib " - fi -+ if test "x$PGSQL_CONFIG" != 'x'; then -+ pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" -+ pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" - -- APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) -- APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) -+ else + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) + if test -n "$PKG_CONFIG"; then + pgsql_CPPFLAGS="`$PKG_CONFIG libpq --cflags`" -+ pgsql_LDFLAGS="`$PKG_CONFIG libpq --libs`" ++ pgsql_LDFLAGS="`$PKG_CONFIG libpq --libdir`" + pgsql_LIBS="`$PKG_CONFIG libpq --libs`" +- APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) +- APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) +- - AC_MSG_NOTICE(checking for pgsql in $withval) - AC_CHECK_HEADERS(libpq-fe.h, [ - AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1],[ @@ -104,7 +106,7 @@ - pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" - pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" -+ if test -n "pgsql_CPPFLAGS"; then ++ if test -n "$pgsql_CPPFLAGS"; then APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) - fi @@ -145,8 +147,9 @@ AC_SUBST(apu_have_pgsql) dnl Since we have already done the AC_CHECK_LIB tests, if we have it, dnl we know the library is there. -- if test "$apu_have_pgsql" = "1"; then -+ if test "$apu_have_pgsql" = "1" && test "x$PGSQL_CONFIG" != 'x'; then - APR_ADDTO(LDADD_dbd_pgsql, [$pgsql_LDFLAGS -lpq $pgsql_LIBS]) + if test "$apu_have_pgsql" = "1"; then +- APR_ADDTO(LDADD_dbd_pgsql, [$pgsql_LDFLAGS -lpq $pgsql_LIBS]) ++ APR_ADDTO(LDADD_dbd_pgsql, [$pgsql_LDFLAGS $pgsql_LIBS]) fi AC_SUBST(LDADD_dbd_pgsql) +
