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

Changed files:
    apache1-mod_dav.spec -> 1.36

diff --git a/apache1-mod_dav.spec b/apache1-mod_dav.spec
index d09cd8e00482b3b57676714d32808036f10ff89d..1fa570e0f4ee253e6b2d167bfefafb931910ea36 100644 (file)
--- a/apache1-mod_dav.spec
+++ b/apache1-mod_dav.spec
@@ -1,4 +1,5 @@
-%define        apxs    /usr/sbin/apxs
+%define                mod_name        dav
+%define        apxs    /usr/sbin/apxs1
 Summary:       WebDAV module for the Apache Web server
 Summary(cs):   DAV modul pro WWW server Apache
 Summary(da):   En DAV-modul for Apache
@@ -14,30 +15,30 @@ Summary(ru):        
 Summary(sv):   En DAV-modul till Apache
 Summary(uk):   íÏÄÕÌØ, ÝÏ ÒÅÁ̦ÚÕ¤ ÐÒÏÔÏËÏÌ DAV × Apache
 %define                apache_version  1.3.6
-%define                mod_name        dav
-Name:          apache-mod_%{mod_name}
+Name:          apache1-mod_%{mod_name}
 Version:       1.0.3
-Release:       6
+Release:       1
 License:       OSI Approved
 Group:         Networking/Daemons
 Source0:       http://www.webdav.org/mod_dav/mod_%{mod_name}-%{version}-%{apache_version}.tar.gz
 # Source0-md5: ba83f2aa6e13b216a11d465b82aab484
-Source1:       apache1-mod_dav.conf
+Source1:       %{name}.conf
 Patch0:                %{name}-format.patch
 URL:           http://www.webdav.org/mod_dav/
 BuildRequires: %{apxs}
-BuildRequires: apache(EAPI)-devel >= %{apache_version}
+BuildRequires: apache1-devel >= %{apache_version}
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: expat-devel
 Requires(post,preun):  %{apxs}
 Requires(post,preun):  grep
 Requires(preun):       fileutils
-Requires:      apache(EAPI) >= %{apache_version}
+Requires:      apache1 >= %{apache_version}
+Obsoletes:     apache-mod_%{mod_name} <= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:     mod_dav
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define                _sysconfdir     /etc/apache
 
 %description
 mod_dav enables Apache to understand DAV protocol (extensions to
@@ -151,38 +152,38 @@ Fusion צ
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd,/var/lock/mod_dav}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},/var/lock/mod_dav}
 
 install lib%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/mod_dav.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mod_dav.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %{apxs} -e -a -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2
-if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_dav.conf" /etc/httpd/httpd.conf; then
-       echo "Include /etc/httpd/mod_dav.conf" >> /etc/httpd/httpd.conf
+if [ -f %{_sysconfdir}/apache.conf ] && ! grep -q "^Include.*mod_dav.conf" %{_sysconfdir}/apache.conf; then
+       echo "Include %{_sysconfdir}/mod_dav.conf" >> %{_sysconfdir}/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}/lib%{mod_name}.so 1>&2
        umask 027
-       grep -v "^Include.*mod_dav.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_dav.conf" %{_sysconfdir}/apache.conf > \
+               %{_sysconfdir}/apache.conf.tmp
+       mv -f %{_sysconfdir}/apache.conf.tmp %{_sysconfdir}/apache.conf
+       if [ -f /var/lock/subsys/apache ]; then
+               /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES INSTALL LICENSE.html
-%config(noreplace) %{_sysconfdir}/httpd/mod_dav.conf
+%config(noreplace) %{_sysconfdir}/mod_dav.conf
 %attr(755,root,root) %{_pkglibdir}/*
 %attr(750,http,http) /var/lock/mod_dav