From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 14 Apr 2006 15:31:28 +0000 (+0000)
Subject: - use %service, rel 3
X-Git-Tag: deadbranch-1.251.2~16
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=f054e8a9e60fe8a95147a32e5c56345c0d8ba637;p=packages%2Fopenssh.git

- use %service, rel 3

Changed files:
    openssh.spec -> 1.251.2.2
---

diff --git a/openssh.spec b/openssh.spec
index 80f2c8e..b24012d 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -16,6 +16,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
@@ -28,7 +29,7 @@ Summary(ru):	OpenSSH - 
 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
@@ -82,7 +83,7 @@ BuildRequires:	libwrap-devel
 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
@@ -569,11 +570,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -581,9 +578,7 @@ fi
 
 %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