Accepting request 60035 from home:pcerny:factory

reviewed ok.

OBS-URL: https://build.opensuse.org/request/show/60035
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=6

openssh.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  3 16:42:01 UTC 2011 - pcerny@novell.com
+
+- specfile/patches cleanup 
+
 -------------------------------------------------------------------
 Mon Jan 24 11:24:59 UTC 2011 - lchiquitto@novell.com
 

openssh.spec

@@ -30,7 +30,7 @@ PreReq:         pwdutils %insserv_prereq  %fillup_prereq coreutils
 Conflicts:      nonfreessh
 AutoReqProv:    on
 Version:        5.7p1
-Release:        1
+Release:        2
 %define xversion 1.2.4.1
 Summary:        Secure Shell Client and Server (Remote Login Program)
 Url:            http://www.openssh.com/
@@ -44,7 +44,7 @@ Source6:        README.kerberos
 Source7:        ssh.reg
 Source8:        ssh-askpass
 Source9:        sshd.fw
-Patch:          %{name}-%{version}.dif
+Patch:          %{name}-%{version}-sshd_config.diff
 Patch1:         %{name}-%{version}-askpass-fix.diff
 Patch2:         %{name}-%{version}-pam-fix2.diff
 Patch3:         %{name}-%{version}-saveargv-fix.diff
@@ -62,7 +62,7 @@ Patch16:        %{name}-%{version}-pts.diff
 Patch17:        %{name}-%{version}-homechroot.patch
 Patch18:        %{name}-%{version}-sshconfig-knownhostschanges.diff
 Patch19:        %{name}-%{version}-host_ident.diff
-Patch20:        %{name}-%{version}-selinux.diff
+Patch21:        %{name}-%{version}-selinux.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package        askpass
@@ -107,7 +107,7 @@ Window System passphrase dialog for OpenSSH.
 %patch17
 %patch18
 %patch19 -p1
-%patch20 -p1
+%patch21 -p1
 cp -v %{SOURCE4} .
 cp -v %{SOURCE6} .
 cd ../x11-ssh-askpass-%{xversion}