SPECS: drbd.spec, ejabberd.spec, exim.spec - use %service

Tue Feb 28 00:00:17 CET 2006

Author: glen                         Date: Mon Feb 27 23:00:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   drbd.spec (1.66 -> 1.67) , ejabberd.spec (1.18 -> 1.19) , exim.spec (1.259 -> 1.260) 

---- Diffs:

================================================================
Index: SPECS/drbd.spec
diff -u SPECS/drbd.spec:1.66 SPECS/drbd.spec:1.67

--- SPECS/drbd.spec:1.66	Sat Feb 11 14:38:48 2006
+++ SPECS/drbd.spec	Tue Feb 28 00:00:10 2006
@@ -25,7 +25,7 @@
 BuildRequires:	bison
 BuildRequires:	flex
 %{?with_dist_kernel:BuildRequires:	kernel-module-build}
-BuildRequires:	rpmbuild(macros) >= 1.118
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -181,17 +181,11 @@
 
 %post -n drbdsetup
 /sbin/chkconfig --add drbd
-if [ -f /var/lock/subsys/drbd ]; then
-	/etc/rc.d/init.d/drbd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/drbd start\" to start drbd service." >&2
-fi
+%service drbd restart
 
 %preun -n drbdsetup
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/drbd ]; then
-		/etc/rc.d/init.d/drbd stop
-	fi
+	%service drbd stop
 	/sbin/chkconfig --del drbd
 fi
 
@@ -225,6 +219,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2006/02/27 23:00:10  glen
+- use %service
+
 Revision 1.66  2006/02/11 13:38:48  arekm
 - rel 4 (new build way)
 
@@ -323,7 +320,7 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.35  2003/05/16 08:33:42  trojan
-- fixed depmod in %%post and %%postun when build with _without_dist_kernel
+- fixed depmod in %post and %postun when build with _without_dist_kernel
 
 Revision 1.34  2003/05/14 14:42:43  qboosh
 - added depmod options so modules can be installed for kernel other than running
@@ -340,7 +337,7 @@
 Revision 1.30  2002/10/02 17:30:53  marcus
 - rel.11
 - use new %5doc
-- fixed %%files
+- fixed %files
 
 Revision 1.29  2002/10/02 00:12:31  kloczek
 - release 10: rebuild against kernel 2.2.22.
@@ -417,11 +414,11 @@
 - drbdsetup doesn't require drbd (unavailable)
 - drbdsetup prereq: chkconfig (should it prereq rc-scripts?)
 - the modules conflict kernel-{smp,up}
-- %%if 0 changed to %%if %%{_kernel24} (SMP builds under 2.4)
+- %if 0 changed to %if %{_kernel24} (SMP builds under 2.4)
 - -D__KERNEL_SMP=1 to SMP build options
 
 Revision 1.7  2001/09/09 21:52:19  kloczek
-- use %%{_kernel_ver} only in Release field in with kernel modules packages,
+- use %{_kernel_ver} only in Release field in with kernel modules packages,
 - added "Requires: drbdsetup" for kernel modules packages.
 
 Revision 1.6  2001/09/09 13:59:05  saq

================================================================
Index: SPECS/ejabberd.spec
diff -u SPECS/ejabberd.spec:1.18 SPECS/ejabberd.spec:1.19
--- SPECS/ejabberd.spec:1.18	Fri Dec 16 15:59:24 2005
+++ SPECS/ejabberd.spec	Tue Feb 28 00:00:10 2006
@@ -21,8 +21,9 @@
 BuildRequires:	erlang >= R9C
 BuildRequires:	expat-devel >= 1.95
 BuildRequires:	openssl-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post):	/usr/bin/perl
-Requires(post): jabber-common
+Requires(post):	jabber-common
 Requires(post):	textutils
 Requires(post,preun):	/sbin/chkconfig
 Requires:	erlang
@@ -84,17 +85,11 @@
 fi
 
 /sbin/chkconfig --add ejabberd
-if [ -r /var/lock/subsys/ejabberd ]; then
-	/etc/rc.d/init.d/ejabberd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/ejabberd start\" to start ejabberd server."
-fi
+%service ejabberd restart "ejabberd server"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -r /var/lock/subsys/ejabberd ]; then
-		/etc/rc.d/init.d/ejabberd stop >&2
-	fi
+	%service ejabberd stop
 	/sbin/chkconfig --del ejabberd
 fi
 
@@ -115,6 +110,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/02/27 23:00:10  glen
+- use %service
+
 Revision 1.18  2005/12/16 14:59:24  deejay1
 - higher erlang BR
 

================================================================
Index: SPECS/exim.spec
diff -u SPECS/exim.spec:1.259 SPECS/exim.spec:1.260
--- SPECS/exim.spec:1.259	Fri Feb 17 20:22:28 2006
+++ SPECS/exim.spec	Tue Feb 28 00:00:10 2006
@@ -65,7 +65,7 @@
 BuildRequires:	perl-devel >= 1:5.6.0
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 %{?with_sqlite:BuildRequires:	sqlite3-devel}
 BuildRequires:	texinfo >= 4.7
 %{?with_whoson:BuildRequires:	whoson-devel}
@@ -248,14 +248,7 @@
 %post
 umask 022
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/exim ]; then
-	/etc/rc.d/init.d/%{name} restart >&2
-else
-	%banner %{name} -e <<EOF
-Run \"/etc/rc.d/init.d/%{name} start\" to start exim daemon.
-EOF
-# vim:"
-fi
+%service %{name} restart "exim daemon"
 
 if [ ! -f /etc/mail/mailname ]; then
 	rm -f /etc/mail/mailname && hostname -f > /etc/mail/mailname
@@ -265,9 +258,7 @@
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/exim ]; then
-		/etc/rc.d/init.d/exim stop >&2
-	fi
+	%service exim stop
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -341,6 +332,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.260  2006/02/27 23:00:10  glen
+- use %service
+
 Revision 1.259  2006/02/17 19:22:28  arekm
 - don't overwrite exim cflags (largefile support)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/drbd.spec?r1=1.66&r2=1.67&f=u
    http://cvs.pld-linux.org/SPECS/ejabberd.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/exim.spec?r1=1.259&r2=1.260&f=u

