SPECS: jabberd14.spec - use %service, empty %postun dropped, adapt...

[glen]

Author: glen                         Date: Thu Mar  2 22:39:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, empty %postun dropped, adapterized

---- Files affected:
SPECS:
   jabberd14.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/jabberd14.spec
diff -u SPECS/jabberd14.spec:1.40 SPECS/jabberd14.spec:1.41
--- SPECS/jabberd14.spec:1.40	Thu Aug 11 11:46:18 2005
+++ SPECS/jabberd14.spec	Thu Mar  2 23:39:12 2006
@@ -21,16 +21,17 @@
 Patch4:		%{name}-detach_from_terminal.patch
 Patch5:		%{name}-opt.patch
 # Patch6:	http://devel.amessage.info/jabberd14/jabberd-1.4.3.1.diff.bz2
-Patch6:		jabberd14-1.4.3.1.patch
+Patch6:		%{name}-1.4.3.1.patch
 URL:		http://jabberd.jabberstudio.org/1.4/
 BuildRequires:	expat-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pth-devel
-PreReq:		jabber-common
-PreReq:		rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
-Requires(postun):	/usr/sbin/userdel
 Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires:	jabber-common
+Requires:	rc-scripts
 Obsoletes:	jabber
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,10 +68,10 @@
 Summary:	Header and library files for jabberd14 component development
 Summary(pl):	Pliki nagłówkowe i biblioteki dla komponentów jabberd14
 Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 Requires:	expat-devel
 Requires:	openssl-devel >= 0.9.7d
 Requires:	pth-devel
-Requires:	%{name} = %{version}-%{release}
 
 %description devel
 This package provides the files necessary to develop jabberd-1.4.x
@@ -127,22 +128,14 @@
 
 %post server
 /sbin/chkconfig --add %{name}
-if [ -r /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name} start\" to start Jabber server."
-fi
+%service %{name} restart "Jabber server"
 
 %preun server
 if [ "$1" = "0" ]; then
-	if [ -r /var/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop >&2
-	fi
+	%service %{name} stop
 	/sbin/chkconfig --del %{name}
 fi
 
-%postun
-
 %files
 %defattr(644,root,root,755)
 %doc README UPGRADE pthsock/README*
@@ -169,6 +162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2006/03/02 22:39:12  glen
+- use %service, empty %postun dropped, adapterized
+
 Revision 1.40  2005/08/11 09:46:18  radek
 - bcond_with(out) is followed by one \t, then bcond's name.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jabberd14.spec?r1=1.40&r2=1.41&f=u