- mv apache{,1}-*

Changed files:
    apache1-mod_vhost_limit.spec -> 1.4

diff --git a/apache1-mod_vhost_limit.spec b/apache1-mod_vhost_limit.spec
index e2919084560b038e484351754d4a29c02ad7e772..f7da6d67cc2ad9fb7a3e57a908a292ed7b7d63e0 100644 (file)
--- a/apache1-mod_vhost_limit.spec
+++ b/apache1-mod_vhost_limit.spec
@@ -1,8 +1,8 @@
 %define                mod_name        vhost_limit
-%define        apxs            /usr/sbin/apxs
+%define        apxs            /usr/sbin/apxs1
 Summary:       Apache module: vhost_limit limits
 Summary(pl):   Modu³ do apache: limity pasma dla serwerów wirtualnych
-Name:          apache-mod_%{mod_name}
+Name:          apache1-mod_%{mod_name}
 Version:       0.4
 Release:       1
 License:       Apache
@@ -10,17 +10,18 @@ Group:              Networking/Daemons
 Source0:       http://www.nowhere-land.org/programs/mod_vhost_limit/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: bae36a7174e184804b91356ef67d0b5d
 URL:           http://www.nowhere-land.org/programs/mod_vhost_limit/
-BuildRequires: apache(EAPI)-devel
+BuildRequires: apache1-devel
 Requires(post,preun):  %{apxs}
 Requires(post,preun):  grep
 Requires(preun):       fileutils
-Requires:      apache(EAPI)
+Requires:      apache1
 Requires:      crondaemon
 Requires:      procps
+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
 This is the module for Apache Web Server to restrict the number of
@@ -47,15 +48,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