- ver. 2.0.6

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

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 3d5485b4b3abbfed4e64b82ea35b40f2edccca8d..30185fbca544e70fc71b9ce0474b20a484867c07 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -29,18 +29,16 @@ 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.6
 Version:       %{ver}
-Release:       3
+Release:       1
 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
+# Source0-md5: 76f4154cffb15972246f03080e9d133c
 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
@@ -208,8 +206,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
@@ -236,9 +232,10 @@ 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_perl = %{ver}-%{release}
+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
@@ -249,7 +246,7 @@ 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
 
 %build
@@ -271,7 +268,7 @@ pomocnicze do testowania serwera Apache.
 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 '{}' \;
 
@@ -279,12 +276,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
 
@@ -299,8 +302,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)
@@ -311,6 +314,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
@@ -318,21 +323,26 @@ 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*
 
 %files -n perl-Apache-Test
 %defattr(644,root,root,755)
-%dir %{perl_vendorarch}/Apache
 %{perl_vendorarch}/Apache/Test*
 %{_mandir}/man3/Apache::Test*.3pm*