SPECS: netmrg.spec - use %service to respect skip auto restarts of...

[glen]

Author: glen                         Date: Wed Jan  4 14:28:59 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service to respect skip auto restarts of services

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

---- Diffs:

================================================================
Index: SPECS/netmrg.spec
diff -u SPECS/netmrg.spec:1.13 SPECS/netmrg.spec:1.14
--- SPECS/netmrg.spec:1.13	Tue Dec 13 14:58:51 2005
+++ SPECS/netmrg.spec	Wed Jan  4 15:28:54 2006
@@ -1,11 +1,16 @@
 # $Revision$, $Date$
+# TODO
+# - use webapps
+# warning: Installed (but unpackaged) file(s) found:
+#   /etc/netmrg.conf
 %define		snap	051123
 %define		snapd	2005.11.23
 Summary:	Network Monitoring package using PHP, MySQL, and RRDtool
 Summary(pl):	Monitor sieci używający PHP, MySQL i RRDtool
 Name:		netmrg
 Version:	0.18.2
-Release:	1.%{snap}.3
+%define	_rel 3
+Release:	1.%{snap}.%{_rel}
 License:	MIT
 Group:		Applications/Networking
 #Source0:	http://www.netmrg.net/download/release/%{name}-%{version}.tar.gz
@@ -15,6 +20,7 @@
 Source2:	%{name}-cron
 Patch0:		%{name}-config.patch
 URL:		http://www.netmrg.net/
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	automake
 BuildRequires:	libxml2-devel
 BuildRequires:	mysql-devel
@@ -82,14 +88,13 @@
 elif [ -d /etc/httpd/httpd.conf ]; then
 	mv -f /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf
 fi
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service httpd reload
+%service crond restart
 if [ -f /var/lock/subsys/crond ]; then
 	/etc/rc.d/init.d/crond restart 1>&2
 fi
-echo "Before first run read /usr/share/doc/%{name}-%{version}/INSTALL how to put
-/usr/share/netmrg/db/netmrg.mysql in your mysql server"
+echo "Before first run read %{_docdir}/%{name}-%{version}/INSTALL how to put
+%{_datadir}/netmrg/db/netmrg.mysql in your mysql server"
 
 
 %preun
@@ -101,9 +106,7 @@
 		grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \
 			etc/httpd/httpd.conf.tmp
 		mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
-		if [ -f /var/lock/subsys/httpd ]; then
-			/usr/sbin/apachectl restart 1>&2
-		fi
+		%service httpd reload
 	fi
 fi
 
@@ -131,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/01/04 14:28:54  glen
+- use %service to respect skip auto restarts of services
+
 Revision 1.13  2005/12/13 13:58:51  glen
 - adapterized (sorted %verify attrs)
 
================================================================

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