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

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index bf13804..828b530 100644
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -8,8 +8,7 @@
 %include	/usr/lib/rpm/macros.perl
 %define		apxs	/usr/sbin/apxs
 %define		mod_name	perl
-# NB! leave this without *release*
-%define	apache_test_version	1.29
+
 Summary:	A Perl interpreter for the Apache Web server
 Summary(cs.UTF-8):	Vestavěný interpret Perlu pro WWW server Apache
 Summary(da.UTF-8):	En indbygget Perl-fortolker for webtjeneren Apache
@@ -30,23 +29,23 @@ 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.3
-Release:	3
+%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:	b40e2adf67c6be15a0041af1c67b6997
+# Source0-md5:	1a05625ae6843085f985f5da8214502a
 Source1:	%{name}.conf
 Patch0:		%{name}-Makefile_PL.patch
-Patch1:		%{name}-path_info_secfix.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
 BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel
-BuildRequires:	openldap-devel >= 2.3.0
-BuildRequires:	perl-Apache-Test >= 1:%{apache_test_version}
+BuildRequires:	openldap-devel >= 2.4.6
 %{?with_autodeps:BuildRequires:	perl-Data-Flow}
 BuildRequires:	perl-devel >= 1:5.8.2
 BuildRequires:	rpm-perlprov >= 3.0.3-16
@@ -70,8 +69,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # TODO: separate -devel with ExtUtils::Embed and friends?
 %define		_noautoreq	'perl(Apache::.*)' 'perl(mod_perl)' 'perl(ModPerl::.*)' 'perl(ExtUtils::Embed)' 'perl(Module::Build)'
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
 %description
 Mod_perl incorporates a Perl interpreter into the Apache web server,
@@ -208,9 +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-Apache-Test
-Requires:	perl-mod_%{mod_name} = %{epoch}:%{version}-%{release}
 Obsoletes:	mod_perl
 Obsoletes:	mod_perl-common
 Conflicts:	perl-modules < 1:5.8.6-6
@@ -234,17 +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 -p0
-
-bundled=$(%{__perl} -IApache-Test/lib -MApache::Test -e 'print Apache::Test->VERSION')
-if [ "%apache_test_version" != "$bundled" ]; then
-	: "%%define apache_test_version to $bundled and retry."
-	exit 1
-fi
-rm -rf Apache-Test
+%patch1 -p3
 
 %build
 %{__perl} Makefile.PL \
@@ -263,9 +268,9 @@ rm -rf Apache-Test
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+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 '{}' \;
 
@@ -277,7 +282,7 @@ 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%{_sysconfdir}/httpd.conf/75_mod_perl.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/75_mod_perl.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -293,28 +298,39 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc Changes INSTALL README STATUS
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*.conf
-%attr(755,root,root) %{_pkglibdir}/*.so
+%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*