X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_perl.spec;h=828b53099908ebf76998089c96d76e703798dade;hb=d42dd3622309d69d2d420e69816db5b3f78fa289;hp=7bb39a78bc1c4a97ecebe1b05dcf2fbf3b0a648f;hpb=9d03f8d8266a5a7dc0b5146691aef727b3c45bca;p=packages%2Fapache-mod_perl.git

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 7bb39a7..828b530 100644
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -29,17 +29,17 @@ 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
-Version:	2.0.4
-Release:	1
+%define	ver	2.0.4
+Version:	%{ver}
+Release:	7
 Epoch:		1
 License:	Apache
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Source0:	http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
 # Source0-md5:	1a05625ae6843085f985f5da8214502a
 Source1:	%{name}.conf
 Patch0:		%{name}-Makefile_PL.patch
-Patch1:		%{name}-path_info_secfix.patch
-Patch2:		%{name}-magic.patch
+Patch1:		%{name}-CVE-2009-0796.patch
 URL:		http://perl.apache.org/
 BuildRequires:	apache-devel >= 2.0.55-1
 BuildRequires:	apr-util-devel >= 1:1.0.0
@@ -207,8 +207,6 @@ Summary:	Files needed for building XS modules that use mod_perl
 Summary(pl.UTF-8):	Pliki potrzebne do budowania modułów XS korzystających z mod_perla
 Group:		Development/Libraries
 Requires:	apache-devel >= 2.0
-Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
-Requires:	perl-mod_%{mod_name} = %{epoch}:%{version}-%{release}
 Obsoletes:	mod_perl
 Obsoletes:	mod_perl-common
 Conflicts:	perl-modules < 1:5.8.6-6
@@ -232,9 +230,26 @@ Perl APIs for mod_perl.
 %description -n perl-mod_%{mod_name} -l pl.UTF-8
 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
+Group:		Development/Languages/Perl
+Requires:	perl-mod_%{mod_name} = %{epoch}:%{ver}-%{release}
+Requires:	perl-dirs >= 2.0-5
+
+%description -n perl-Apache-Test
+Apache::Test is a wrapper around the standard Test.pm with helpers for
+testing an Apache server.
+
+%description -n perl-Apache-Test -l pl.UTF-8
+Apache::Test to moduł obudowujący standardowy Test.pm w funkcje
+pomocnicze do testowania serwera Apache.
+
 %prep
-%setup -q -n mod_%{mod_name}-%{version}
+%setup -q -n mod_%{mod_name}-%{ver}
 %patch0 -p1
+%patch1 -p3
 
 %build
 %{__perl} Makefile.PL \
@@ -255,7 +270,7 @@ Perlowe API dla mod_perla.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name \*.orig -exec rm -f '{}' \;
 
@@ -286,26 +301,36 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*.conf
 %attr(755,root,root) %{apachelibdir}/*.so
 
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/apache/mod_perl.h
+%{_includedir}/apache/modperl_*.h
+
 %files -n perl-mod_%{mod_name}
 %defattr(644,root,root,755)
-%{perl_vendorarch}/*.pm
+%{perl_vendorarch}/APR.pm
 %{perl_vendorarch}/APR
 %{perl_vendorarch}/Apache2
 %{perl_vendorarch}/ModPerl
-
-%dir %{perl_vendorarch}/auto/*
-%{perl_vendorarch}/auto/*/*.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/*/*.so
+%{perl_vendorarch}/mod_perl2.pm
+%dir %{perl_vendorarch}/auto/APR
+%{perl_vendorarch}/auto/APR/APR.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/APR/APR.so
 %dir %{perl_vendorarch}/auto/APR/[B-U]*
+%dir %{perl_vendorarch}/auto/Apache2
 %dir %{perl_vendorarch}/auto/Apache2/[A-U]*
+%{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
-%{perl_vendorarch}/auto/Apache2/typemap
-%{_mandir}/man?/*
+%{_mandir}/man3/APR*.3pm*
+%{_mandir}/man3/Apache2::*.3pm*
+%{_mandir}/man3/ModPerl::*.3pm*
+%{_mandir}/man3/mod_perl2.3pm*
 
-%files devel
+%files -n perl-Apache-Test
 %defattr(644,root,root,755)
-%{_includedir}/apache/*.h
 %{perl_vendorarch}/Apache/Test*
+%{_mandir}/man3/Apache::Test*.3pm*