- release 8 (perl-Apache-Test is still at 1.43)

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

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 4b32ea591a38c390b22a2f60ea305ff16ef2d668..fa78dbdffbfc520c61cd6124885c2c6027c9767d 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -2,13 +2,12 @@
 # - separate devel things from runtime things (apache-mod_perl-2.0.2-2 marks perl-ExtUtils-MakeMaker-6.25_08-1 (cap perl(ExtUtils::Install)))
 #
 # Conditional build:
-%bcond_without autodeps        # don't care about perl() deps resolving
 %bcond_with    tests           # perform "make test"
 #
-%include       /usr/lib/rpm/macros.perl
 %define                apxs    /usr/sbin/apxs
 %define                mod_name        perl
 
+%define        ver     2.0.13
 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
@@ -29,31 +28,25 @@ 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.7
-%define        snap    svn1448242
 Version:       %{ver}
-Release:       0.%{snap}.2
+# don't reset unless perl-Apache-Test version is also increased
+Release:       8
 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:       https://downloads.apache.org/perl/mod_perl-%{ver}.tar.gz
+# Source0-md5: b107c587ae16c7a9a59c344c01359253
 Source1:       %{name}.conf
 Patch0:                %{name}-Makefile_PL.patch
-URL:           http://perl.apache.org/
+URL:           https://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.4.6
-%{?with_autodeps:BuildRequires:        perl-Data-Flow}
-BuildRequires: perl-devel >= 1:5.8.2
-BuildConflicts:        perl-Module-CoreList
+BuildRequires: perl-devel >= 1:5.18.0
 BuildRequires: rpm-perlprov >= 3.0.3-16
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.745
 %if %{with tests}
 BuildRequires: apache-mod_auth_basic
 BuildRequires: apache-mod_authz_host
@@ -66,9 +59,13 @@ 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 < 0.12
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # TODO: separate -devel with ExtUtils::Embed and friends?
@@ -237,7 +234,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.36
+Version:       1.43
 Group:         Development/Languages/Perl
 Requires:      perl-mod_%{mod_name} = %{epoch}:%{ver}-%{release}
 Requires:      perl-dirs >= 2.0-5
@@ -251,7 +248,7 @@ 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
 
 %build
@@ -262,8 +259,8 @@ pomocnicze do testowania serwera Apache.
        INSTALLDIRS=vendor
 
 %{__make} \
-       OPTIMIZE="%{rpmcflags}" \
-       MODPERL_OPTIMIZE="%{rpmcflags}" \
+       OPTIMIZE="%{rpmcflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
+       MODPERL_OPTIMIZE="%{rpmcflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \
        CC="%{__cc}" \
        MP_APXS=%{apxs}
 
@@ -281,7 +278,7 @@ 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
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/75_mod_perl.conf
+cp -p %{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 \
@@ -298,10 +295,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
@@ -325,20 +324,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*