packages: apache-mod_perl/apache-mod_perl.spec - don't package apache1-spec...

[qboosh]

Author: qboosh                       Date: Thu Feb 10 17:06:52 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't package apache1-specific Apache::SizeLimit part

---- Files affected:
packages/apache-mod_perl:
   apache-mod_perl.spec (1.179 -> 1.180) 

---- Diffs:

================================================================
Index: packages/apache-mod_perl/apache-mod_perl.spec
diff -u packages/apache-mod_perl/apache-mod_perl.spec:1.179 packages/apache-mod_perl/apache-mod_perl.spec:1.180
--- packages/apache-mod_perl/apache-mod_perl.spec:1.179	Wed Feb  9 21:23:52 2011
+++ packages/apache-mod_perl/apache-mod_perl.spec	Thu Feb 10 18:06:47 2011
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO:
-# - Apache-SizeLimit (0.95) conflicts with mod_perl1 - separate like Apache-Test?
 # - separate devel things from runtime things (apache-mod_perl-2.0.2-2 marks perl-ExtUtils-MakeMaker-6.25_08-1 (cap perl(ExtUtils::Install)))
 #
 # Conditional build:
@@ -278,11 +277,17 @@
 install xs/tables/current/APR/* $RPM_BUILD_ROOT%{perl_vendorarch}/APR
 install xs/tables/current/ModPerl/* $RPM_BUILD_ROOT%{perl_vendorarch}/ModPerl
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/75_mod_perl.conf
+
+# apache1-specific version - but mod_perl1 contains older Apache::SizeLimit which doesn't use shared Apache::SizeLimit::Core
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Apache/SizeLimit.pm \
+	$RPM_BUILD_ROOT%{_mandir}/man3/Apache::SizeLimit.3pm
+# don't package Bundle::*
 %{__rm} -r $RPM_BUILD_ROOT%{perl_vendorarch}/Bundle
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/Bundle*
+# perl-specific cleanup
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/mod_perl2/.packlist
-install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/75_mod_perl.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -311,7 +316,6 @@
 %{perl_vendorarch}/APR.pm
 %{perl_vendorarch}/APR
 %{perl_vendorarch}/Apache/Reload.pm
-%{perl_vendorarch}/Apache/SizeLimit.pm
 %{perl_vendorarch}/Apache/SizeLimit
 %{perl_vendorarch}/Apache2
 %{perl_vendorarch}/ModPerl
@@ -334,7 +338,7 @@
 %attr(755,root,root) %{perl_vendorarch}/auto/ModPerl/[C-U]*/*.so
 %{_mandir}/man3/APR*.3pm*
 %{_mandir}/man3/Apache::Reload.3pm*
-%{_mandir}/man3/Apache::SizeLimit*.3pm*
+%{_mandir}/man3/Apache::SizeLimit::Core.3pm*
 %{_mandir}/man3/Apache2::*.3pm*
 %{_mandir}/man3/ModPerl::*.3pm*
 %{_mandir}/man3/mod_perl2.3pm*
@@ -350,6 +354,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.180  2011/02/10 17:06:47  qboosh
+- don't package apache1-specific Apache::SizeLimit part
+
 Revision 1.179  2011/02/09 20:23:52  qboosh
 - up to 2.0.5 (Apache-Test 1.36)
 - removed obsolete CVE-2009-0796 patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_perl/apache-mod_perl.spec?r1=1.179&r2=1.180&f=u