- renamed to apache1-*; waiting for server-side cp; broken anyway

Changed files:
    apache1-mod_xslt.spec -> 1.26

diff --git a/apache1-mod_xslt.spec b/apache1-mod_xslt.spec
index 88797084782d582d30bde56b8b0df9daf537a5c5..df0a2e7ebe29b72f402da885b9a5f0aa29a95534 100644 (file)
--- a/apache1-mod_xslt.spec
+++ b/apache1-mod_xslt.spec
@@ -1,10 +1,10 @@
 %define                mod_name        xslt
-%define        apxs            /usr/sbin/apxs
+%define        apxs            /usr/sbin/apxs1
 Summary:       Module to serve XML based content
 Summary(pl):   Modu³ do udostêpniania dokumentów XML
-Name:          apache-mod_%{mod_name}
+Name:          apache1-mod_%{mod_name}
 Version:       1.1
-Release:       4
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/modxslt/mod_%{mod_name}-%{version}.tar.gz
@@ -16,11 +16,13 @@ Patch2:             mod_%{mod_name}-make.patch
 Patch3:                mod_%{mod_name}-module.patch
 URL:           http://modxslt.userworld.com/
 BuildRequires: %{apxs}
-BuildRequires: apache-devel
+BuildRequires: apache1-devel
 BuildRequires: sablotron-devel
 Requires(post,preun):  %{apxs}
+Requires:      apache1
 Requires:      expat
 Requires:      sablotron
+Obsoletes:     apache-mod_%{mod_name} <= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
@@ -73,19 +75,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
+if [ -f /var/lock/subsys/apache ]; then
+       /etc/rc.d/init.d/apache restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
        %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
+       if [ -f /var/lock/subsys/apache ]; then
+               /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_pkglibdir}/*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*.conf