rpms/apr/devel apr-1.2.7-pkgconf.patch, 1.3, 1.4 apr.spec, 1.55, 1.56 apr-0.9.6-procexit.patch, 1.1, NONE apr-1.2.2-chdirwarn.patch, 1.1, NONE apr-1.2.2-random.patch, 1.1, NONE apr-1.2.2-reuseaddr.patch, 1.1, NONE apr-1.2.2-seekflush.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: jorton

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

Modified Files:
	apr-1.2.7-pkgconf.patch apr.spec 
Removed Files:
	apr-0.9.6-procexit.patch apr-1.2.2-chdirwarn.patch 
	apr-1.2.2-random.patch apr-1.2.2-reuseaddr.patch 
	apr-1.2.2-seekflush.patch 
Log Message:
* Tue May 23 2006 Joe Orton <jorton at redhat.com> 1.2.7-7
- fix another multilib conflict (#192659)


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

Index: apr-1.2.7-pkgconf.patch
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr-1.2.7-pkgconf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr-1.2.7-pkgconf.patch	2 May 2006 10:58:29 -0000	1.3
+++ apr-1.2.7-pkgconf.patch	23 May 2006 10:16:00 -0000	1.4
@@ -17,9 +17,23 @@
  
  # Create apr_rules.mk suitable for the install tree
  build/apr_rules.out: build/apr_rules.mk
+--- apr-1.2.7/apr.pc.in.pkgconf
++++ apr-1.2.7/apr.pc.in
+@@ -3,9 +3,10 @@
+ libdir=@libdir@
+ APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
+ includedir=@includedir@
++CPPFLAGS=@EXTRA_CPPFLAGS@
+ 
+ Name: APR
+ Description: The Apache Portable Runtime library
+ Version: @APR_DOTTED_VERSION@
+ Libs: -L${libdir} -l at APR_LIBNAME@ @EXTRA_LIBS@
+-Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir}
++Cflags: ${CPPFLAGS} @EXTRA_CFLAGS@ -I${includedir}
 --- apr-1.2.7/apr-config.in.pkgconf
 +++ apr-1.2.7/apr-config.in
-@@ -24,11 +24,12 @@
+@@ -24,15 +24,16 @@
  prefix="@prefix@"
  exec_prefix="@exec_prefix@"
  bindir="@bindir@"
@@ -34,3 +48,8 @@
  CC="@CC@"
  CPP="@CPP@"
  SHELL="@SHELL@"
+-CPPFLAGS="@EXTRA_CPPFLAGS@"
++CPPFLAGS=`pkg-config --variable=CPPFLAGS apr- at APR_MAJOR_VERSION@`
+ CFLAGS="@EXTRA_CFLAGS@"
+ LDFLAGS="@EXTRA_LDFLAGS@"
+ LIBS="@EXTRA_LIBS@"


Index: apr.spec
===================================================================
RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- apr.spec	16 May 2006 10:42:39 -0000	1.55
+++ apr.spec	23 May 2006 10:16:00 -0000	1.56
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.7
-Release: 6
+Release: 7
 License: Apache Software License
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -126,6 +126,9 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Tue May 23 2006 Joe Orton <jorton at redhat.com> 1.2.7-7
+- fix another multilib conflict (#192659)
+
 * Tue May 16 2006 Joe Orton <jorton at redhat.com> 1.2.7-6
 - BR e2fsprogs-devel for libuuid
 


--- apr-0.9.6-procexit.patch DELETED ---


--- apr-1.2.2-chdirwarn.patch DELETED ---


--- apr-1.2.2-random.patch DELETED ---


--- apr-1.2.2-reuseaddr.patch DELETED ---


--- apr-1.2.2-seekflush.patch DELETED ---