Fix spec files

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 3df33d1a8a569231b1df63fdbce255634f60a6df..810af15007073d8561cad4befccc7eb6962bfc1b 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,5 +1,5 @@
 # Version of OpenSSH
-%define oversion 2.2.0p1
+%define oversion 2.2.0p2
 
 # Version of ssh-askpass
 %define aversion 1.0.1
@@ -127,6 +127,8 @@ patented algorithms to seperate libraries (OpenSSL).
 This package contains the GNOME passphrase dialog.
 
 %changelog
+* Tue Sep 05 2000 Damien Miller <djm@mindrot.org>
+- Use RPM configure macro
 * Tue Aug 08 2000 Damien Miller <djm@mindrot.org>
 - Some surgery to sshd.init (generate keys at runtime)
 - Cleanup of groups and removal of keygen calls
@@ -161,14 +163,12 @@ This package contains the GNOME passphrase dialog.
 
 %prep
 
-%setup -a 1
+%setup -q -a 1
 
 %build
 
-CFLAGS="$RPM_OPT_FLAGS" \
-       ./configure --prefix=/usr --sysconfdir=/etc/ssh \
-               --with-tcp-wrappers --with-ipv4-default \
-                                       --with-rsh=/usr/bin/rsh
+%configure --sysconfdir=/etc/ssh --with-tcp-wrappers \
+       --with-rsh=/usr/bin/rsh
 
 make
 

diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index c73348754b98c6265ec71f2b33834ff2a4a6b4a8..5c2e56e62837575cf535e71cbcea909d57b863ec 100644 (file)
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -247,7 +247,9 @@ fi
 %files server
 %defattr(-,root,root)
 %attr(0755,root,root) /usr/sbin/sshd
+%attr(0755,root,root) /usr/libexec/ssh/sftp-server
 %attr(0644,root,root) %doc /usr/man/man8/sshd.8*
+%attr(0644,root,root) %doc /usr/man/man8/sftp-server.8*
 %attr(0600,root,root) %config /etc/ssh/sshd_config
 %attr(0644,root,root) %config /etc/pam.d/sshd
 %attr(0755,root,root) %config /sbin/init.d/sshd