SPECS: ntop.spec, ntp.spec, nut.spec - use %service, adapterized, ...

glen glen at pld-linux.org
Mon Mar 6 19:16:47 CET 2006 

Author: glen                         Date: Mon Mar  6 18:16:47 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, adapterized, cosmetics

---- Files affected:
SPECS:
   ntop.spec (1.71 -> 1.72) , ntp.spec (1.70 -> 1.71) , nut.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: SPECS/ntop.spec
diff -u SPECS/ntop.spec:1.71 SPECS/ntop.spec:1.72
--- SPECS/ntop.spec:1.71	Tue Jan  3 12:55:03 2006
+++ SPECS/ntop.spec	Mon Mar  6 19:16:42 2006
@@ -32,6 +32,7 @@
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	rrdtool-devel >= 1.1.0
 BuildRequires:	zlib-devel
 Requires(post,postun):	/sbin/ldconfig
@@ -108,17 +109,11 @@
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add ntop
-if [ -f /var/lock/subsys/ntop ]; then
-	/etc/rc.d/init.d/ntop restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/ntop start\" to start ntop daemon." >&2
-fi
+%service ntop restart "ntop daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/ntop ]; then
-		/etc/rc.d/init.d/ntop stop 1>&2
-	fi
+	%service ntop stop
 	/sbin/chkconfig --del ntop
 fi
 
@@ -152,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2006/03/06 18:16:42  glen
+- use %service, adapterized, cosmetics
+
 Revision 1.71  2006/01/03 11:55:03  glen
 - fix desynchronized _localstatedir between spec and configure
 

================================================================
Index: SPECS/ntp.spec
diff -u SPECS/ntp.spec:1.70 SPECS/ntp.spec:1.71
--- SPECS/ntp.spec:1.70	Sun Dec  4 02:41:32 2005
+++ SPECS/ntp.spec	Mon Mar  6 19:16:42 2006
@@ -27,6 +27,7 @@
 BuildRequires:	libtool
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	readline-devel >= 4.2
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts >= 0.4.0.10
 Obsoletes:	xntp3
@@ -134,34 +135,22 @@
 
 %post
 /sbin/chkconfig --add ntpd
-if [ -f /var/lock/subsys/ntpd ]; then
-	/etc/rc.d/init.d/ntpd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/ntpd start\" to start ntpd daemon."
-fi
+%service ntpd restart "ntpd daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/ntpd ]; then
-		/etc/rc.d/init.d/ntpd stop >&2
-	fi
+	%service ntpd stop
 	/sbin/chkconfig --del ntpd
 	rm -f /etc/ntp/drift
 fi
 
 %post client
 /sbin/chkconfig --add ntp
-if [ -f /var/lock/subsys/ntp ]; then
-	/etc/rc.d/init.d/ntp restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/ntp start\" to start ntp."
-fi
+%service ntp restart
 
 %preun client
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/ntp ]; then
-		/etc/rc.d/init.d/ntp stop >&2
-	fi
+	%service ntp stop
 	/sbin/chkconfig --del ntp
 fi
 
@@ -196,6 +185,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2006/03/06 18:16:42  glen
+- use %service, adapterized, cosmetics
+
 Revision 1.70  2005/12/04 01:41:32  glen
 - rel 12
 

================================================================
Index: SPECS/nut.spec
diff -u SPECS/nut.spec:1.100 SPECS/nut.spec:1.101
--- SPECS/nut.spec:1.100	Thu Feb 16 15:07:42 2006
+++ SPECS/nut.spec	Mon Mar  6 19:16:42 2006
@@ -26,10 +26,10 @@
 BuildRequires:	gd-devel >= 2.0.15
 BuildRequires:	libpng-devel
 BuildRequires:	openssl-devel >= 0.9.7d
-BuildRequires:	rpmbuild(macros) >= 1.202
-Requires:	rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-common = %{version}-%{release}
+Requires:	rc-scripts
 Obsoletes:	smartupstools
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,13 +66,13 @@
 Summary:	Package with common files for nut daemon and its clients
 Summary(pl):	Pakiet z plikami wspólnymi dla demona nut i jego klientów
 Group:		Applications/System
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/groupmod
 Requires(pre):	/usr/sbin/useradd
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
 Provides:	group(ups)
 Provides:	user(ups)
 
@@ -85,12 +85,12 @@
 %package client
 Summary:	Multi-vendor UPS Monitoring Project Client Utilities
 Summary(pl):	Narzędzia klienckie do monitorowania UPS-ów
-Summary(uk):	Network UPS Tools - ËĚŚ¤ÎÔÓŘËŚ ŐÔÉĚŚÔÉ ÍĎÎŚÔĎŇÉÎÇŐ
 Summary(ru):	Network UPS Tools - ËĚÉĹÎÔÓËÉĹ ŐÔÉĚÉÔŮ ÍĎÎÉÔĎŇÉÎÇÁ
+Summary(uk):	Network UPS Tools - ËĚŚ¤ÎÔÓŘËŚ ŐÔÉĚŚÔÉ ÍĎÎŚÔĎŇÉÎÇŐ
 Group:		Applications/System
-Requires:	rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-common = %{version}-%{release}
+Requires:	rc-scripts
 
 %description client
 This package includes the client utilities that are required to
@@ -212,17 +212,11 @@
 
 %post
 /sbin/chkconfig --add ups
-if [ -f /var/lock/subsys/ups ]; then
-	/etc/rc.d/init.d/ups restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/ups start\" to start NUT ups daemon."
-fi
+%service ups restart "NUT ups daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/ups ]; then
-		/etc/rc.d/init.d/ups stop >&2
-	fi
+	%service ups stop
 	/sbin/chkconfig --del ups
 fi
 
@@ -238,17 +232,11 @@
 
 %post client
 /sbin/chkconfig --add upsmon
-if [ -f /var/lock/subsys/upsmon ]; then
-	/etc/rc.d/init.d/upsmon restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/upsmon start\" to start NUT upsmon daemon."
-fi
+%service upsmon restart "NUT upsmon daemon"
 
 %preun client
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/upsmon ]; then
-		/etc/rc.d/init.d/upsmon stop >&2
-	fi
+	%service upsmon stop
 	/sbin/chkconfig --del upsmon
 fi
 
@@ -331,6 +319,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2006/03/06 18:16:42  glen
+- use %service, adapterized, cosmetics
+
 Revision 1.100  2006/02/16 14:07:42  dzeus
 - up to 2.0.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ntop.spec?r1=1.71&r2=1.72&f=u
    http://cvs.pld-linux.org/SPECS/ntp.spec?r1=1.70&r2=1.71&f=u
    http://cvs.pld-linux.org/SPECS/nut.spec?r1=1.100&r2=1.101&f=u

More information about the pld-cvs-commit mailing list