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

Changed files:
    apache1-mod_gzip.spec -> 1.28

diff --git a/apache1-mod_gzip.spec b/apache1-mod_gzip.spec
index a3d58c78761c2ca2e617f5b680ef8e71635220cd..9662cea4ffc607a76ae8980b07998a233efff93e 100644 (file)
--- a/apache1-mod_gzip.spec
+++ b/apache1-mod_gzip.spec
@@ -1,29 +1,30 @@
 %define                mod_name        gzip
-%define        apxs            /usr/sbin/apxs
+%define        apxs            /usr/sbin/apxs1
 Summary:       Apache module: On-the-fly compression of HTML documents
 Summary(pl):   Modu³ do apache: kompresuje dokumenty HTML w locie
-Name:          apache-mod_%{mod_name}
+Name:          apache1-mod_%{mod_name}
 Version:       1.3.26.1a
-Release:       2
+Release:       1
 License:       Apache
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/mod-gzip/mod_gzip-%{version}.tgz
 # Source0-md5: 080ccc5d789ed5efa0c0a7625e4fa02d
-Source1:       mod_%{mod_name}.logrotate
-Patch0:                mod_%{mod_name}-name_clash.patch
-Patch1:                mod_%{mod_name}-security.patch
+Source1:       %{name}.logrotate
+Patch0:                %{name}-name_clash.patch
+Patch1:                %{name}-security.patch
 URL:           http://sourceforge.net/projects/mod-gzip/
 BuildRequires: %{apxs}
-BuildRequires: apache(EAPI)-devel
+BuildRequires: apache1-devel
 BuildRequires: zlib-devel
 Requires(post,preun):  %{apxs}
 Requires(post,preun):  grep
 Requires(preun):       fileutils
-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
 Apache module: On-the-fly compression of HTML documents. Browser will
@@ -55,22 +56,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_%{mod_name}.conf" /etc/httpd/httpd.conf; then
-        echo "Include /etc/httpd/mod_%{mod_name}.conf" >> /etc/httpd/httpd.conf
+if [ -f /etc/apache/apache.conf ] && ! grep -q "^Include.*mod_%{mod_name}.conf" /etc/apache/apache.conf; then
+        echo "Include /etc/apache/mod_%{mod_name}.conf" >> /etc/apache/apache.conf
 fi
-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
        umask 027
-       grep -v "^Include.*mod_%{mod_name}.conf" /etc/httpd/httpd.conf > \
-                /etc/httpd/httpd.conf.tmp
-        mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
+       grep -v "^Include.*mod_%{mod_name}.conf" /etc/apache/apache.conf > \
+                /etc/apache/apache.conf.tmp
+        mv -f /etc/apache/apache.conf.tmp /etc/apache/apache.conf
+       if [ -f /var/lock/subsys/apache ]; then
+               /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi