rpms/apr/devel apr-1.2.7-pkgconf.patch, NONE, 1.1 apr-1.2.7.tar.gz.asc, NONE, 1.1 .cvsignore, 1.7, 1.8 apr.spec, 1.49, 1.50 sources, 1.7, 1.8 upstream, 1.5, 1.6

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue May 2 10:02:56 UTC 2006 

Author: jorton

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

Modified Files:
	.cvsignore apr.spec sources upstream 
Added Files:
	apr-1.2.7-pkgconf.patch apr-1.2.7.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 apr-1-config to make it libdir-agnostic


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

--- NEW FILE apr-1.2.7-pkgconf.patch ---

This is a fugly hack to make apr-1-config libdir-agnostic, by using
pkg-config to determine the libdir setting.  pkg-config will
magically determine the appropriate libdir setting.

This allows apr-devel.i386 and apr-devel.x86_64 to be 
installed in parallel.

--- apr-1.2.7/Makefile.in.pkgconf
+++ apr-1.2.7/Makefile.in
@@ -60,7 +60,7 @@
 
 # Create apr-config script suitable for the install tree
 apr-config.out: $(APR_CONFIG)
-	sed 's,^\(location=\).*$$,\1installed,' < $(APR_CONFIG) > $@
+	sed 's,^\(location=\).*$$,\1installed,;s,^\(APR_.*_DIR\)=.*,\1="$${libdir}/build",' < $(APR_CONFIG) > $@
 
 # Create apr_rules.mk suitable for the install tree
 build/apr_rules.out: build/apr_rules.mk
--- apr-1.2.7/apr-config.in.pkgconf
+++ apr-1.2.7/apr-config.in
@@ -24,11 +24,12 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 bindir="@bindir@"
-libdir="@libdir@"
 datadir="@datadir@"
-installbuilddir="@installbuilddir@"
 includedir="@includedir@"
 
+libdir=`pkg-config --variable=libdir apr- at APR_MAJOR_VERSION@`
+installbuilddir="${libdir}/build"
+
 CC="@CC@"
 CPP="@CPP@"
 SHELL="@SHELL@"


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

iQEVAwUARDlvtfcTqHkQ/eB1AQI6ugf9EBBj7aRMNkteCmgUHYXgixLwbEDgkgEy
RZvaDCdZZDk7jvqDIL06QBxqwm0qV1xjpjzTLd6qxUPx/xEaGEu4da1r9g+6ScWO
WTdDVTHoCUL6irrpGsTkZ0FO7E78oUDPjoEJZchGBc5Q6xZ8KqJ+39TSCIg+myOx
WGGzzlsIFPbEpRisRAiLv1OsbUSRWyPgL+Xs3PmEZGb7WYI+SqfNqorB9Qy6Feco
UTsiuGneSNwel9cpVU3lx15T5VqveKEP9QsUmucvoFrNcsw6hLtd6hScP02hH+YQ
UOTblD99zA3uhuRqN6N/1pkP7mmY71UkABqQ/m2Wo8LsXWrlaIqueQ==
=lrVi
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Apr 2006 12:22:56 -0000	1.7
+++ .cvsignore	2 May 2006 10:02:31 -0000	1.8
@@ -1,2 +1 @@
-apr-1.2.6.tar.gz
-clog
+apr-1.2.7.tar.gz


Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- apr.spec	6 Apr 2006 12:22:56 -0000	1.49
+++ apr.spec	2 May 2006 10:02:50 -0000	1.50
@@ -2,16 +2,17 @@
 
 Summary: Apache Portable Runtime library
 Name: apr
-Version: 1.2.6
+Version: 1.2.7
 Release: 2
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
 Patch1: apr-0.9.6-readdir64.patch
-Patch3: apr-0.9.7-deepbind.patch
-Patch6: apr-1.2.2-locktimeout.patch
-Patch7: apr-1.2.2-libdir.patch
+Patch2: apr-0.9.7-deepbind.patch
+Patch3: apr-1.2.2-locktimeout.patch
+Patch4: apr-1.2.2-libdir.patch
+Patch5: apr-1.2.7-pkgconf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen
 Conflicts: subversion < 0.20.1-2
@@ -26,7 +27,7 @@
 Group: Development/Libraries
 Summary: APR library development kit
 Conflicts: subversion-devel < 0.20.1-2
-Requires: apr = %{version}-%{release}, gcc = %(gcc -dumpversion)
+Requires: apr = %{version}-%{release}, gcc = %(gcc -dumpversion), pkgconfig
 # shipped libtool hard-codes paths to gcc libraries in versioned dir
 
 %description devel
@@ -38,9 +39,10 @@
 %prep
 %setup -q
 %patch1 -p1 -b .readdir64
-%patch3 -p1 -b .deepbind
-%patch6 -p1 -b .locktimeout
-%patch7 -p1 -b .libdir
+%patch2 -p1 -b .deepbind
+%patch3 -p1 -b .locktimeout
+%patch4 -p1 -b .libdir
+%patch5 -p1 -b .pkgconf
 
 %build
 # regenerate configure script etc.
@@ -112,6 +114,10 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Tue May  2 2006 Joe Orton <jorton at redhat.com> 1.2.7-2
+- update to 1.2.7
+- use pkg-config in apr-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
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Apr 2006 12:22:56 -0000	1.7
+++ sources	2 May 2006 10:02:50 -0000	1.8
@@ -1 +1 @@
-d36790357acd43224000a2e493d7c701  apr-1.2.6.tar.gz
+aea926cbe588f844ad9e317157d60175  apr-1.2.7.tar.gz


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

More information about the fedora-cvs-commits mailing list