SPECS (AC-branch): openssh.spec - renum patches to make HEAD merge...

[glen]

Author: glen                         Date: Tue Feb 26 14:10:21 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- renum patches to make HEAD merges easier

---- Files affected:
SPECS:
   openssh.spec (1.286.2.4 -> 1.286.2.5) 

---- Diffs:

================================================================
Index: SPECS/openssh.spec
diff -u SPECS/openssh.spec:1.286.2.4 SPECS/openssh.spec:1.286.2.5
--- SPECS/openssh.spec:1.286.2.4	Tue Feb 26 15:00:53 2008
+++ SPECS/openssh.spec	Tue Feb 26 15:10:16 2008
@@ -39,22 +39,22 @@
 Source5:	ssh-agent.sh
 Source6:	ssh-agent.conf
 Patch0:		%{name}-no_libnsl.patch
-Patch1:		%{name}-heimdal.patch
-Patch2:		%{name}-linux-ipv6.patch
-Patch3:		%{name}-pam_misc.patch
-Patch4:		%{name}-sigpipe.patch
+Patch1:		%{name}-linux-ipv6.patch
+Patch2:		%{name}-pam_misc.patch
+Patch3:		%{name}-sigpipe.patch
 # http://www.opendarwin.org/projects/openssh-lpk/
-Patch5:		%{name}-lpk-4.3p1-0.3.7.patch
-Patch6:		%{name}-config.patch
-Patch7:		%{name}-pam-conv.patch
+Patch4:		%{name}-lpk-4.3p1-0.3.7.patch
+Patch5:		%{name}-config.patch
 # http://chrootssh.sourceforge.net/download/osshChroot-3.7.1p2.diff
-Patch8:		%{name}-chroot.patch
-Patch9:		%{name}-selinux.patch
+Patch6:		%{name}-chroot.patch
+Patch7:		%{name}-selinux.patch
 # HPN patches rediffed due sigpipe patch.
 # High Performance SSH/SCP - HPN-SSH - http://www.psc.edu/networking/projects/hpn-ssh/
 # http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.2p1-hpn11.diff
-Patch10:	%{name}-4.7p1-hpn13v1.diff
-Patch11:	%{name}-include.patch
+Patch9:	%{name}-4.7p1-hpn13v1.diff
+Patch10:	%{name}-include.patch
+Patch100:	%{name}-heimdal.patch
+Patch101:	%{name}-pam-conv.patch
 URL:		http://www.openssh.com/
 BuildRequires:	%{__perl}
 BuildRequires:	autoconf
@@ -463,17 +463,18 @@
 %prep
 %setup -q
 %patch0 -p1
-%{?with_kerberos5:%patch1 -p1}
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%{?with_ldap:%patch5 -p1}
+%{?with_ldap:%patch4 -p1}
+%patch5 -p1
 %patch6 -p1
-#%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%{?with_hpn:%patch10 -p1}
-%patch11 -p1
+%patch7 -p1
+%{?with_hpn:%patch9 -p1}
+%patch10 -p1
+
+%{?with_kerberos5:%patch100 -p1}
+#%patch101 -p1
 
 %build
 cp /usr/share/automake/config.sub .
@@ -671,6 +672,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.286.2.5  2008-02-26 14:10:16  glen
+- renum patches to make HEAD merges easier
+
 Revision 1.286.2.4  2008-02-26 14:00:53  glen
 - updated hpn patch to 13v1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openssh.spec?r1=1.286.2.4&r2=1.286.2.5&f=u