From 058590f3812359118fed695a43dda40cedbaa968 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Feb 07 2013 14:59:06 +0000 Subject: Patch for Merge Review. --- diff --git a/apr-util-1.4.1-private.patch b/apr-util-1.4.1-private.patch new file mode 100644 index 0000000..296362e --- /dev/null +++ b/apr-util-1.4.1-private.patch @@ -0,0 +1,10 @@ +--- apr-util-1.4.1/apr-util.pc.in~ 2008-05-23 16:27:37.000000000 -0500 ++++ apr-util-1.4.1/apr-util.pc.in 2013-02-07 08:55:09.717312176 -0600 +@@ -9,5 +9,6 @@ + Version: @APRUTIL_DOTTED_VERSION@ + # assume that apr-util requires libapr of same major version + Requires: apr-@APRUTIL_MAJOR_VERSION@ +-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@ ++Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ ++Libs.private: @APRUTIL_EXPORT_LIBS@ + Cflags: -I${includedir} diff --git a/apr-util.spec b/apr-util.spec index 8468fbe..09f05b9 100644 --- a/apr-util.spec +++ b/apr-util.spec @@ -10,7 +10,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.4.1 -Release: 7%{?dist} +Release: 8%{?dist} License: ASL 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -18,6 +18,7 @@ Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 Patch1: apr-util-1.2.7-pkgconf.patch Patch2: apr-util-1.3.7-nodbmdso.patch Patch3: apr-util-1.4.1-r1346875.patch +Patch4: apr-util-1.4.1-private.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: autoconf, apr-devel >= 1.3.0 BuildRequires: %{dbdep}, expat-devel, libuuid-devel @@ -122,6 +123,7 @@ This package provides the NSS crypto support for the apr-util. %patch1 -p1 -b .pkgconf %patch2 -p1 -b .nodbmdso %patch3 -p1 -b .r1346875 +%patch4 -p1 -b .private %build autoheader && autoconf @@ -226,6 +228,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/aclocal/*.m4 %changelog +* Thu Feb 07 2013 Jon Ciesla - 1.4.1-8 +- Apply private patch from Merge Review BZ 225254. + * Wed Nov 07 2012 Jan Kaluza - 1.4.1-7 - ensure we use latest libdb5 (not libdb4)