[libapreq2/el4/master] Revert "Bump up to 2.13."
bojan
bojan at fedoraproject.org
Tue Dec 7 02:25:17 UTC 2010
commit 50d7ac82bbb7e9c49ce2f915f0e6ccc7ef171900
Author: Bojan Smojver <bojan at rexursive.com>
Date: Tue Dec 7 13:24:23 2010 +1100
Revert "Bump up to 2.13."
This reverts commit f8fef1b74f1e262f9a2b1c8e1da82ef88187722d.
libapreq2.spec | 33 ++++++++++++++++-----------------
sources | 2 +-
2 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/libapreq2.spec b/libapreq2.spec
index da31b7b..a2f0ffe 100644
--- a/libapreq2.spec
+++ b/libapreq2.spec
@@ -1,20 +1,21 @@
%{!?apxs: %{expand:%%define apxs %{_sbindir}/apxs}}
Name: libapreq2
-Version: 2.13
-Release: 1%{?dist}
+Version: 2.09
+Release: 0.17.rc2%{?dist}
Summary: Apache HTTP request library
Group: System Environment/Libraries
License: ASL 2.0
URL: http://httpd.apache.org/apreq/
-Source0: http://www.apache.org/dist/httpd/libapreq/libapreq2-%{version}.tar.gz
+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-pkgconfig.patch
-Patch3: %{name}-2.12-install.patch
+Patch2: %{name}-2.09-version_check.patch
+Patch3: %{name}-2.09-pkgconfig.patch
+Patch4: %{name}-2.09-Makefile_PL.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: httpd-devel >= 2.0.48
@@ -89,7 +90,15 @@ apuver=$(apu-1-config --version || apu-config --version)
%patch0
%patch1
%patch2
-%patch3 -p1
+%patch3
+%patch4
+
+# 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} .
@@ -106,19 +115,12 @@ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
--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
-
%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
-PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_libdir}/pkgconfig make install DESTDIR=$RPM_BUILD_ROOT
install -Dpm 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/apreq.conf
cp -pR docs/html __docs ; rm __docs/installdox
@@ -172,9 +174,6 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Tue Dec 7 2010 Bojan Smojver <bojan at rexursive.com> - 2.13-1
-- bump up to 2.13 release
-
* Thu Jun 5 2008 Bojan Smojver <bojan at rexursive.com> - 2.09-0.17.rc2
- bump to re-tag
diff --git a/sources b/sources
index 17011b2..b5a038d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c11fb0861aa84dcc6cd0f0798b045eee libapreq2-2.13.tar.gz
+3cd98755da8a8431ef35a47461ad67d7 libapreq2-2.09.tar.gz
More information about the scm-commits
mailing list