- use %service

[packages/apache-mod_gzip.git] / apache-mod_gzip.spec

diff --git a/apache-mod_gzip.spec b/apache-mod_gzip.spec
index f062f1089f39e40c439c30a8c41c76a3a37376b7..9b432d2980ff78890ca79b3240fbdf6d4e6c8d3e 100644 (file)
--- a/apache-mod_gzip.spec
+++ b/apache-mod_gzip.spec
@@ -1,5 +1,3 @@
-# TODO
-# - add apache_modules_api dep
 %define                mod_name        gzip
 %define        apxs            /usr/sbin/apxs
 Summary:       Apache module: On-the-fly compression of HTML documents
@@ -16,11 +14,9 @@ Source2:     %{name}.logrotate
 #URL:          http://www.schroepl.net/projekte/mod_gzip/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0.40
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: zlib-devel
-Requires(triggerpostun):       %{apxs}
-Requires(triggerpostun):       grep
-Requires(triggerpostun):       sed >= 4.0
-Requires:      apache >= 2.0.40
+Requires:      apache(modules-api) = %apache_modules_api
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -43,10 +39,10 @@ spos
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/etc/logrotate.d,%{_pkglogdir}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,/etc/logrotate.d,%{_pkglogdir}}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
 > $RPM_BUILD_ROOT%{_pkglogdir}/mod_gzip.log
@@ -55,21 +51,17 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
 %postun
 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)
 %doc *.txt logos/*
-%attr(755,root,root) %{_pkglibdir}/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %attr(640,root,root) %ghost %{_pkglogdir}/*