- rel 3; force removal of -L/usr/lib, -L/usr/lib32, -L/usr/lib64 from ldflags (includ...

diff --git a/apr-util-link.patch b/apr-util-link.patch
index eaa9b7b2dd6c6d95b8dd6eca8e956544446f4ea1..d85fac44510db8bdea7809022845f170c891483e 100644 (file)
--- a/apr-util-link.patch
+++ b/apr-util-link.patch
@@ -13,3 +13,17 @@
  AC_MSG_CHECKING(if system crypt() function is threadsafe)
  if test "x$apu_crypt_threadsafe" = "x1"; then
    AC_DEFINE(APU_CRYPT_THREADSAFE, 1, [Define if the system crypt() function is threadsafe])
+--- apr-util-1.5.4/configure.in~       2016-04-08 22:47:59.000000000 +0200
++++ apr-util-1.5.4/configure.in        2016-04-08 22:50:43.902956204 +0200
+@@ -227,6 +227,11 @@ AC_SUBST(APRUTIL_EXPORT_LIBS)
+ AC_SUBST(APRUTIL_PRIV_INCLUDES)
+ APRUTIL_INCLUDES="$APRUTIL_INCLUDES -I/usr/include/apr"
+ AC_SUBST(APRUTIL_INCLUDES)
++
++APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib])
++APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib32])
++APR_REMOVEFROM(APRUTIL_LDFLAGS,[-L/usr/lib64])
++
+ AC_SUBST(APRUTIL_LDFLAGS)
+ AC_SUBST(APRUTIL_LIBS)
+ AC_SUBST(LDFLAGS)

diff --git a/apr-util.spec b/apr-util.spec
index 30755258b2da9a12d5d141029bda01bf34d12f08..0ae1b94c08f4d651adec7017e9ecbc44e01b924e 100644 (file)
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -36,7 +36,7 @@ Summary:      A companion library to Apache Portable Runtime
 Summary(pl.UTF-8):     Biblioteka towarzysząca Apache Portable Runtime
 Name:          apr-util
 Version:       1.5.4
-Release:       2
+Release:       3
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries