rpms/libapreq2/devel libapreq2.spec,1.5,1.6
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sat Dec 10 20:37:23 UTC 2005
- Previous message: rpms/dkms/devel .cvsignore, 1.4, 1.5 dkms.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message: rpms/xemacs-sumo/devel xemacs-sumo-20051208-hypb-posix.patch, NONE, 1.1 xemacs-sumo-20051208-pydoc-path.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xemacs-sumo.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/libapreq2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15700
Modified Files:
libapreq2.spec
Log Message:
* Sat Dec 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.07-0.2.rc3
- Filter unversioned perl(*) provides for which a versioned one exists.
Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libapreq2.spec 8 Dec 2005 20:32:12 -0000 1.5
+++ libapreq2.spec 10 Dec 2005 20:37:21 -0000 1.6
@@ -2,7 +2,7 @@
Name: libapreq2
Version: 2.07
-Release: 0.1.rc3%{?dist}
+Release: 0.2.rc3%{?dist}
Summary: Apache HTTP request library
Group: System Environment/Libraries
@@ -56,6 +56,18 @@
%prep
%setup -q
+
+# Filter unversioned provides for which there's a versioned one in perl-*:
+cat << \EOF > %{name}-perl-prov
+#!/bin/sh
+%{__perl_provides} $* \
+| grep -v 'perl(APR::\(Request\(::\(Apache2\|CGI\|Error\)\)\?\))$' \
+| grep -v 'perl(Apache2::\(Cookie\|Request\|Upload\))$'
+EOF
+%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl-prov
+chmod +x %{__perl_provides}
+
+# Fix up paths in doc tag files:
# ap*-1-config in FC5, ap*-config in earlier
aprver=$(apr-1-config --version || apr-config --version)
apuver=$(apu-1-config --version || apu-config --version)
@@ -68,9 +80,11 @@
%{__perl} -pi -e \
"s|<path>.*?</path>|<path>%{_docdir}/apr-util-devel-$apuver/html/</path>|" \
docs/apu.tag
+
%patch0
%patch1
%{__perl} -pi -e 's|/usr/lib|%{_libdir}|' apreq2-config.in # patch1 ~ multilib
+
./buildconf
@@ -139,6 +153,9 @@
%changelog
+* Sat Dec 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.07-0.2.rc3
+- Filter unversioned perl(*) provides for which a versioned one exists.
+
* Thu Dec 8 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.07-0.1.rc3
- Adapt to new apr, httpd.
- Don't print -L for standard dirs in apreq2-config --link-ld output.
- Previous message: rpms/dkms/devel .cvsignore, 1.4, 1.5 dkms.spec, 1.7, 1.8 sources, 1.4, 1.5
- Next message: rpms/xemacs-sumo/devel xemacs-sumo-20051208-hypb-posix.patch, NONE, 1.1 xemacs-sumo-20051208-pydoc-path.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xemacs-sumo.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list