SPECS (AC-branch): openssh.spec - use %service, rel 3

[glen]

Author: glen                         Date: Fri Apr 14 15:31:33 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- use %service, rel 3

---- Files affected:
SPECS:
   openssh.spec (1.251.2.1 -> 1.251.2.2) 

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.251.2.1 SPECS/openssh.spec:1.251.2.2
--- SPECS/openssh.spec:1.251.2.1	Mon Feb 20 19:25:42 2006
+++ SPECS/openssh.spec	Fri Apr 14 17:31:28 2006
@@ -17,6 +17,7 @@
 %endif
 # gtk2-based gnome-askpass means no gnome1-based
 %{?with_gtk:%undefine with_gnome}
+%define		_rel 3
 Summary:	OpenSSH free Secure Shell (SSH) implementation
 Summary(de):	OpenSSH - freie Implementation der Secure Shell (SSH)
 Summary(es):	Implementación libre de SSH
@@ -29,7 +30,7 @@
 Summary(uk):	OpenSSH - ׌ĚŘÎÁ ŇĹÁĚŚÚÁĂŚŃ ĐŇĎÔĎËĎĚŐ Secure Shell (SSH)
 Name:		openssh
 Version:	4.3p2
-Release:	2%{?with_hpn:hpn}%{?with_hpn_none:hpn_none}
+Release:	%{_rel}%{?with_hpn:hpn}%{?with_hpn_none:hpn_none}
 Epoch:		2
 License:	BSD
 Group:		Applications/Networking
@@ -83,7 +84,7 @@
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
 %{?with_gtk:BuildRequires:	pkgconfig}
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
 Requires:	FHS >= 2.1-24
 Requires:	pam >= 0.79.0
@@ -570,11 +571,7 @@
 
 %post server
 /sbin/chkconfig --add sshd
-if [ -f /var/lock/subsys/sshd ]; then
-	/etc/rc.d/init.d/sshd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/sshd start\" to start openssh daemon."
-fi
+%service sshd restart "openssh daemon"
 if ! grep -qs ssh /etc/security/passwd.conf ; then
 	umask 022
 	echo "ssh" >> /etc/security/passwd.conf
@@ -582,9 +579,7 @@
 
 %preun server
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/sshd ]; then
-		/etc/rc.d/init.d/sshd stop 1>&2
-	fi
+	%service sshd stop
 	/sbin/chkconfig --del sshd
 fi
 
@@ -665,6 +660,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.251.2.2  2006/04/14 15:31:28  glen
+- use %service, rel 3
+
 Revision 1.251.2.1  2006/02/20 18:25:42  baggins
 - release 2
 - proper xauth path
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openssh.spec?r1=1.251.2.1&r2=1.251.2.2&f=u