Index: ossp-pkg/shtool/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v
rcsdiff -q -kk '-r1.155' '-r1.156' -u '/v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v' 2>/dev/null
--- ChangeLog	2001/06/14 14:24:16	1.155
+++ ChangeLog	2001/06/14 16:49:44	1.156
@@ -14,6 +14,10 @@
    *) Removed numerious trailing whitespaces from source files.
       [Ralf S. Engelschall]
 
+   *) Updated shtool.spec file: DESTDIR support, indentation 
+      cleanups, etc.
+      [Ralf S. Engelschall]
+
    *) Fixed typos in README.
       [Ralf S. Engelschall]
 
Index: ossp-pkg/shtool/shtool.spec
RCS File: /v/ossp/cvs/ossp-pkg/shtool/shtool.spec,v
rcsdiff -q -kk '-r1.10' '-r1.11' -u '/v/ossp/cvs/ossp-pkg/shtool/shtool.spec,v' 2>/dev/null
--- shtool.spec	2001/04/20 19:00:17	1.10
+++ shtool.spec	2001/06/14 16:49:44	1.11
@@ -1,6 +1,6 @@
 ##
 ##  shtool.spec -- RPM specification for shtool package
-##  Copyright (c)2000-2001 Ralf S. Engelschall <rse@engelschall.com>
+##  Copyright (c) 2000-2001 Ralf S. Engelschall <rse@engelschall.com>
 ##
 ##  This file is part of shtool and free software; you can redistribute
 ##  it and/or modify it under the terms of the GNU General Public
@@ -19,10 +19,10 @@
 ##
 
 #   This is a specification file for the RedHat Package Manager (RPM).
-#   It is part of the Shtool source tree and this way directly included
-#   in Shtool distribution tarballs. This way one can use a simple `rpm
-#   -tb shtool-1.X.Y.tar.gz' command to build binary RPM packages from a
-#   original Shtool distribution tarball.
+#   It is part of the shtool source tree and this way directly included
+#   in shtool distribution tarballs. This way one can use a simple "rpm
+#   -tb shtool-1.X.Y.tar.gz" command to build binary RPM packages from a
+#   original shtool distribution tarball.
 
 %ifdef %{_prefix}
 %define prefix %{_prefix}
@@ -31,7 +31,7 @@
 %endif
 
 %define ver 1.5.4
-%define rel 1
+%define rel 0
 
 Name:       shtool
 Version:    %{ver}
@@ -39,43 +39,44 @@
 Group:      Development/Tools
 Copyright:  GPL
 URL:        http://www.gnu.org/software/shtool/
-Summary:    GNU shtool - The GNU Portable Shell Tool
+Summary:    GNU shtool, The GNU Portable Shell Tool
 
 Source:     ftp://ftp.gnu.org/gnu/shtool/shtool-%{ver}.tar.gz
 BuildArch:  noarch
 BuildRoot:  /tmp/shtool-%{ver}-root
 
 %description
-GNU shtool is a compilation of small but very stable and portable shell
-scripts into a single shell tool. All ingredients were in successful use
-over many years in various free software projects. The compiled shtool
-program is intended to be used inside the source tree of other free
-software packages. There it can overtake various (usually non-portable)
-tasks related to the building and installation of such a package. It
-especially can replace the old mkdir.sh, install.sh and related scripts.
+    GNU shtool is a compilation of small but very stable and portable
+    shell scripts into a single shell tool. All ingredients were in
+    successful use over many years in various free software projects.
+    The compiled shtool program is intended to be used inside the
+    source tree of other free software packages. There it can overtake
+    various (usually non-portable) tasks related to the building and
+    installation of such a package. It especially can replace the old
+    mkdir.sh, install.sh and related scripts.
 
 %prep
 %setup
 
 %build
-./configure --prefix=%{prefix}
-make
-make test
+    ./configure --prefix=%{prefix}
+    make
+    make test
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install prefix=$RPM_BUILD_ROOT%{prefix}
+    rm -rf $RPM_BUILD_ROOT
+    make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+    rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL README THANKS
-%{prefix}/bin/shtool
-%{prefix}/bin/shtoolize
-%{prefix}/man/man1/shtool.1
-%{prefix}/man/man1/shtoolize.1
-%{prefix}/share/aclocal/shtool.m4
-%{prefix}/share/shtool/
+    %defattr(-,root,root)
+    %doc AUTHORS COPYING ChangeLog INSTALL README THANKS
+    %{prefix}/bin/shtool
+    %{prefix}/bin/shtoolize
+    %{prefix}/man/man1/shtool.1
+    %{prefix}/man/man1/shtoolize.1
+    %{prefix}/share/aclocal/shtool.m4
+    %{prefix}/share/shtool/