- mass attack: s/%patch /%patch0 / -- usefull for overloaded %patch macro

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

diff --git a/apache1-mod_auth_checkpasswd.spec b/apache1-mod_auth_checkpasswd.spec
index 98d8a2875a141c8543f2403cf8d28a4e4f12ffe3..694dc9ea39b1cd62b866f21199b4e5079bfc603e 100644 (file)
--- a/apache1-mod_auth_checkpasswd.spec
+++ b/apache1-mod_auth_checkpasswd.spec
@@ -12,9 +12,10 @@ Source0:     mod_%{mod_name}-%{version}.tar.gz
 Patch0:                %{name}-aplog.patch
 BuildRequires: %{apxs}
 BuildRequires: apache1-devel >= 1.3.33-2
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(triggerpostun):       %{apxs}
 Requires:      apache1 >= 1.3.33-2
-Obsoletes:     apache-mod_%{mod_name} <= %{version}
+Obsoletes:     apache-mod_auth_checkpasswd <= 1.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -34,7 +35,7 @@ zwyk
 
 %prep
 %setup -q -c -n "mod_%{mod_name}-%{version}"
-%patch -p1
+%patch0 -p1
 
 %build
 %{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so
@@ -52,15 +53,11 @@ echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-       /etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/apache ]; then
-               /etc/rc.d/init.d/apache restart 1>&2
-       fi
+       %service -q apache restart
 fi
 
 %triggerpostun -- apache1-mod_%{mod_name} < 1.0-1.1
@@ -72,5 +69,5 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README
-%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}/*