diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /contrib/caldera | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'contrib/caldera')
-rw-r--r-- | contrib/caldera/openssh.spec | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 37e1b9411..7c291a0eb 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
@@ -17,11 +17,11 @@ | |||
17 | #old cvs stuff. please update before use. may be deprecated. | 17 | #old cvs stuff. please update before use. may be deprecated. |
18 | %define use_stable 1 | 18 | %define use_stable 1 |
19 | %if %{use_stable} | 19 | %if %{use_stable} |
20 | %define version 5.3p1 | 20 | %define version 5.4p1 |
21 | %define cvs %{nil} | 21 | %define cvs %{nil} |
22 | %define release 1 | 22 | %define release 1 |
23 | %else | 23 | %else |
24 | %define version 5.3p1 | 24 | %define version 5.4p1 |
25 | %define cvs cvs20050315 | 25 | %define cvs cvs20050315 |
26 | %define release 0r1 | 26 | %define release 0r1 |
27 | %endif | 27 | %endif |
@@ -319,6 +319,7 @@ fi | |||
319 | %{_bindir}/ssh-keyscan | 319 | %{_bindir}/ssh-keyscan |
320 | %dir %{_libexecdir} | 320 | %dir %{_libexecdir} |
321 | %attr(4711,root,root) %{_libexecdir}/ssh-keysign | 321 | %attr(4711,root,root) %{_libexecdir}/ssh-keysign |
322 | %{_libexecdir}/ssh-pkcs11-helper | ||
322 | %{_sbindir}/ssh-host-keygen | 323 | %{_sbindir}/ssh-host-keygen |
323 | %dir %{_defaultdocdir}/%{name}-%{version} | 324 | %dir %{_defaultdocdir}/%{name}-%{version} |
324 | %{_defaultdocdir}/%{name}-%{version}/CREDITS | 325 | %{_defaultdocdir}/%{name}-%{version}/CREDITS |
@@ -330,6 +331,7 @@ fi | |||
330 | %{_defaultdocdir}/%{name}-%{version}/faq.html | 331 | %{_defaultdocdir}/%{name}-%{version}/faq.html |
331 | %{_mandir}/man1/* | 332 | %{_mandir}/man1/* |
332 | %{_mandir}/man8/ssh-keysign.8.gz | 333 | %{_mandir}/man8/ssh-keysign.8.gz |
334 | %{_mandir}/man8/ssh-pkcs11-helper.8.gz | ||
333 | %{_mandir}/man5/ssh_config.5.gz | 335 | %{_mandir}/man5/ssh_config.5.gz |
334 | 336 | ||
335 | %Files server | 337 | %Files server |
@@ -358,4 +360,4 @@ fi | |||
358 | * Mon Jan 01 1998 ... | 360 | * Mon Jan 01 1998 ... |
359 | Template Version: 1.31 | 361 | Template Version: 1.31 |
360 | 362 | ||
361 | $Id: openssh.spec,v 1.66.4.1 2009/09/26 04:09:35 djm Exp $ | 363 | $Id: openssh.spec,v 1.69 2010/03/07 22:41:03 djm Exp $ |