- unify

Changed files:
    apache-mod_whatkilledus.spec -> 1.2

diff --git a/apache-mod_whatkilledus.spec b/apache-mod_whatkilledus.spec
index c8f4f34cdcf26a16d345140fc630906b953a9216..395455d9f491113ac4c7c362686ba6c5cfe5afae 100644 (file)
--- a/apache-mod_whatkilledus.spec
+++ b/apache-mod_whatkilledus.spec
@@ -9,15 +9,13 @@ Group:                Networking/Daemons
 Source0:       http://people.apache.org/~trawick/mod_whatkilledus.c
 # Source0-md5: e59c5d56e294a31e5b158ad5e4553001
 URL:           http://people.apache.org/~trawick/exception_hook.html
-BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0.43
-BuildRequires: rpm-perlprov
-Requires(post,preun):  %{apxs}
-Requires:      apache >= 2.0.43
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      apache(modules-api) = %apache_modules_api
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Keeps a little bit of state on each active connection, which allows it
@@ -31,30 +29,25 @@ to know what a thread was handling in case the thread segfaults.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/httpd/httpd.conf
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
-libtool --mode=install install -D mod_%{mod_name}.la $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
+libtool --mode=install install mod_%{mod_name}.la $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
 
-echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > $RPM_BUILD_ROOT/etc/httpd/httpd.conf/68_mod_%{mod_name}.conf
+echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' \
+       > $RPM_BUILD_ROOT/etc/httpd/httpd.conf/68_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
-else
-        echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
-fi
+%service -q httpd restart
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
+       %service -q httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*mod_*.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
-%config %{_sysconfdir}/httpd.conf/*.conf