- up to 2.0.10

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

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 31d7c4cffc73db5c4f269c588fe4af11d33caa35..f589ad58018afb72a62c177e42d42871139e95b4 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -9,9 +9,7 @@
 %define                apxs    /usr/sbin/apxs
 %define                mod_name        perl
 
-%define                ver     2.0.7
-%define                snap    svn1448242
-%define                rel     7.1
+%define        ver     2.0.10
 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
@@ -33,18 +31,14 @@ Summary(uk.UTF-8):  Модуль вбудовування інтерпретат
 Summary(zh_CN.UTF-8):  用于 Apache web 服务程序的 Perl 解释程序。
 Name:          apache-mod_perl
 Version:       %{ver}
-Release:       0.%{snap}.%{rel}
+Release:       1
 Epoch:         1
 License:       Apache
 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
+Source0:       http://www.apache.org/dist/perl/mod_perl-%{ver}.tar.gz
+# Source0-md5: cef55e715b5770a63b3becbe9d271121
 Source1:       %{name}.conf
 Patch0:                %{name}-Makefile_PL.patch
-Patch1:                perl-5.18.patch
 URL:           http://perl.apache.org/
 BuildRequires: apache-devel >= 2.0.55-1
 BuildRequires: apr-util-devel >= 1:1.0.0
@@ -54,7 +48,7 @@ BuildRequires:        openldap-devel >= 2.4.6
 %{?with_autodeps:BuildRequires:        perl-Data-Flow}
 BuildRequires: perl-devel >= 1:5.18.0
 BuildRequires: rpm-perlprov >= 3.0.3-16
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.671
 %if %{with tests}
 BuildRequires: apache-mod_auth_basic
 BuildRequires: apache-mod_authz_host
@@ -67,8 +61,11 @@ BuildRequires:       perl-CGI >= 3.22
 %endif
 # older apache-mod_perl could make bad autodeps to perl-mod_perl
 BuildConflicts:        apache-mod_perl < 1:2.0.2-9
+Requires(post,preun,postun):   systemd-units >= 38
 Requires:      apache(modules-api) = %apache_modules_api
 Requires:      perl-mod_%{mod_name} = %{epoch}:%{version}-%{release}
+Requires:      rc-scripts
+Requires:      systemd-units >= 38
 Provides:      apache(mod_perl)
 Obsoletes:     perl-Apache-Reload
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -239,7 +236,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.37
+Version:       1.40
 Group:         Development/Languages/Perl
 Requires:      perl-mod_%{mod_name} = %{epoch}:%{ver}-%{release}
 Requires:      perl-dirs >= 2.0-5
@@ -253,9 +250,8 @@ Apache::Test to moduł obudowujący standardowy Test.pm w funkcje
 pomocnicze do testowania serwera Apache.
 
 %prep
-%setup -q -n mod_%{mod_name}-%{ver}-%{snap}
+%setup -q -n mod_%{mod_name}-%{ver}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__perl} Makefile.PL \
@@ -301,10 +297,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %service -q httpd restart
+%systemd_service_restart httpd.service
 
 %postun
 if [ "$1" = "0" ]; then
        %service -q httpd restart
+       %systemd_service_restart httpd.service
 fi
 
 %files
@@ -328,20 +326,16 @@ fi
 %{perl_vendorarch}/ModPerl
 %{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]*
-%{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/[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*