rpms/libapreq2/F-8 libapreq2-2.09-pkgconfig.patch, NONE, 1.1 libapreq2.pc.in, NONE, 1.1 libapreq2.spec, 1.29, 1.30
Bojan Smojver (bojan)
fedora-extras-commits at redhat.com
Tue Oct 23 03:00:36 UTC 2007
Author: bojan
Update of /cvs/pkgs/rpms/libapreq2/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26133
Modified Files:
libapreq2.spec
Added Files:
libapreq2-2.09-pkgconfig.patch libapreq2.pc.in
Log Message:
Backport multilib changes from devel.
libapreq2-2.09-pkgconfig.patch:
--- NEW FILE libapreq2-2.09-pkgconfig.patch ---
--- configure.ac.original 2006-11-09 16:21:26.000000000 +1100
+++ configure.ac 2007-10-22 17:31:04.000000000 +1000
@@ -35,4 +35,5 @@
AC_CONFIG_FILES([Makefile include/Makefile library/Makefile library/t/Makefile module/Makefile module/apache2/Makefile glue/Makefile])
AC_CONFIG_FILES([build/doxygen.conf include/groups.dox])
AC_CONFIG_FILES([apreq2-config], [chmod +x apreq2-config])
+AC_CONFIG_FILES([libapreq2.pc])
AC_OUTPUT
--- NEW FILE libapreq2.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
datarootdir=@datarootdir@
libdir=@libdir@
includedir=@includedir@
Name: libapreq2
Description: Apache HTTP request library
Version: @VERSION@
URL: http://httpd.apache.org/apreq/
Libs: -L${libdir} -l at APREQ_LIBNAME@ @APR_LDFLAGS@ @APR_LIBS@
Cflags: @CPPFLAGS@ @CFLAGS@ @APR_INCLUDES@ -I${includedir}
Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/F-8/libapreq2.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libapreq2.spec 1 Sep 2007 11:52:17 -0000 1.29
+++ libapreq2.spec 23 Oct 2007 03:00:01 -0000 1.30
@@ -2,7 +2,7 @@
Name: libapreq2
Version: 2.09
-Release: 0.rc2.7%{?dist}
+Release: 0.rc2.10%{?dist}
Summary: Apache HTTP request library
Group: System Environment/Libraries
@@ -10,9 +10,11 @@
URL: http://httpd.apache.org/apreq/
Source0: http://people.apache.org/~pgollucci/apreq2/libapreq2-2.09.tar.gz
Source1: %{name}-httpd.conf
+Source2: %{name}.pc.in
Patch0: %{name}-build.patch
Patch1: %{name}-2.07-rc3-ldflags.patch
Patch2: %{name}-2.09-version_check.patch
+Patch3: %{name}-2.09-pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: httpd-devel >= 2.0.48
@@ -39,6 +41,7 @@
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: httpd-devel >= 2.0.48
+Requires: pkgconfig
Provides: libapreq-devel = %{version}-%{release}
%description devel
@@ -86,7 +89,15 @@
%patch0
%patch1
%patch2
-%{__perl} -pi -e 's|/usr/lib|%{_libdir}|' apreq2-config.in # patch1 ~ multilib
+%patch3
+
+# Fix multilib
+sed -i -e 's,^libdir=.*,libdir=`pkg-config --variable=libdir %{name}`,' \
+ -e 's,^LDFLAGS=.*,LDFLAGS=`pkg-config --libs %{name}`,' \
+ -e 's,^INCLUDES=.*,INCLUDES=`pkg-config --cflags-only-I %{name}`,' \
+ apreq2-config.in
+
+cp %{SOURCE2} .
./buildconf
@@ -105,6 +116,8 @@
%install
rm -rf $RPM_BUILD_ROOT __docs
make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+install -m 644 %{name}.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/apreq.conf
cp -pR docs/html __docs ; rm __docs/installdox
@@ -146,6 +159,7 @@
%{_includedir}/apreq2/
%{_includedir}/httpd/apreq2/
%{_libdir}/libapreq2.so
+%{_libdir}/pkgconfig/*.pc
%files -n perl-%{name}
%defattr(-,root,root,-)
@@ -157,6 +171,15 @@
%changelog
+* Tue Oct 23 2007 Bojan Smojver <bojan at rexursive.com> - 2.09-0.rc2.10
+- retag for rebuild
+
+* Tue Oct 23 2007 Bojan Smojver <bojan at rexursive.com> - 2.09-0.rc2.9
+- only use pkg-config for --ldflags in apreq2-config (closer, but not perfect)
+
+* Mon Oct 22 2007 Bojan Smojver <bojan at rexursive.com> - 2.09-0.rc2.8
+- attempt to fix multilib issues (bug #341901)
+
* Sat Sep 01 2007 Bojan Smojver <bojan at rexursive.com> - 2.09-0.rc2.7
- rebuild against apr-1.2.9-3 (bug #254241)
More information about the fedora-extras-commits
mailing list