- this is apache1 module; release 1, waiting for server-side cp

Changed files:
    apache1-mod_cvs.spec -> 1.24

diff --git a/apache1-mod_cvs.spec b/apache1-mod_cvs.spec
index 58f44ad65a2ab51a980204c8fad7c76f75688b1a..6a85802367e3dfdf3186e1c834251421db2d418b 100644 (file)
--- a/apache1-mod_cvs.spec
+++ b/apache1-mod_cvs.spec
@@ -1,10 +1,10 @@
 %define                mod_name        cvs
-%define        apxs            /usr/sbin/apxs
+%define        apxs            /usr/sbin/apxs1
 Summary:       Apache module: Automatically updates files in a CVS-based webtree
 Summary(pl):   Modu³ do apache: Automatyczne uaktualnianie plików z drzewa CVS
-Name:          apache-mod_%{mod_name}
+Name:          apache1-mod_%{mod_name}
 Version:       0.5
-Release:       4
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
 # working URL: http://www.sub.nu/mod_cvs/src/
@@ -13,10 +13,11 @@ Source0:    ftp://ftp.sub.nu/pub/mod_cvs/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: e2cfe7818337915e6cbaffa45852012f
 URL:           http://www.sub.nu/mod_cvs/
 BuildRequires: %{apxs}
-BuildRequires: apache-devel
+BuildRequires: apache1-devel
 BuildRequires: zlib-devel
 Requires(post,preun):  %{apxs}
-Requires:      apache
+Requires:      apache1
+Obsoletes:     apache-mod_%{mod_name} <= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
@@ -44,15 +45,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