diff --git a/dump.spec b/dump.spec index 70b5c7f..48d2981 100644 --- a/dump.spec +++ b/dump.spec @@ -5,7 +5,7 @@ Summary: Programs for backing up and restoring filesystems. Name: dump Version: 0.4b22 -Release: 4 +Release: 5 License: BSD Group: Applications/Archiving Source: http://download.sourceforge.net/dump/dump-%{version}.tar.gz @@ -16,13 +16,13 @@ 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. @@ -34,25 +34,7 @@ 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). - -%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 -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. - -This packages contains statically linked versions of dump and restore. +restoring files from a backup), and tar (an archiving program). %prep %setup -q @@ -60,7 +42,7 @@ This packages contains statically linked versions of dump and restore. %patch1 -p1 -b .time %build -%configure %{myoptions} --enable-static +%configure %{myoptions} --enable-static --enable-rmt %ifarch alpha RPM_OPT_FLAGS="" @@ -68,15 +50,6 @@ RPM_OPT_FLAGS="" make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wno-char-subscripts" -mv dump/dump dump/dump.static -mv restore/restore restore/restore.static - -make distclean - -%configure %{myoptions} --enable-rmt - -make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wno-char-subscripts" %install rm -rf %{buildroot} @@ -85,20 +58,19 @@ mkdir -p %{buildroot}%{_mandir}/man8 %makeinstall SBINDIR=%{buildroot}%{_sbindir} BINDIR=%{buildroot}%{_sbindir} MANDIR=%{buildroot}%{_mandir}/man8 BINOWNER=$(id -un) BINGRP=$(id -gn) MANOWNER=$(id -un) MANGRP=$(id -gn) -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 dump .%{_sbindir}/rdump.static + ln -sf dump .%{_sbindir}/dump.static ln -sf restore .%{_sbindir}/rrestore - ln -sf restore.static .%{_sbindir}/rrestore.static + ln -sf restore .%{_sbindir}/rrestore.static + ln -sf restore .%{_sbindir}/restore.static chmod ug-s .%{_sbindir}/rmt mkdir -p .%{_sysconfdir} > .%{_sysconfdir}/dumpdates ln -sf ..%{_sbindir}/rmt .%{_sysconfdir}/rmt -} + strip $RPM_BUILD_ROOT/sbin/* +popd %clean rm -rf %{buildroot} @@ -108,10 +80,11 @@ 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) /sbin/dump +/sbin/rdump +%attr(0755,root,root) /sbin/restore +/sbin/rrestore +/sbin/*.static %{_mandir}/man8/dump.* %{_mandir}/man8/rdump.* %{_mandir}/man8/restore.* @@ -123,14 +96,15 @@ rm -rf %{buildroot} %{_sysconfdir}/rmt %{_mandir}/man8/rmt.* -%files -n dump-static -%defattr(-,root,root) -%attr(0755,root,root) %{_sbindir}/dump.static -%{_sbindir}/rdump.static -%attr(0755,root,root) %{_sbindir}/restore.static -%{_sbindir}/rrestore.static - %changelog +* Sat Sep 8 2001 Trond Eivind Glomsr�d 0.4b22-5 +- Kill the static subpackage - the standard binaries are now static + This removes /usb/sbin/*. The static versions are now in /sbin + (#53433) + +* Tue Aug 14 2001 Trond Eivind Glomsr�d 0.4b22-4 +- Move non-static binaries to /usr/sbin (#49520) + * Fri Jun 29 2001 Mike A. Harris 0.4b22-4 - Added BuildPrereq: readline-devel (#44734 - which was reopened and changed)