- (djm) Specify --datadir in RPM spec files so smartcard applet gets

    put somewhere sane. Add Ssh.bin to manifest.

diff --git a/ChangeLog b/ChangeLog
index bed2d99923f46b25c717d772d82a4b24c636582b..8c372e56a7f587bfcf837a80def5aeb11f040971 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 9d431cbb6d6b525e9aba41da4e7b6c82d035c681..13ea3dc184aa6098eca736ad6f6b6f48cf8a10af 100644 (file)
--- 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 \

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 17eaf79bd796b8633f346c8ab609b783453f8d53..3c605837f641f28a772d71e4a5092f5e876229c3 100644 (file)
--- 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 1327ca85454488adb4b8a21e33a2f8b7ff0e7123..6f20270764c32f3afe792a6d943124fc9c735dcb 100644 (file)
--- 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