X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_perl.spec;h=4b32ea591a38c390b22a2f60ea305ff16ef2d668;hb=97c143955179bd59e00a528957c42f99bd65466c;hp=9e4e8f604de5b834ef7932ef805cab1434bae092;hpb=004ff59e34c633182573393be303951a80010796;p=packages%2Fapache-mod_perl.git

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 9e4e8f6..4b32ea5 100644
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -29,18 +29,20 @@ 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.4
+%define	ver	2.0.7
+%define	snap	svn1448242
 Version:	%{ver}
-Release:	3
+Release:	0.%{snap}.2
 Epoch:		1
 License:	Apache
-Group:		Networking/Daemons
-Source0:	http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
-# Source0-md5:	1a05625ae6843085f985f5da8214502a
+Group:		Networking/Daemons/HTTP
+#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
-Patch1:		%{name}-path_info_secfix.patch
-Patch2:		%{name}-magic.patch
 URL:		http://perl.apache.org/
 BuildRequires:	apache-devel >= 2.0.55-1
 BuildRequires:	apr-util-devel >= 1:1.0.0
@@ -49,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
+BuildConflicts:	perl-Module-CoreList
 BuildRequires:	rpm-perlprov >= 3.0.3-16
 BuildRequires:	rpmbuild(macros) >= 1.268
 %if %{with tests}
@@ -234,7 +237,7 @@ Perlowe API dla mod_perla.
 %package -n perl-Apache-Test
 Summary:	Apache::Test - Test.pm wrapper with helpers for testing Apache
 Summary(pl.UTF-8):	Apache::Test - wrapper na Test.pm z funkcjami do testowania Apache
-Version:	1.31
+Version:	1.36
 Group:		Development/Languages/Perl
 Requires:	perl-mod_%{mod_name} = %{epoch}:%{ver}-%{release}
 Requires:	perl-dirs >= 2.0-5
@@ -248,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
@@ -278,12 +281,18 @@ 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
 
-rm -rf $RPM_BUILD_ROOT%{perl_vendorarch}/Bundle
-rm -f $RPM_BUILD_ROOT%{_mandir}/man?/Bundle*
-rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/mod_perl2/.packlist
 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -298,8 +307,8 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc Changes INSTALL README STATUS
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*.conf
-%attr(755,root,root) %{apachelibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/75_mod_perl.conf
+%attr(755,root,root) %{apachelibdir}/mod_perl.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -310,6 +319,8 @@ fi
 %defattr(644,root,root,755)
 %{perl_vendorarch}/APR.pm
 %{perl_vendorarch}/APR
+%{perl_vendorarch}/Apache/Reload.pm
+%{perl_vendorarch}/Apache/SizeLimit
 %{perl_vendorarch}/Apache2
 %{perl_vendorarch}/ModPerl
 %{perl_vendorarch}/mod_perl2.pm
@@ -317,15 +328,21 @@ fi
 %{perl_vendorarch}/auto/APR/APR.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/APR/APR.so
 %dir %{perl_vendorarch}/auto/APR/[B-U]*
+%{perl_vendorarch}/auto/APR/[B-U]*/*.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/APR/[B-U]*/*.so
 %dir %{perl_vendorarch}/auto/Apache2
 %dir %{perl_vendorarch}/auto/Apache2/[A-U]*
+%{perl_vendorarch}/auto/Apache2/Build/autosplit.ix
+%{perl_vendorarch}/auto/Apache2/[A-U]*/*.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/Apache2/[A-U]*/*.so
 %{perl_vendorarch}/auto/Apache2/typemap
 %dir %{perl_vendorarch}/auto/ModPerl
-%dir %{perl_vendorarch}/auto/ModPerl/*
-%{perl_vendorarch}/auto/*/*/*.ix
-%{perl_vendorarch}/auto/*/*/*.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/*/*/*.so
+%dir %{perl_vendorarch}/auto/ModPerl/[C-U]*
+%{perl_vendorarch}/auto/ModPerl/[C-U]*/*.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/ModPerl/[C-U]*/*.so
 %{_mandir}/man3/APR*.3pm*
+%{_mandir}/man3/Apache::Reload.3pm*
+%{_mandir}/man3/Apache::SizeLimit::Core.3pm*
 %{_mandir}/man3/Apache2::*.3pm*
 %{_mandir}/man3/ModPerl::*.3pm*
 %{_mandir}/man3/mod_perl2.3pm*