From: Elan Ruusamäe Date: Tue, 13 May 2014 14:30:17 +0000 (+0300) Subject: sane patch order X-Git-Tag: auto/th/openssh-6.6p1-3~4 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=a46537e77b7bf4bc5bb87d8e4123cab18fb33687;hp=51f3c37aa92fcb40961989a5b8e3782e1aef896c;p=packages%2Fopenssh.git sane patch order --- diff --git a/openssh.spec b/openssh.spec index 9eb3603..d7b5036 100644 --- a/openssh.spec +++ b/openssh.spec @@ -59,10 +59,9 @@ Patch3: %{name}-sigpipe.patch # http://pkgs.fedoraproject.org/gitweb/?p=openssh.git;a=tree Patch4: %{name}-ldap.patch Patch5: %{name}-ldap-fixes.patch -Patch8: ldap.conf.patch -Patch6: %{name}-config.patch -Patch7: ldap-helper-sigpipe.patch - +Patch6: ldap.conf.patch +Patch7: %{name}-config.patch +Patch8: ldap-helper-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-5.2p1-hpn13v6.diff.gz Patch9: %{name}-5.2p1-hpn13v6.diff @@ -531,9 +530,9 @@ openldap-a. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch8 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %{?with_hpn:%patch9 -p1} %patch10 -p1