- mv apache{,1}-*

Changed files:
    apache1-mod_msff.spec -> 1.8

diff --git a/apache1-mod_msff.spec b/apache1-mod_msff.spec
index 28d8036538754b4dd123c1db64d36883d1a831a9..a2e70744a01d9f6ed14c83899d964bdd03c517c6 100644 (file)
--- a/apache1-mod_msff.spec
+++ b/apache1-mod_msff.spec
@@ -1,8 +1,8 @@
 %define                mod_name        msff
-%define        apxs            /usr/sbin/apxs
+%define        apxs            /usr/sbin/apxs1
 Summary:       Apache module: Microsoft Free Fridays: reject MSIE on Friday
 Summary(pl):   Modu³ do apache: Wolne Pi±tki Microsoftu: odrzuca MSIE w pi±tki
-Name:          apache-mod_%{mod_name}
+Name:          apache1-mod_%{mod_name}
 Version:       0.1
 Release:       1
 License:       GPL
@@ -11,13 +11,14 @@ Source0:    http://unlikely.org/mike/hacks/mod_%{mod_name}.c
 # Source0-md5: 28bf69adb4beb41d82f16c2cc2e9d656
 URL:           http://davenet.userland.com/2001/06/13
 BuildRequires: %{apxs}
-BuildRequires: apache(EAPI)-devel
+BuildRequires: apache1-devel
 Requires(post,preun):  %{apxs}
-Requires:      apache(EAPI)
+Requires:      apache1
+Obsoletes:     apache-mod_%{mod_name} <= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define         _sysconfdir     /etc/httpd
+%define         _sysconfdir     /etc/apache
 
 %description
 mod_msff.c: Microsoft Free Fridays: reject MSIE on Friday.
@@ -50,15 +51,15 @@ 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