- BR perl-Module-CoreList

[packages/apache-mod_perl.git] / apache-mod_perl.spec

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 6d94b03c4a8de86f0de171f90837b4e115a61933..a1025f9b39f45d9b92ea88b0db1fb33d1b65ef4e 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -1,5 +1,4 @@
 # 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:
@@ -30,14 +29,18 @@ Summary(sv.UTF-8):  En inbyggd Perl-interpretator för webbservern Apache
 Summary(uk.UTF-8):     Модуль вбудовування інтерпретатора Perl в сервер Apache
 Summary(zh_CN.UTF-8):  用于 Apache web 服务程序的 Perl 解释程序。
 Name:          apache-mod_perl
-%define        ver     2.0.5
+%define        ver     2.0.7
+%define        snap    svn1448242
 Version:       %{ver}
-Release:       1
+Release:       0.%{snap}.2
 Epoch:         1
 License:       Apache
 Group:         Networking/Daemons/HTTP
-Source0:       http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
-# Source0-md5: 03d01d135a122bd8cebd0cd5b185d674
+#Source0:      http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
+# svn export -r 1448242 https://svn.apache.org/repos/asf/perl/modperl/branches/httpd24 mod_perl-2.0.7-svn1448242
+# tar czvf mod_perl-2.0.7-svn1448242.tar.gz mod_perl-2.0.7-svn1448242
+Source0:       mod_perl-%{version}-%{snap}.tar.gz
+# Source0-md5: 8b62bbfe8b499bc87b6d3d28eb765a24
 Source1:       %{name}.conf
 Patch0:                %{name}-Makefile_PL.patch
 URL:           http://perl.apache.org/
@@ -48,6 +51,7 @@ BuildRequires:        gdbm-devel
 BuildRequires: openldap-devel >= 2.4.6
 %{?with_autodeps:BuildRequires:        perl-Data-Flow}
 BuildRequires: perl-devel >= 1:5.8.2
+BuildRequires: perl-Module-CoreList
 BuildRequires: rpm-perlprov >= 3.0.3-16
 BuildRequires: rpmbuild(macros) >= 1.268
 %if %{with tests}
@@ -247,7 +251,7 @@ Apache::Test to moduł obudowujący standardowy Test.pm w funkcje
 pomocnicze do testowania serwera Apache.
 
 %prep
-%setup -q -n mod_%{mod_name}-%{ver}
+%setup -q -n mod_%{mod_name}-%{ver}-%{snap}
 %patch0 -p1
 
 %build
@@ -277,11 +281,17 @@ install xs/tables/current/Apache2/* $RPM_BUILD_ROOT%{perl_vendorarch}/Apache2
 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
@@ -310,7 +320,6 @@ fi
 %{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
@@ -333,7 +342,7 @@ fi
 %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*