- (bal) Fix --define rh7 in openssh.spec file. Patch by Steve Tell

   <tell@telltronics.org>

diff --git a/ChangeLog b/ChangeLog
index df854a45c3874f4db0bfdd51e8d5ced3aee6d330..70c8e0e83fd3baf909e61f51044e1164fc837507 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20010223
+ - (bal) Fix --define rh7 in openssh.spec file.  Patch by Steve Tell
+   <tell@telltronics.org>
+
 20010222                                                             
  - (bal) Corrected SCO luid patch by svaughan <svaughan@asterion.com>
  - (bal) Added mdoc2man.pl from Mark Roth <roth@feep.net>

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index b09a9aaa5866615fa8be7dbc12a260689f99a6cd..1e18aa9e10e32092ce6a08c53cb02235a168aa97 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -190,9 +190,9 @@ install -d $RPM_BUILD_ROOT/etc/pam.d/
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -d $RPM_BUILD_ROOT%{_libexecdir}/openssh
 %if %{redhat7}
-install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
-%else
 install -m644 contrib/redhat/sshd.pam-7.x $RPM_BUILD_ROOT/etc/pam.d/sshd
+%else
+install -m644 contrib/redhat/sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
 %endif
 install -m755 contrib/redhat/sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd