diff options
| author | Damien Miller <djm@mindrot.org> | 2001-09-18 15:12:10 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-09-18 15:12:10 +1000 |
| commit | 7948d93173b00e19ca4c5a68a0d01fceecc98738 (patch) | |
| tree | 3668826fb211a162484e448a0a571fcd2eebef83 | |
| parent | d97c2ceed1e295bdc612be7e042015c1b7200773 (diff) | |
| download | openssh-git-7948d93173b00e19ca4c5a68a0d01fceecc98738.tar.gz | |
- (djm) Specify --datadir in RPM spec files so smartcard applet gets
put somewhere sane. Add Ssh.bin to manifest.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | contrib/caldera/openssh.spec | 3 | ||||
| -rw-r--r-- | contrib/redhat/openssh.spec | 3 | ||||
| -rw-r--r-- | contrib/suse/openssh.spec | 13 |
4 files changed, 15 insertions, 8 deletions
@@ -4,6 +4,8 @@ - (djm) Avoid warning on BSDgetopt - (djm) More makefile infrastructre for smartcard support, also based on Ben's work + - (djm) Specify --datadir in RPM spec files so smartcard applet gets + put somewhere sane. Add Ssh.bin to manifest. 20010917 - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds @@ -6464,4 +6466,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1528 2001/09/18 05:06:21 djm Exp $ +$Id: ChangeLog,v 1.1529 2001/09/18 05:12:10 djm Exp $ diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 9b3ca857..82a0b03f 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -158,6 +158,7 @@ CFLAGS="$RPM_OPT_FLAGS" \ --prefix=/usr \ --sysconfdir=/etc/ssh \ --libexecdir=/usr/lib/ssh \ + --datadir=/usr/share/openssh \ --with-pam \ --with-tcp-wrappers \ --with-ipv4-default \ @@ -309,4 +310,4 @@ fi * Mon Jan 01 1998 ... Template Version: 1.31 -$Id: openssh.spec,v 1.17 2001/07/05 00:45:29 tim Exp $ +$Id: openssh.spec,v 1.18 2001/09/18 05:12:11 djm Exp $ diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 17eaf79b..3c605837 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -139,6 +139,7 @@ GNOME GUI desktop environment. %configure \ --libexecdir=%{_libexecdir}/openssh \ + --datadir=%{_datadir}/openssh \ --with-pam \ --with-tcp-wrappers \ --with-ipv4-default \ @@ -221,6 +222,8 @@ fi %attr(0755,root,root) %dir %{_sysconfdir} %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli %attr(0755,root,root) %dir %{_libexecdir}/openssh +%attr(0755,root,root) %dir %{_datadir}/openssh +%attr(0644,root,root) %{_datadir}/openssh/Ssh.bin %files clients %defattr(-,root,root) diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 1327ca85..6f202707 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec @@ -89,12 +89,13 @@ passphrase dialog. %build CFLAGS="$RPM_OPT_FLAGS" \ ./configure --prefix=/usr \ - --sysconfdir=/etc/ssh \ - --with-pam \ - --with-gnome-askpass \ - --with-tcp-wrappers \ - --with-ipv4-default \ - --libexecdir=/usr/lib/ssh + --sysconfdir=/etc/ssh \ + --datadir=/usr/share/openssh \ + --with-pam \ + --with-gnome-askpass \ + --with-tcp-wrappers \ + --with-ipv4-default \ + --libexecdir=/usr/lib/ssh make cd contrib |