- mv apache{,1}-*; release 1

Changed files:
    apache1-mod_gunzip.spec -> 1.24

diff --git a/apache1-mod_gunzip.spec b/apache1-mod_gunzip.spec
index 84dd49bf15fc5694ada65d85c735095fdbe92905..bc5cdcce62d038dfe099e96af3174529a2ad7558 100644 (file)
--- a/apache1-mod_gunzip.spec
+++ b/apache1-mod_gunzip.spec
@@ -1,21 +1,22 @@
 %define                mod_name        gunzip
-%define        apxs            /usr/sbin/apxs
+%define        apxs            /usr/sbin/apxs1
 Summary:       Apache module: On-the-fly decompression of HTML documents
 Summary(es):   Descompresión instantanea de archivos HTML para Apache
 Summary(pl):   Modu³ do apache: dekompresuje dokumenty HTML w locie
 Summary(pt_BR):        Descompressão "On-the-fly" de arquivos HTML para o Apache
-Name:          apache-mod_%{mod_name}
+Name:          apache1-mod_%{mod_name}
 Version:       1
-Release:       4
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://sep.hamburg.com/mod_%{mod_name}.tar.gz
 # Source0-md5: 9f549047abccccf6570333bb0313d2cd
 BuildRequires: %{apxs}
-BuildRequires: apache(EAPI)-devel
+BuildRequires: apache1-devel
 BuildRequires: zlib-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)
@@ -49,15 +50,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