From d0a1522ba1b86fe019c37e24fbd345b767eb1e28 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: Dec 10 2005 20:37:21 +0000
Subject: - Filter unversioned perl(*) provides for which a versioned one exists.


---

diff --git a/libapreq2.spec b/libapreq2.spec
index e1e65b5..fb55599 100644
--- a/libapreq2.spec
+++ b/libapreq2.spec
@@ -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 @@ library.
 
 %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 @@ apuver=$(apu-1-config --version || apu-config --version)
 %{__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 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %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.