- tabs

[packages/apache1-mod_dav.git] / apache1-mod_dav.spec

diff --git a/apache1-mod_dav.spec b/apache1-mod_dav.spec
index f21adf29385510df576ea914ee12a1be5d21fb1d..1f4d5c55164eb44964332a477f7aedf5a5b99a96 100644 (file)
--- a/apache1-mod_dav.spec
+++ b/apache1-mod_dav.spec
@@ -30,8 +30,8 @@ BuildRequires:        apache1-devel >= 1.3.33-2
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: expat-devel
-Requires(triggerpostun):       grep
 Requires(triggerpostun):       %{apxs}
+Requires(triggerpostun):       grep
 Requires(triggerpostun):       sed >= 4.0
 Requires:      apache1 >= 1.3.33-2
 Obsoletes:     apache-mod_%{mod_name} <= %{version}
@@ -173,7 +173,7 @@ if [ "$1" = "0" ]; then
 fi
 
 %triggerpostun -- %{name} < 1.0.3-1.1
-if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+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
@@ -191,6 +191,6 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES INSTALL LICENSE.html
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.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