- Merged OpenBSD CVS changes:

[openssh.git] / openssh.spec

diff --git a/openssh.spec b/openssh.spec
index 0ee946892b9ae1d116c7b5c84afd2f83e56f9f2e..c0d45bc258f01f5ab9ba6bdac518f9756f2377b3 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,6 +1,6 @@
 Summary: OpenSSH free Secure Shell (SSH) implementation
 Name: openssh
-Version: 1.2pre6
+Version: 1.2pre9
 Release: 1
 Packager: Damien Miller <djm@ibs.com.au>
 Source0: openssh-%{version}-linux.tar.gz
@@ -20,6 +20,11 @@ up to date in terms of security and features, as well as removing all
 patented algorithms to seperate libraries (OpenSSL).
 
 %changelog
+* Mon Nov 08 1999 Damien Miller <djm@ibs.com.au>
+- Added links for slogin
+- Fixed perms on manpages
+* Sat Oct 30 1999 Damien Miller <djm@ibs.com.au>
+- Renamed init script
 * Fri Oct 29 1999 Damien Miller <djm@ibs.com.au>
 - Back to old binary names
 * Thu Oct 28 1999 Damien Miller <djm@ibs.com.au>
@@ -34,8 +39,7 @@ patented algorithms to seperate libraries (OpenSSL).
 
 %build
 
-./configure --prefix=/usr --sysconfdir=/etc/ssh
-make OPT_FLAGS="$RPM_OPT_FLAGS"
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --sysconfdir=/etc/ssh
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -48,16 +52,17 @@ mkdir -p $RPM_BUILD_ROOT/usr/man/man1
 mkdir -p $RPM_BUILD_ROOT/usr/man/man8
 
 install -m644 sshd.pam $RPM_BUILD_ROOT/etc/pam.d/sshd
-install -m755 sshd.init $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
+install -m755 sshd.init.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/sshd
 install -m600 ssh_config $RPM_BUILD_ROOT/etc/ssh/ssh_config
 install -m600 sshd_config $RPM_BUILD_ROOT/etc/ssh/sshd_config
 
-install -s -m755 bin/sshd $RPM_BUILD_ROOT/usr/sbin
-install -s -m755 bin/ssh $RPM_BUILD_ROOT/usr/bin
-install -s -m755 bin/scp $RPM_BUILD_ROOT/usr/bin
-install -s -m755 bin/ssh-agent $RPM_BUILD_ROOT/usr/bin
-install -s -m755 bin/ssh-add $RPM_BUILD_ROOT/usr/bin
-install -s -m755 bin/ssh-keygen $RPM_BUILD_ROOT/usr/bin
+install -s -m755 sshd $RPM_BUILD_ROOT/usr/sbin
+install -s -m755 ssh $RPM_BUILD_ROOT/usr/bin
+install -s -m755 scp $RPM_BUILD_ROOT/usr/bin
+install -s -m755 ssh-agent $RPM_BUILD_ROOT/usr/bin
+install -s -m755 ssh-add $RPM_BUILD_ROOT/usr/bin
+install -s -m755 ssh-keygen $RPM_BUILD_ROOT/usr/bin
+ln -s ssh $RPM_BUILD_ROOT/usr/bin/slogin
 
 install -m644 sshd.8 $RPM_BUILD_ROOT/usr/man/man8
 install -m644 ssh.1 $RPM_BUILD_ROOT/usr/man/man1
@@ -65,6 +70,7 @@ install -m644 scp.1 $RPM_BUILD_ROOT/usr/man/man1
 install -m644 ssh-agent.1 $RPM_BUILD_ROOT/usr/man/man1
 install -m644 ssh-add.1 $RPM_BUILD_ROOT/usr/man/man1
 install -m644 ssh-keygen.1 $RPM_BUILD_ROOT/usr/man/man1
+ln -s ssh.1 $RPM_BUILD_ROOT/usr/man/man1/slogin.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,20 +95,22 @@ fi
 %files
 %defattr(-,root,root)
 %doc COPYING.Ylonen ChangeLog ChangeLog.Ylonen OVERVIEW 
-%doc README README.openssh
+%doc README README.Ylonen
 %attr(0755,root,root) /usr/sbin/sshd
 %attr(0755,root,root) /usr/bin/ssh
 %attr(0755,root,root) /usr/bin/ssh-agent
 %attr(0755,root,root) /usr/bin/ssh-keygen
 %attr(0755,root,root) /usr/bin/ssh-add
 %attr(0755,root,root) /usr/bin/scp
-
-%attr(0755,root,root) /usr/man/man8/sshd.8
-%attr(0755,root,root) /usr/man/man1/ssh.1
-%attr(0755,root,root) /usr/man/man1/ssh-agent.1
-%attr(0755,root,root) /usr/man/man1/ssh-keygen.1
-%attr(0755,root,root) /usr/man/man1/ssh-add.1
-%attr(0755,root,root) /usr/man/man1/scp.1
+%attr(0755,root,root) /usr/bin/slogin
+
+%attr(0644,root,root) /usr/man/man8/sshd.8
+%attr(0644,root,root) /usr/man/man1/ssh.1
+%attr(0644,root,root) /usr/man/man1/ssh-agent.1
+%attr(0644,root,root) /usr/man/man1/ssh-keygen.1
+%attr(0644,root,root) /usr/man/man1/ssh-add.1
+%attr(0644,root,root) /usr/man/man1/scp.1
+%attr(0644,root,root) /usr/man/man1/slogin.1
 
 %attr(0600,root,root) %config /etc/ssh/sshd_config
 %attr(0600,root,root) %config /etc/pam.d/sshd