SPECS: munin.spec - release 1 - proper apache* triggers

[baggins]

Author: baggins                      Date: Fri Oct  7 12:11:55 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- release 1
- proper apache* triggers

---- Files affected:
SPECS:
   munin.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/munin.spec
diff -u SPECS/munin.spec:1.13 SPECS/munin.spec:1.14
--- SPECS/munin.spec:1.13	Fri Oct  7 11:23:51 2005
+++ SPECS/munin.spec	Fri Oct  7 14:11:47 2005
@@ -8,7 +8,7 @@
 Summary(pl):	Munin - agent danych RRD Linpro
 Name:		munin
 Version:	1.3.2
-Release:	0.2
+Release:	1
 License:	GPL
 Group:		Daemons
 Source0:	http://dl.sourceforge.net/munin/%{name}_%{version}.tar.gz
@@ -112,39 +112,20 @@
 install server/munin-htaccess $RPM_BUILD_ROOT%{htmldir}/.htaccess
 install server/style.css $RPM_BUILD_ROOT%{htmldir}/
 
-# A hack so rpm won't find deps on perl(DBD::Sybase)
-%if %{without sybase}
-chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/sybase_space
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*/etc/%{name}/apache.conf" /etc/httpd/httpd.conf; then
-        echo "Include /etc/%{name}/apache.conf" >> /etc/httpd/httpd.conf
-elif [ -d /etc/httpd/httpd.conf ]; then
-        ln -sf /etc/%{name}/apache.conf /etc/httpd/httpd.conf/99_%{name}.conf
-fi
-if [ -f /var/lock/subsys/httpd ]; then
-        /usr/sbin/apachectl restart 1>&2
-fi
+%triggerin -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/apache.conf
 
-%preun
-if [ "$1" = "0" ]; then
-        umask 027
-        if [ -d /etc/httpd/httpd.conf ]; then
-                rm -f /etc/httpd/httpd.conf/99_%{name}.conf
-        else
-                grep -v "^Include.*/etc/%{name}/apache.conf" /etc/httpd/httpd.conf > \
-                        /etc/httpd/httpd.conf.tmp
-                mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
-        fi
-
-        if [ -f /var/lock/subsys/httpd ]; then
-                /usr/sbin/apachectl restart 1>&2
-        fi
-fi
+%triggerun -- apache1 >= 1.3.33-2
+%apache_config_uninstall -v 1
+
+%triggerin -- apache >= 2.0.0
+%apache_config_install -v 2 -c %{_sysconfdir}/apache.conf
+
+%triggerun -- apache >= 2.0.0
+%apache_config_uninstall -v 2
 
 %post node
 if [ "$1" = "1" ] ; then
@@ -223,6 +204,9 @@
 %attr(755,root,root) %{_sbindir}/munin-node-configure-snmp
 %dir %{_datadir}/munin/plugins
 %attr(755,root,root) %{_datadir}/munin/plugins/*
+%if %{without sybase}
+%exclude %{_datadir}/munin/plugins/sybase_space
+%endif
 %dir %attr(770,munin,munin) /var/lib/munin/plugin-state
 %{_mandir}/man5/munin-node*
 %{_mandir}/man8/munin-run*
@@ -234,6 +218,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2005/10/07 12:11:47  baggins
+- release 1
+- proper apache* triggers
+
 Revision 1.13  2005/10/07 09:23:51  baggins
 - simplify build and install
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/munin.spec?r1=1.13&r2=1.14&f=u