Heres a patch for the contrib/lsh.spec.in file.  This patch removes
several things that make install now handles (such as installing
man pages).  This patch also simplifies, fixes a spelling error,
and handles the lsh.info page.

Speaking of lsh.info, install-info complains that there is no
info header inside of lsh.info and refuses to install an entry
in the dir file.

If this is really going to be a 1.0 release are all the man pages
complete and up to date?


"Niels M�ller" wrote:
> 
> Thayne Harbaugh <[EMAIL PROTECTED]> writes:
> 
> > I'll go through the rpm spec file and make sure it's up to date - last
> > time I check it was a little behind.  I should get something back in
> > a day or so.
> 
> Ok. I also found some configure problems on HPUX and alpha-linux,
> which I have to fix.
> 
> /Niels

-- 
Thayne Harbaugh         (801) 437-6009
Network Guy                                             President
North Sky                                               Provo Linux Users' Group
http://northsky.com.                                    http://plug.org.
--- lsh-0.9.14/contrib/lsh.spec.in.orig Wed May 24 13:13:41 2000
+++ lsh-0.9.14/contrib/lsh.spec.in      Wed Jun 28 07:54:43 2000
@@ -1,4 +1,4 @@
-Summary:        lsh - secure connections
+Summary:        lsh - secure connections with secsh2 protocol
 Name:           @PACKAGE@
 Version:        @VERSION@
 Release:        1
@@ -10,10 +10,11 @@
 Packager:       Thayne Harbaugh <[EMAIL PROTECTED]>
 URL:            http://www.net.lut.ac.uk/psst/
 Requires:       chkconfig
+Requires:      info
 
 
 %description 
-lsh impliments the secsh2 protocol
+lsh implements the secsh2 protocol
 
 
 %prep
@@ -24,10 +25,8 @@
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix
 if [ "$SMP" != "" ]; then
   (make "MAKE=gmake -k -j $SMP"; exit 0)
-  gmake
-else
-  gmake
 fi
+gmake
 
 
 %install
@@ -35,26 +34,19 @@
 
 gmake prefix=$RPM_BUILD_ROOT%{prefix} install
 
-( for man in doc/*.[0-9]
-do
-        MAN_NUM=`echo $man | sed 's/.*\.//'`
-        install -d -m 0755 $RPM_BUILD_ROOT%{prefix}/man/man$MAN_NUM
-        install -m 0644 $man $RPM_BUILD_ROOT%{prefix}/man/man$MAN_NUM
-        rm -f $man
-done )
-
 install -d -m 0755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 
 install -m 0755 contrib/lshd.rhlinux.init \
         $RPM_BUILD_ROOT/etc/rc.d/init.d/lshd
 
-strip $RPM_BUILD_ROOT%{prefix}/bin/lsh
-strip $RPM_BUILD_ROOT%{prefix}/bin/lsh_keygen
-strip $RPM_BUILD_ROOT%{prefix}/bin/lsh_writekey
-# strip $RPM_BUILD_ROOT%{prefix}/lib/*
+# ugly, but it's also ugly to list all files in bin
+# make install should strip - not here
+strip $RPM_BUILD_ROOT%{prefix}/bin/* || true
 strip $RPM_BUILD_ROOT%{prefix}/sbin/*
 
-rm -rf doc/Makefile*
+gzip $RPM_BUILD_ROOT%{prefix}/man/*/*
+
+rm -f doc/Makefile*
 
 
 %clean
@@ -68,12 +60,14 @@
         rm -f /etc/lsh_host_key*
         /usr/bin/lsh_keygen -l 8 | /usr/bin/lsh_writekey -o /etc/lsh_host_key
 fi
+/sbin/install-info --info-dir=%{prefix}/info %{prefix}/info/lsh.info
 
 
 %preun
 if [ "$1" -eq 0 ]
 then
         chkconfig --del lshd || exit 0
+       /sbin/install-info --delete --info-dir=%{prefix}/info %{prefix}/info/lsh.info
 fi
 
 
@@ -86,10 +80,17 @@
 %config/etc/rc.d/init.d/lshd
 %{prefix}/bin/*
 %{prefix}/man/*/*
+%{prefix}/info/lsh*
 %{prefix}/sbin/*
 
 
 %changelog
+
+* Wed Jun 28 2000 Thayne Harbaugh <[EMAIL PROTECTED]>
+- ripped out man install - make install now does it
+- there is now an lsh.info that is handled
+- various simplifications
+- spelling error
 
 * Thu Jan 06 2000 Thayne Harbaugh <[EMAIL PROTECTED]>
 - lshd.rhlinux.init is now in contrib dir - removed Source1

Reply via email to