-%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
Summary(fr): Module DAV pour Apache
Summary(it): Modulo DAV per Apache
Summary(ja): Apache ÍѤΠDAV ¥â¥¸¥å¡¼¥ë
-Summary(no): En DAV-modul for Apache
+Summary(nb): En DAV-modul for Apache
Summary(pl): Modu³ WebDAV dla webserwera Apache
Summary(pt): Um módulo de DAV para o Apache
Summary(ru): íÏÄÕÌØ, ÒÅÁÌÉÚÕÀÝÉÊ ÐÒÏÔÏËÏÌ DAV × Apache
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: 5
+Release: 2
License: OSI Approved
Group: Networking/Daemons
Source0: http://www.webdav.org/mod_dav/mod_%{mod_name}-%{version}-%{apache_version}.tar.gz
-Source1: apache1-mod_dav.conf
+# Source0-md5: ba83f2aa6e13b216a11d465b82aab484
+Source1: %{name}.conf
+Patch0: %{name}-format.patch
URL: http://www.webdav.org/mod_dav/
-BuildRequires: expat-devel
BuildRequires: %{apxs}
+BuildRequires: apache1-devel >= 1.3.33-2
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: apache(EAPI)-devel >= %{apache_version}
-Requires(post,preun): %{apxs}
-Requires(post,preun): grep
-Requires(preun): fileutils
-Requires: apache(EAPI) >= %{apache_version}
+BuildRequires: expat-devel
+Requires(triggerpostun): %{apxs}
+Requires(triggerpostun): grep
+Requires(triggerpostun): sed >= 4.0
+Requires: apache1 >= 1.3.33-2
+Obsoletes: apache-mod_%{mod_name} <= %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes: mod_dav
-%define _pkglibdir %(%{apxs} -q LIBEXECDIR)
+%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
%description
mod_dav enables Apache to understand DAV protocol (extensions to
%prep
%setup -q -n mod_%{mod_name}-%{version}-%{apache_version}
+%patch -p1
%build
%{__aclocal}
%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}/conf.d,/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}/conf.d/90_mod_%{mod_name}.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
-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
+%postun
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
+ if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
fi
fi
+%triggerpostun -- %{name} < 1.0.3-1.1
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
+ %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/libdav.so 1>&2
+ sed -i -e '
+ /^Include.*mod_%{mod_name}\.conf/d
+ ' /etc/apache/apache.conf
+else
+ # they're still using old apache.conf
+ sed -i -e '
+ s,^Include.*mod_%{mod_name}\.conf,Include %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf,
+ ' /etc/apache/apache.conf
+fi
+if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
+fi
+
%files
%defattr(644,root,root,755)
%doc README CHANGES INSTALL LICENSE.html
-%config(noreplace) %{_sysconfdir}/httpd/mod_dav.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*
%attr(750,http,http) /var/lock/mod_dav