rpms/libapreq2/devel libapreq2.spec,1.42,1.43

Bojan Smojver bojan at fedoraproject.org
Wed Jan 7 08:39:35 UTC 2009


Author: bojan

Update of /cvs/pkgs/rpms/libapreq2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26545

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/devel/libapreq2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libapreq2.spec	13 Nov 2008 07:17:11 -0000	1.42
+++ libapreq2.spec	7 Jan 2009 08:39:04 -0000	1.43
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.10
-Release:        0.rc1.1%{?dist}
+Release:        0.rc1.2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -89,13 +89,6 @@
 %patch1
 %patch2
 
-# 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
@@ -111,6 +104,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
@@ -170,6 +173,10 @@
 
 
 %changelog
+
+* Wed Jan  7 2009 Bojan Smojver <bojan at rexursive.com> - 2.10-0.rc1.2
+- delay changing apreq2-config, so we don't pick up wrong libs
+
 * Thu Nov 13 2008 Bojan Smojver <bojan at rexursive.com> - 2.10-0.rc1.1
 - bump up to 2.10-RC1
 




More information about the scm-commits mailing list