- use %service

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

diff --git a/apache1-mod_perl.spec b/apache1-mod_perl.spec
index 8f3541f1595ae841fda2c41dd2c0b58ccebc57df..3ef8eb28277d26993c5e040ccef157f14bd2a70a 100644 (file)
--- a/apache1-mod_perl.spec
+++ b/apache1-mod_perl.spec
@@ -1,5 +1,4 @@
 # TODO:
-# - add devel subpackage
 # - orphaned dirs for %{_manualdocdir}/mod/*html
 #
 %bcond_without ipv6            # disable IPv6 support. must match same bcond from apache1-devel
@@ -28,7 +27,7 @@ Summary(uk):  
 Summary(zh_CN):        ÓÃÓÚ Apache web ·þÎñ³ÌÐòµÄ Perl ½âÊͳÌÐò¡£
 Name:          apache1-mod_perl
 Version:       1.29
-Release:       10.4
+Release:       11
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
@@ -50,12 +49,12 @@ BuildRequires:      perl-URI
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: perl-libwww
 BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: rpmbuild(macros) >= 1.268
 %requires_eq_to        apache1 apache1-devel
-Requires(triggerpostun):       %{apxs}
+Requires(triggerpostun):       sed >= 4.0
 Requires:      apache1(EAPI)
 Requires:      perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 Provides:      apache(mod_perl)
-Provides:      perl(mod_perl_hooks)
 Obsoletes:     mod_perl
 Obsoletes:     mod_perl-common
 %{!?with_ipv6:Conflicts:       apache1(ipv6)}
@@ -196,6 +195,21 @@ Apache web 
 ½Ó¿Ú¡£ ÓÉÓÚ²»±ØÆô¶¯ÈκÎÍⲿ Perl ½âÊͳÌÐò£¬Òò´Ë»áʹ CGI
 ½Å±¾»Øת¹ý³Ì¸üΪ¿ìËÙ¡£
 
+%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:      apache1-devel
+
+%description devel
+The apache1-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
@@ -242,23 +256,17 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man3/Bundle::Apache.3pm*
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-       /etc/rc.d/init.d/apache restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
-fi
+%service -q apache restart
 
 %postun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/apache ]; then
-               /etc/rc.d/init.d/apache restart 1>&2
-       fi
+       %service -q apache restart
 fi
 
 %triggerpostun -- apache1-mod_%{mod_name} < 1.29-7.1
 # check that they're not using old apache.conf
 if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
-       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2
+       sed -i -e '/^\(Add\|Load\)Module.*libperl\.\(so\|c\)/d' /etc/apache/apache.conf
 fi
 
 %files
@@ -285,7 +293,8 @@ fi
 
 %{_mandir}/man3/[Acm]*
 
-# to -devel ?
+%files devel
+%defattr(644,root,root,755)
 %{perl_vendorarch}/auto/Apache/typemap
 %{perl_vendorarch}/auto/Apache/mod_perl.exp
 %{perl_vendorarch}/auto/Apache/include