rpms/apr-util/devel apr-util-1.2.7-pkgconf.patch, NONE, 1.1 apr-util-1.2.7.tar.gz.asc, NONE, 1.1 .cvsignore, 1.5, 1.6 apr-util.spec, 1.25, 1.26 sources, 1.7, 1.8 upstream, 1.5, 1.6 apr-util-1.2.6.tar.gz.asc, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/apr-util/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28995

Modified Files:
	.cvsignore apr-util.spec sources upstream 
Added Files:
	apr-util-1.2.7-pkgconf.patch apr-util-1.2.7.tar.gz.asc 
Removed Files:
	apr-util-1.2.6.tar.gz.asc 
Log Message:
* Tue May  2 2006 Joe Orton <jorton at redhat.com> 1.2.7-2
- update to 1.2.7
- use pkg-config in apu-1-config to make it libdir-agnostic


apr-util-1.2.7-pkgconf.patch:
 Makefile.in   |    2 +-
 apu-config.in |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE apr-util-1.2.7-pkgconf.patch ---
--- apr-util-1.2.7/Makefile.in.pkgconf
+++ apr-util-1.2.7/Makefile.in
@@ -51,7 +51,7 @@
 
 # Create apu-config script suitable for the install tree
 apu-config.out: $(APU_CONFIG)
-	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
+	sed 's,^\(location=\).*$$,\1installed,;s,^\(APR_.*_DIR\)=.*,\1="$${libdir}/build",' < $(APU_CONFIG) > $@
 
 install: $(TARGET_LIB) apu-config.out
 	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
--- apr-util-1.2.7/apu-config.in.pkgconf
+++ apr-util-1.2.7/apu-config.in
@@ -24,9 +24,10 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 bindir="@bindir@"
-libdir="@libdir@"
 includedir="@includedir@"
 
+libdir=`pkg-config --variable=libdir apr-util- at APRUTIL_MAJOR_VERSION@`
+
 LIBS="@APRUTIL_EXPORT_LIBS@"
 INCLUDES="@APRUTIL_INCLUDES@"
 LDFLAGS="@APRUTIL_LDFLAGS@"


--- NEW FILE apr-util-1.2.7.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)

iQEVAwUARDlyqfcTqHkQ/eB1AQI4JAf+IQDyDgD0lCurjyYG/AhuhynO8GAK38hP
9mtF4foyU5LRFD1csPx/84/+bU1/CW1KDMZZB+2nEXSKdicLa/voOB/yolLI1D/b
E7Qg4INI7gSTKXLrnmGTTE3hoh+6py4YWQqbmIzh9rwQG2utqbKtH9jM8JCcVtk8
MML9epmSy7rLRl7H24SMuX6dFkX8w1RkJjKMqWbHbg0IchQ88XbEn2DOaELTdYp4
xv4mxgMxNq/Fdx4Rc65otoZ/68deRdLBWF4EGmIn48TWtHrKEhsMlTOQS/lRY3tZ
mpEowGqbYY5a+OgkvwwX6rGRomI1Hrle9SH9wRUQgVxeNfudY9fxLA==
=w5u2
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Oct 2005 09:06:59 -0000	1.5
+++ .cvsignore	2 May 2006 10:52:38 -0000	1.6
@@ -1 +1 @@
-apr-util-0.9.7.tar.gz
+apr-util-1.2.7.tar.gz


Index: apr-util.spec
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/apr-util.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apr-util.spec	6 Apr 2006 14:22:22 -0000	1.25
+++ apr-util.spec	2 May 2006 10:52:38 -0000	1.26
@@ -3,7 +3,7 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.2.6
+Version: 1.2.7
 Release: 2
 License: Apache Software License 2.0
 Group: System Environment/Libraries
@@ -11,6 +11,7 @@
 Source0: %{name}-%{version}.tar.gz
 Patch0: apr-util-1.2.2-exports.patch
 Patch1: apr-util-1.2.6-ldap.patch
+Patch2: apr-util-1.2.7-pkgconf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0
 BuildRequires: openldap-devel, db4-devel, expat-devel
@@ -27,7 +28,7 @@
 %package devel
 Group: Development/Libraries
 Summary: APR utility library development kit
-Requires: apr-util = %{version}-%{release}, apr-devel
+Requires: apr-util = %{version}-%{release}, apr-devel, pkgconfig
 Requires: openldap-devel, db4-devel, expat-devel
 Conflicts: subversion-devel < 0.20.1-2
 
@@ -41,6 +42,7 @@
 %setup -q
 %patch0 -p1 -b .exports
 %patch1 -p1 -b .ldap
+%patch2 -p1 -b .pkgconf
 
 %build
 autoheader && autoconf
@@ -104,6 +106,10 @@
 %doc --parents html
 
 %changelog
+* Tue May  2 2006 Joe Orton <jorton at redhat.com> 1.2.7-2
+- update to 1.2.7
+- use pkg-config in apu-1-config to make it libdir-agnostic
+
 * Thu Apr  6 2006 Joe Orton <jorton at redhat.com> 1.2.6-2
 - update to 1.2.6
 - define LDAP_DEPRECATED in apr_ldap.h (r391985, #188073)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Apr 2006 14:22:22 -0000	1.7
+++ sources	2 May 2006 10:52:38 -0000	1.8
@@ -1 +1 @@
-f8f17dd6bd17926ab2b03767f1f3a1fc  apr-util-1.2.6.tar.gz
+c3702668a640be1695956115857ec22e  apr-util-1.2.7.tar.gz


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/apr-util/devel/upstream,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- upstream	6 Apr 2006 14:22:22 -0000	1.5
+++ upstream	2 May 2006 10:52:38 -0000	1.6
@@ -1 +1 @@
-apr-util-1.2.6.tar.gz
+apr-util-1.2.7.tar.gz


--- apr-util-1.2.6.tar.gz.asc DELETED ---