- drop Provides: mod_perl (no PLD package requires it)

- use system perl-Apache-Test, this prevents apache1-mod_perl obsoleting this package
- created -devel package with header files
- please test!

Changed files:
    apache-mod_perl.spec -> 1.113

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 7c7809360001e128516ee07ca0a751a6a91d413e..f7108c10473d061e1427f88b928ae2f5a4928c9a 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -24,7 +24,7 @@ Summary(uk):  
 Summary(zh_CN):        ÓÃÓÚ Apache web ·þÎñ³ÌÐòµÄ Perl ½âÊͳÌÐò¡£
 Name:          apache-mod_perl
 Version:       2.0.2
-Release:       3
+Release:       3.8
 Epoch:         1
 License:       Apache
 Group:         Networking/Daemons
@@ -38,16 +38,17 @@ BuildRequires:      apr-util-devel >= 1:1.0.0
 BuildRequires: expat-devel
 BuildRequires: gdbm-devel
 BuildRequires: openldap-devel
+BuildRequires: perl-Apache-Test
 BuildRequires: perl-devel >= 1:5.8.2
 BuildRequires: rpm-perlprov >= 3.0.3-16
 %requires_eq_to        apache apache-devel
 Requires:      apache(modules-api) = %apache_modules_api
 Requires:      perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 Provides:      apache(mod_perl)
-Provides:      mod_perl
 # What's this mod_perl_hooks for?
 Provides:      perl(mod_perl_hooks)
-Provides:      perl-Apache-Test
+# not sure is this neccessary
+Requires:      perl-Apache-Test
 Obsoletes:     mod_perl
 Obsoletes:     mod_perl-common
 Conflicts:     perl-modules < 1:5.8.6-6
@@ -188,10 +189,28 @@ Apache web 
 ½Ó¿Ú¡£ ÓÉÓÚ²»±ØÆô¶¯ÈκÎÍⲿ Perl ½âÊͳÌÐò£¬Òò´Ë»áʹ CGI
 ½Å±¾»Øת¹ý³Ì¸üΪ¿ìËÙ¡£
 
+%package devel
+Summary:       Files needed for building XS modules that use mod_perl
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      apache-devel >= 2.0
+
+%description devel
+The apache-mod_perl-devel package contains the files needed for
+building XS modules that use mod_perl.
+
 %prep
 %setup -q -n mod_perl-%{version}
 %patch0 -p1
 
+system=$(%{__perl} -MApache::Test -e 'print Apache::Test->VERSION')
+bundled=$(%{__perl} -IApache-Test/lib -MApache::Test -e 'print Apache::Test->VERSION')
+if [ "$system" != "$bundled" ]; then
+       : Need Apache::Test version $bundled installed in system. please fix.
+       exit 1
+fi
+rm -rf Apache-Test
+
 %build
 %{__perl} Makefile.PL \
        MP_APXS=%{apxs} \
@@ -244,7 +263,6 @@ fi
 
 %{perl_vendorarch}/*.pm
 %{perl_vendorarch}/APR
-%{perl_vendorarch}/Apache
 %{perl_vendorarch}/Apache2
 %{perl_vendorarch}/ModPerl
 
@@ -259,7 +277,9 @@ fi
 %attr(755,root,root) %{perl_vendorarch}/auto/*/*/*.so
 
 %{perl_vendorarch}/auto/Apache2/typemap
-# to -devel? directory ownership problem...
-%{_includedir}/apache/*.h
 
 %{_mandir}/man?/*
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/apache/*.h