- drop obsolete and outdated manual inclusion of rpm macros

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

diff --git a/apache1-mod_perl.spec b/apache1-mod_perl.spec
index f118ea6499c5709de65ee16fd67d891582867f2d..dceb5dd123c774f9c6516375d615d469ba491178 100644 (file)
--- a/apache1-mod_perl.spec
+++ b/apache1-mod_perl.spec
@@ -7,7 +7,6 @@
 # Conditional build:
 %bcond_without ipv6    # IPv6 support (must match same bcond from apache1-devel)
 #
-%include       /usr/lib/rpm/macros.perl
 %define                mod_name        perl
 %define        apxs    /usr/sbin/apxs1
 Summary:       A Perl interpreter for the Apache Web server
@@ -30,17 +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:          apache1-mod_perl
-Version:       1.30
-Release:       2
+Version:       1.31
+Release:       1
 License:       Apache v1.1
 Group:         Networking/Daemons
 Source0:       http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
-# Source0-md5: bfd6f6cff1ab1cc3dbb58a236701d169
+# Source0-md5: d2188bf500e9f00cd78dc97c3fbf6b97
 Patch0:                apache-perl-rh.patch
 # from ftp://ftp.kddlabs.co.jp/Linux/packages/Kondara/pub/Jirai/
 Patch1:                mod_perl-v6.patch
 Patch2:                %{name}-optimize.patch
-Patch3:                %{name}-perl510.patch
 URL:           http://perl.apache.org/
 %{?with_ipv6:BuildRequires:    apache1(ipv6)-devel}
 BuildRequires: apache1-devel >= 1.3.39-2
@@ -56,7 +54,6 @@ BuildRequires:        rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(triggerpostun):       sed >= 4.0
 Requires:      apache1(EAPI)
-Requires:      perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 Provides:      apache(mod_perl)
 Obsoletes:     mod_perl
 Obsoletes:     mod_perl-common
@@ -227,7 +224,7 @@ korzystających z mod_perla.
 
 %package doc
 Summary:       mod_perl documentation
-Summary(pl.UTF_8):     Dokumentacja do mod_perla
+Summary(pl.UTF-8):     Dokumentacja do mod_perla
 Group:         Documentation
 Requires:      apache1-doc
 
@@ -242,7 +239,6 @@ Dokumentacja do mod_perla dostępna przez Apache'a.
 %patch0 -p1
 %{?with_ipv6:%patch1 -p1}
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__perl} Makefile.PL \
@@ -275,10 +271,10 @@ echo 'LoadModule %{mod_name}_module       modules/lib%{mod_name}.so' > \
        $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
 
 # clean known unpackaged files
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/*.pod
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/Bundle/Apache.pm
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/mod_%{mod_name}/.packlist
-rm -f $RPM_BUILD_ROOT%{_mandir}/man3/Bundle::Apache.3pm*
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/*.pod
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Bundle/Apache.pm
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/mod_perl/.packlist
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/Bundle::Apache.3pm*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -312,7 +308,6 @@ fi
 %{perl_vendorarch}/Apache.pm
 %{perl_vendorarch}/mod_perl*.pm
 %{perl_vendorarch}/mod_perl_hooks.pm.PL
-%dir %{perl_vendorarch}/Apache
 %{perl_vendorarch}/Apache/*.pm
 %{perl_vendorarch}/Apache/Constants
 %dir %{perl_vendorarch}/auto/Apache