SPECS: apache-mod_perl.spec - drop Provides: mod_perl (no PLD pack...

[glen]

Author: glen                         Date: Thu Dec 29 19:08:10 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 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!

---- Files affected:
SPECS:
   apache-mod_perl.spec (1.112 -> 1.113) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_perl.spec
diff -u SPECS/apache-mod_perl.spec:1.112 SPECS/apache-mod_perl.spec:1.113
--- SPECS/apache-mod_perl.spec:1.112	Tue Dec 27 01:38:14 2005
+++ SPECS/apache-mod_perl.spec	Thu Dec 29 20:08:05 2005
@@ -25,7 +25,7 @@
 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
@@ -39,16 +39,17 @@
 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
@@ -189,10 +190,28 @@
 ˝ÓżÚĄŁ ÓÉÓÚ˛ťąŘĆôśŻČÎşÎÍⲿ 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} \
@@ -245,7 +264,6 @@
 
 %{perl_vendorarch}/*.pm
 %{perl_vendorarch}/APR
-%{perl_vendorarch}/Apache
 %{perl_vendorarch}/Apache2
 %{perl_vendorarch}/ModPerl
 
@@ -260,17 +278,25 @@
 %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
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.113  2005/12/29 19:08:05  glen
+- 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!
+
 Revision 1.112  2005/12/27 00:38:14  glen
 - unified
 
@@ -472,7 +498,7 @@
 - fixed build
 
 Revision 1.49  2004/04/11 11:21:47  agaran
- - mistake, reverting to correct one
+- mistake, reverting to correct one
 
 Revision 1.47  2004/04/07 17:28:43  migo
 - updated from old snap to some released devel version: 1.99_13
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_perl.spec?r1=1.112&r2=1.113&f=u