- do not require metapackage apache1; rel 14

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

diff --git a/apache1-mod_perl.spec b/apache1-mod_perl.spec
index 4bd978bfea9f494eaca7b71a98a18b1862016b44..2504dc9b849884d8ef9ca3d9492eb9c209cce201 100644 (file)
--- a/apache1-mod_perl.spec
+++ b/apache1-mod_perl.spec
@@ -27,7 +27,7 @@ Summary(uk):  
 Summary(zh_CN):        ÓÃÓÚ Apache web ·þÎñ³ÌÐòµÄ Perl ½âÊͳÌÐò¡£
 Name:          apache1-mod_perl
 Version:       1.29
-Release:       11
+Release:       14
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
@@ -49,14 +49,15 @@ BuildRequires:      perl-URI
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: perl-libwww
 BuildRequires: rpm-perlprov >= 4.1-13
-%requires_eq_to        apache1 apache1-devel
+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)
-Provides:      perl(mod_perl_hooks)
 Obsoletes:     mod_perl
 Obsoletes:     mod_perl-common
+# older apache1-mod_perl could make bad autodeps to perl-mod_perl1
+BuildConflicts:        apache1-mod_perl < 1.29-12.1
 %{!?with_ipv6:Conflicts:       apache1(ipv6)}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -199,8 +200,8 @@ Apache web 
 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
+Requires:      perl-mod_%{mod_name}1 = %{version}-%{release}
 
 %description devel
 The apache1-mod_perl-devel package contains the files needed for
@@ -210,6 +211,17 @@ building XS modules that use mod_perl.
 Ten pakiet zawiera pliki potrzebne do budowania modu³ów XS
 korzystaj±cych z mod_perla.
 
+%package -n perl-mod_%{mod_name}1
+Summary:       Perl APIs for mod_perl
+Summary(pl):   Perlowe API dla mod_perla
+Group:         Development/Languages/Perl
+
+%description -n perl-mod_%{mod_name}1
+Perl APIs for mod_perl.
+
+%description -n perl-mod_%{mod_name}1 -l pl
+Perlowe API dla mod_perl.
+
 %prep
 %setup  -q -n mod_perl-%{version}
 %patch0 -p1
@@ -256,34 +268,30 @@ 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
-       sed -i -e '/^\(Add\|Load\)Module.*libperl\.\(so\|c\)/d' /etc/apache/apache.conf
+       %{__sed} -i -e '/^\(Add\|Load\)Module.*libperl\.\(so\|c\)/d' /etc/apache/apache.conf
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README INSTALL CREDITS faq/*.html faq/*.txt apache-modlist.html eg
-# FIXME: parent dirs not owned as the manualdocdir (via apache1-doc) is not in required
+# FIXME: parent dirs not owned as the manualdocdir (via apache1-doc) is not in deps
 %doc %{_manualdocdir}/mod/*html
 
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*
 
+%files -n perl-mod_%{mod_name}1
+%defattr(644,root,root,755)
 %{perl_vendorarch}/*.pm
 %{perl_vendorarch}/*.PL