SPECS: ssh2.spec - use %service, fix chkconfig deps, strict intern...

glen glen at pld-linux.org
Thu Apr 20 19:47:47 CEST 2006


Author: glen                         Date: Thu Apr 20 17:47:47 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, fix chkconfig deps, strict internal deps

---- Files affected:
SPECS:
   ssh2.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/ssh2.spec
diff -u SPECS/ssh2.spec:1.37 SPECS/ssh2.spec:1.38
--- SPECS/ssh2.spec:1.37	Tue Dec 13 16:14:18 2005
+++ SPECS/ssh2.spec	Thu Apr 20 19:47:42 2006
@@ -5,8 +5,8 @@
 Name:		%{base_name}2
 Version:	3.2.9.1
 Release:	0.1
-Group:		Applications
 License:	free use on Linux (see LICENSE)
+Group:		Applications
 Source0:	ftp://ftp.ssh.com/pub/ssh/%{base_name}-%{version}.tar.gz
 # Source0-md5:	f3ed49f13419d97dc1d0d3bfb4bb99bf
 Source1:	sshd.init
@@ -21,6 +21,7 @@
 BuildRequires:	libwrap-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	pam-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	xauth
 # it uses internal zlib with functions renamed by hacks
 #BuildRequires:	zlib-devel
@@ -52,8 +53,8 @@
 Summary:	Clients for connecting to Secure Shell servers
 Summary(pl):	Klient pozwalający na podłączenie się do serwera Secure Shell
 Group:		Applications
+Requires:	%{name} = %{version}-%{release}
 Provides:	ssh-clients
-Requires:	%{name} = %{version}
 
 %description clients
 This package includes the clients necessary to make encrypted
@@ -66,11 +67,11 @@
 Summary:	Secure Shell protocol server (sshd)
 Summary(pl):	Serwer (sshd) protokołu Secure Shell
 Group:		Daemons
-Provides:	ssh-server
+Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name} = %{version}-%{release}
 Requires:	pam >= 0.77.3
-Prereq:		/sbin/chkconfig
-Requires:	%{name} = %{version}
-Prereq:		rc-scripts
+Requires:	rc-scripts
+Provides:	ssh-server
 
 %description server
 This package contains the secure shell daemon and its documentation.
@@ -86,7 +87,7 @@
 Summary:	Extra commands for the secure shell protocol suite
 Summary(pl):	Dodatkowe polecenia dla obsługi protokołu Secure Shell
 Group:		Applications
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description extras
 This package contains the make_ssh_known_hosts perl script, the
@@ -153,17 +154,14 @@
 
 %post server
 /sbin/chkconfig --add sshd
-
-if [ -f /var/run/sshd.pid ]; then
-	/etc/rc.d/init.d/sshd restart >&2
-fi
+%service sshd restart
 
 %post
 if [ ! -f %{_sysconfdir}/ssh_host_key -o ! -s %{_sysconfdir}/ssh_host_key ]; then
-	if [ -f /etc/ssh_host_key -a -s /etc/ssh_host_key ]; then
-		mv -f /etc/ssh_host_key /etc/ssh_host_key.pub %{_sysconfdir} || :
-		mv -f /etc/ssh_known_hosts %{_sysconfdir} >/dev/null 2>&1 ||:
-		mv -f /etc/ssh_random_seed %{_sysconfdir} >/dev/null 2>&1 ||:
+	if [ -f /etc/ssh_host_key -a -s %{_sysconfdir}_host_key ]; then
+		mv -f /etc/ssh_host_key %{_sysconfdir}_host_key.pub %{_sysconfdir} || :
+		mv -f /etc/ssh_known_hosts %{_sysconfdir} >/dev/null 2>&1 || :
+		mv -f /etc/ssh_random_seed %{_sysconfdir} >/dev/null 2>&1 || :
 	else
 		%{_bindir}/ssh-keygen -b 1024 -f %{_sysconfdir}/ssh_host_key -N '' >&2
 	fi
@@ -171,7 +169,7 @@
 
 %preun server
 if [ "$1" = 0 ]; then
-	/etc/rc.d/init.d/sshd stop >&2
+	%service sshd stop
 	/sbin/chkconfig --del sshd
 fi
 
@@ -228,6 +226,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2006/04/20 17:47:42  glen
+- use %service, fix chkconfig deps, strict internal deps
+
 Revision 1.37  2005/12/13 15:14:18  glen
 - adapterized (sorted %verify attrs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ssh2.spec?r1=1.37&r2=1.38&f=u



More information about the pld-cvs-commit mailing list