Modifications from the RedHat RPM.

diff --git a/CHANGES b/CHANGES
index 0ede091214a1e6a8ba8367240ba7475b63fe4c05..328ead11a93926aef16c2c1aaeb3f3bb7642b376 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.136 2001/09/06 09:00:31 stelian Exp $
+$Id: CHANGES,v 1.137 2001/09/12 09:02:51 stelian Exp $
 
 Changes between versions 0.4b23 and 0.4b24 (released ?????????????)
 ===================================================================
@@ -36,7 +36,10 @@ Changes between versions 0.4b23 and 0.4b24 (released ?????????????)
        a bit those who use dump on mounted filesystems. Thanks to
        John Yu <jky@it.bu.edu> and to Theodore T'so <tytso@mit.edu>
        for this suggestion.
-       
+
+9.     Updated the RPM spec file following the RedHat changes 
+       (dynamically linked binaries now in /usr/sbin etc).
+
 Changes between versions 0.4b22 and 0.4b23 (released July 20, 2001)
 ===================================================================
 

diff --git a/dump.spec b/dump.spec
index bc4893ff88bf56f7e2e69f430b195ca17b9671a0..e7d4a25cc75cdabf942c7badedcf9350e571dd08 100644 (file)
--- a/dump.spec
+++ b/dump.spec
@@ -9,18 +9,18 @@ Release: 1
 License: BSD
 Group: Applications/Archiving
 Source: http://download.sourceforge.net/dump/dump-%{version}.tar.gz
-Requires: rmt
 BuildPrereq: e2fsprogs-devel, libtermcap-devel, readline-devel
+Requires: rmt
 BuildRoot: %{_tmppath}/%{name}-root
 
 %description
-The dump package contains both dump and restore.  Dump examines files in
-a filesystem, determines which ones need to be backed up, and copies
-those files to a specified disk, tape or other storage medium.  The
-restore command performs the inverse function of dump; it can restore a
-full backup of a filesystem.  Subsequent incremental backups can then be
-layered on top of the full backup.  Single files and directory subtrees
-may also be restored from full or partial backups.
+The dump package contains both dump and restore. Dump examines files
+in a filesystem, determines which ones need to be backed up, and
+copies those files to a specified disk, tape, or other storage medium.
+The restore command performs the inverse function of dump; it can
+restore a full backup of a filesystem. Subsequent incremental backups
+can then be layered on top of the full backup. Single files and
+directory subtrees may also be restored from full or partial backups.
 
 Install dump if you need a system for both backing up filesystems and
 restoring filesystems after backups.
@@ -32,25 +32,25 @@ Group: Applications/Archiving
 %description -n rmt
 The rmt utility provides remote access to tape devices for programs
 like dump (a filesystem backup program), restore (a program for
-restoring files from a backup) and tar (an archiving program).
+restoring files from a backup), and tar (an archiving program).
 
 %package -n dump-static
 Summary: Statically linked versions of dump and restore.
 Group: Applications/Archiving
 
 %description -n dump-static
-The dump package contains both dump and restore.  Dump examines files in
+The dump package contains both dump and restore. Dump examines files in
 a filesystem, determines which ones need to be backed up, and copies
-those files to a specified disk, tape or other storage medium.  The
+those files to a specified disk, tape, or other storage medium. The
 restore command performs the inverse function of dump; it can restore a
-full backup of a filesystem.  Subsequent incremental backups can then be
-layered on top of the full backup.  Single files and directory subtrees
+full backup of a filesystem. Subsequent incremental backups can then be
+layered on top of the full backup. Single files and directory subtrees
 may also be restored from full or partial backups.
 
 Install dump if you need a system for both backing up filesystems and
 restoring filesystems after backups.
 
-This packages contains statically linked versions of dump and restore.
+This package contains statically linked versions of dump and restore.
 
 %prep
 %setup -q
@@ -80,12 +80,12 @@ mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_mandir}/man8
 
 %makeinstall SBINDIR=%{buildroot}%{_sbindir} MANDIR=%{buildroot}%{_mandir}/man8 BINOWNER=$(id -un) BINGRP=$(id -gn) MANOWNER=$(id -un) MANGRP=$(id -gn)
+mkdir -p $RPM_BUILD_ROOT/usr/sbin
 
 cp dump/dump.static %{buildroot}%{_sbindir}
 cp restore/restore.static %{buildroot}%{_sbindir}
 
-{ cd %{buildroot}
-  strip .%{_sbindir}/* || :
+pushd $RPM_BUILD_ROOT
   ln -sf dump .%{_sbindir}/rdump
   ln -sf dump.static .%{_sbindir}/rdump.static
   ln -sf restore .%{_sbindir}/rrestore
@@ -94,7 +94,13 @@ cp restore/restore.static %{buildroot}%{_sbindir}
   mkdir -p .%{_sysconfdir}
   > .%{_sysconfdir}/dumpdates
   ln -sf ..%{_sbindir}/rmt .%{_sysconfdir}/rmt
-}
+  # quick workaround :)
+  mv sbin/* usr/sbin/
+  mv usr/sbin/*static sbin/
+  mv usr/sbin/rmt sbin/
+  # somehow, rpm didn't strip these...
+  strip usr/sbin/* sbin/* || :  
+popd
 
 %clean
 rm -rf %{buildroot}
@@ -104,10 +110,10 @@ rm -rf %{buildroot}
 %doc CHANGES COPYRIGHT KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO
 %doc dump.lsm
 %attr(0664,root,disk)  %config(noreplace) %{_sysconfdir}/dumpdates
-%attr(0755,root,root)  %{_sbindir}/dump
-%{_sbindir}/rdump
-%attr(0755,root,root)  %{_sbindir}/restore
-%{_sbindir}/rrestore
+%attr(0755,root,root)  /usr/sbin/dump
+/usr/sbin/rdump
+%attr(0755,root,root)  /usr/sbin/restore
+/usr/sbin/rrestore
 %{_mandir}/man8/dump.*
 %{_mandir}/man8/rdump.*
 %{_mandir}/man8/restore.*

diff --git a/dump/optr.c b/dump/optr.c
index cd98e6664d36ba963f6fbd41c6001fbcd88b5b71..56e1f345bfe64aadfe15f997d21f92d1579101ca 100644 (file)
--- a/dump/optr.c
+++ b/dump/optr.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: optr.c,v 1.26 2001/08/16 09:37:59 stelian Exp $";
+       "$Id: optr.c,v 1.27 2001/09/12 09:02:51 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -70,7 +70,6 @@ static const char rcsid[] =
 #include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #include <signal.h>
-#include <time.h>
 #endif
 
 #include "dump.h"

diff --git a/dump/tape.c b/dump/tape.c
index f61fc879ee395b2228fe61d4e510d0348ea96210..644ed8a2ba92ab6a555598b1c234086f6f34cf4c 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.55 2001/09/06 09:00:32 stelian Exp $";
+       "$Id: tape.c,v 1.56 2001/09/12 09:02:51 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -68,7 +68,6 @@ int    write(), read();
 #endif
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/mtio.h>
 #ifdef __linux__