- allow perl(Data::Flow) -> perl-Data-Flow resolving

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

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 731210f81d4822613fcf1702f0b31a234fe2dde7..adb8ab6ecb2540a7dfd304ae98f9423b848f6c56 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -1,9 +1,14 @@
 # TODO:
 # - separate perl-things from apache libs and configs (needed for some buildings)
 # - 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    internal_test   # use internal Apache-Test
+#
 %include       /usr/lib/rpm/macros.perl
 %define        apxs    /usr/sbin/apxs
-%define        apache_test_version     1.27-1.5
+%define        apache_test_version     1.27-2
 Summary:       A Perl interpreter for the Apache Web server
 Summary(cs):   Vestavìný interpret Perlu pro WWW server Apache
 Summary(da):   En indbygget Perl-fortolker for webtjeneren Apache
@@ -25,7 +30,7 @@ Summary(uk):  
 Summary(zh_CN):        ÓÃÓÚ Apache web ·þÎñ³ÌÐòµÄ Perl ½âÊͳÌÐò¡£
 Name:          apache-mod_perl
 Version:       2.0.2
-Release:       4
+Release:       7
 Epoch:         1
 License:       Apache
 Group:         Networking/Daemons
@@ -39,9 +44,11 @@ BuildRequires:       apr-util-devel >= 1:1.0.0
 BuildRequires: expat-devel
 BuildRequires: gdbm-devel
 BuildRequires: openldap-devel >= 2.3.0
-BuildRequires: perl-Apache-Test = %{apache_test_version}
+%{!?with_internal_test:BuildRequires:  perl-Apache-Test = %{apache_test_version}}
+%{?with_autodeps:BuildRequires:        perl-Data-Flow}
 BuildRequires: perl-devel >= 1:5.8.2
 BuildRequires: rpm-perlprov >= 3.0.3-16
+BuildRequires: rpmbuild(macros) >= 1.268
 %requires_eq_to        apache apache-devel
 Requires:      apache(modules-api) = %apache_modules_api
 Requires:      perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
@@ -49,7 +56,7 @@ Provides:     apache(mod_perl)
 # What's this mod_perl_hooks for?
 Provides:      perl(mod_perl_hooks)
 # not sure is this neccessary
-Requires:      perl-Apache-Test = %{apache_test_version}
+%{!?with_internal_test:Requires:       perl-Apache-Test = %{apache_test_version}}
 Obsoletes:     mod_perl
 Obsoletes:     mod_perl-common
 Conflicts:     perl-modules < 1:5.8.6-6
@@ -192,18 +199,24 @@ Apache web 
 
 %package devel
 Summary:       Files needed for building XS modules that use mod_perl
+Summary(pl):   Pliki potrzebne do budowania modu³ów XS korzystaj±cych z mod_perla
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      apache-devel >= 2.0
 
 %description devel
 The apache-mod_perl-devel package contains the files needed for
 building XS modules that use mod_perl.
 
+%description devel -l pl
+Ten pakiet zawiera pliki potrzebne do budowania modu³ów XS
+korzystaj±cych z mod_perla.
+
 %prep
 %setup -q -n mod_perl-%{version}
 %patch0 -p1
 
+%if %{without internal_test}
 system=$(%{__perl} -MApache::Test -e 'print Apache::Test->VERSION')
 bundled=$(%{__perl} -IApache-Test/lib -MApache::Test -e 'print Apache::Test->VERSION')
 if [ "$system" != "$bundled" ]; then
@@ -211,6 +224,7 @@ if [ "$system" != "$bundled" ]; then
        exit 1
 fi
 rm -rf Apache-Test
+%endif
 
 %build
 %{__perl} Makefile.PL \
@@ -245,15 +259,11 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/75_mod_perl.conf
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
+       %service -q httpd restart
 fi
 
 %files