diff options
-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 @@ | |||
4 | - (djm) Avoid warning on BSDgetopt | 4 | - (djm) Avoid warning on BSDgetopt |
5 | - (djm) More makefile infrastructre for smartcard support, also based | 5 | - (djm) More makefile infrastructre for smartcard support, also based |
6 | on Ben's work | 6 | on Ben's work |
7 | - (djm) Specify --datadir in RPM spec files so smartcard applet gets | ||
8 | put somewhere sane. Add Ssh.bin to manifest. | ||
7 | 9 | ||
8 | 20010917 | 10 | 20010917 |
9 | - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds | 11 | - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds |
@@ -6464,4 +6466,4 @@ | |||
6464 | - Wrote replacements for strlcpy and mkdtemp | 6466 | - Wrote replacements for strlcpy and mkdtemp |
6465 | - Released 1.0pre1 | 6467 | - Released 1.0pre1 |
6466 | 6468 | ||
6467 | $Id: ChangeLog,v 1.1528 2001/09/18 05:06:21 djm Exp $ | 6469 | $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 9b3ca8579..82a0b03fb 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
@@ -158,6 +158,7 @@ CFLAGS="$RPM_OPT_FLAGS" \ | |||
158 | --prefix=/usr \ | 158 | --prefix=/usr \ |
159 | --sysconfdir=/etc/ssh \ | 159 | --sysconfdir=/etc/ssh \ |
160 | --libexecdir=/usr/lib/ssh \ | 160 | --libexecdir=/usr/lib/ssh \ |
161 | --datadir=/usr/share/openssh \ | ||
161 | --with-pam \ | 162 | --with-pam \ |
162 | --with-tcp-wrappers \ | 163 | --with-tcp-wrappers \ |
163 | --with-ipv4-default \ | 164 | --with-ipv4-default \ |
@@ -309,4 +310,4 @@ fi | |||
309 | * Mon Jan 01 1998 ... | 310 | * Mon Jan 01 1998 ... |
310 | Template Version: 1.31 | 311 | Template Version: 1.31 |
311 | 312 | ||
312 | $Id: openssh.spec,v 1.17 2001/07/05 00:45:29 tim Exp $ | 313 | $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 17eaf79bd..3c605837f 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -139,6 +139,7 @@ GNOME GUI desktop environment. | |||
139 | 139 | ||
140 | %configure \ | 140 | %configure \ |
141 | --libexecdir=%{_libexecdir}/openssh \ | 141 | --libexecdir=%{_libexecdir}/openssh \ |
142 | --datadir=%{_datadir}/openssh \ | ||
142 | --with-pam \ | 143 | --with-pam \ |
143 | --with-tcp-wrappers \ | 144 | --with-tcp-wrappers \ |
144 | --with-ipv4-default \ | 145 | --with-ipv4-default \ |
@@ -221,6 +222,8 @@ fi | |||
221 | %attr(0755,root,root) %dir %{_sysconfdir} | 222 | %attr(0755,root,root) %dir %{_sysconfdir} |
222 | %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli | 223 | %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli |
223 | %attr(0755,root,root) %dir %{_libexecdir}/openssh | 224 | %attr(0755,root,root) %dir %{_libexecdir}/openssh |
225 | %attr(0755,root,root) %dir %{_datadir}/openssh | ||
226 | %attr(0644,root,root) %{_datadir}/openssh/Ssh.bin | ||
224 | 227 | ||
225 | %files clients | 228 | %files clients |
226 | %defattr(-,root,root) | 229 | %defattr(-,root,root) |
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 1327ca854..6f2027076 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec | |||
@@ -89,12 +89,13 @@ passphrase dialog. | |||
89 | %build | 89 | %build |
90 | CFLAGS="$RPM_OPT_FLAGS" \ | 90 | CFLAGS="$RPM_OPT_FLAGS" \ |
91 | ./configure --prefix=/usr \ | 91 | ./configure --prefix=/usr \ |
92 | --sysconfdir=/etc/ssh \ | 92 | --sysconfdir=/etc/ssh \ |
93 | --with-pam \ | 93 | --datadir=/usr/share/openssh \ |
94 | --with-gnome-askpass \ | 94 | --with-pam \ |
95 | --with-tcp-wrappers \ | 95 | --with-gnome-askpass \ |
96 | --with-ipv4-default \ | 96 | --with-tcp-wrappers \ |
97 | --libexecdir=/usr/lib/ssh | 97 | --with-ipv4-default \ |
98 | --libexecdir=/usr/lib/ssh | ||
98 | make | 99 | make |
99 | 100 | ||
100 | cd contrib | 101 | cd contrib |