rpms/libapreq2/F-10 libapreq2.spec,1.41,1.42

[Bojan Smojver]

Author: bojan

Update of /cvs/pkgs/rpms/libapreq2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27706

Modified Files:
	libapreq2.spec 
Log Message:
Delay changing apreq2-config, so we don't pick up wrong libs.


Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/F-10/libapreq2.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libapreq2.spec	7 Jul 2008 22:21:13 -0000	1.41
+++ libapreq2.spec	7 Jan 2009 08:42:13 -0000	1.42
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.18.rc2%{?dist}
+Release:        0.19.rc2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -95,13 +95,6 @@
 %patch4
 %patch5
 
-# Fix multilib
-sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
-       -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
-       -e 's,^LIBS=.*,LIBS=`pkg-config --libs %{name}`,' \
-       -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
-        apreq2-config.in
-
 cp %{SOURCE2} .
 
 ./buildconf
@@ -117,6 +110,16 @@
   --with-mm-opts=INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
+# Fix multilib
+sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
+       -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
+       -e 's,^LIBS=.*,LIBS=`pkg-config --libs %{name}`,' \
+       -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
+        apreq2-config.in
+
+# Now build apreq2-config again
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
@@ -176,6 +179,9 @@
 
 
 %changelog
+* Wed Jan  7 2009 Bojan Smojver <bojan at rexursive.com> - 2.09-0.19.rc2
+- delay changing apreq2-config, so we don't pick up wrong libs
+
 * Tue Jul  8 2008 Bojan Smojver <bojan at rexursive.com> - 2.09-0.18.rc2
 - add patch to use --avoid-ldap with apu-1-config