diff --git a/.cvsignore b/.cvsignore index f748df5..9854428 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dump-0.4b25.tar.bz2 +dump-0.4b27.tar.bz2 diff --git a/dump.spec b/dump.spec index c88d5b4..4e4b7aa 100644 --- a/dump.spec +++ b/dump.spec @@ -1,22 +1,26 @@ +#!/bin/bash %define _sbindir /sbin # XXX --enable-kerberos needs krcmd %define myoptions --enable-largefile --with-binmode=6755 --with-manowner=root --with-mangrp=root --with-manmode=0644 --with-dumpdates="%{_sysconfdir}/dumpdates" --enable-readline -Summary: Programs for backing up and restoring filesystems. +Summary: Programs for backing up and restoring ext2/ext3 filesystems. Name: dump -Version: 0.4b25 -Release: 1.72.1a +Version: 0.4b27 +Release: 2 License: BSD Group: Applications/Archiving URL: http://dump.sourceforge.net Source: dump-%{version}.tar.bz2 -Patch0: dump-0.4b21-rh52.patch -Patch1: dump-0.4b25-atomic.patch +#Patch0: dump-0.4b21-rh52.patch BuildPrereq: libtermcap-devel BuildPrereq: e2fsprogs-devel >= 1.18, readline-devel >= 4.1 BuildPrereq: zlib-devel -Requires: rmt setup +# This Prereq is now required because we only ship static binaries, and +# need to ensure the "disk" group is created before installation (#60461) +Prereq: setup + +Requires: rmt BuildRoot: %{_tmppath}/%{name}-root Obsoletes: dump-static Provides: dump-static @@ -44,8 +48,7 @@ restoring files from a backup), and tar (an archiving program). %prep %setup -q -%patch0 -p1 -b .rh52 -%patch1 -p1 -b .atomic +#%patch0 -p1 -b .rh52 %build %configure %{myoptions} --enable-static --enable-rmt @@ -75,7 +78,7 @@ pushd $RPM_BUILD_ROOT mkdir -p .%{_sysconfdir} > .%{_sysconfdir}/dumpdates ln -sf ..%{_sbindir}/rmt .%{_sysconfdir}/rmt - strip $RPM_BUILD_ROOT/sbin/* + strip $RPM_BUILD_ROOT/sbin/* $RPM_BUILD_ROOT/usr/sbin/* || : popd %clean @@ -103,17 +106,29 @@ rm -rf %{buildroot} %{_mandir}/man8/rmt.* %changelog +* Thu Feb 28 2002 Mike A. Harris 0.4b27-2 +- Added prereq on "setup" to ensure disk group is created prior to this + package being installed +- Somehow the dump package changelog got hosed, and part of the spec file + regressed. I believe it is fixed now. + +* Tue Feb 26 2002 Mike A. Harris 0.4b27-1 +- Updated to dump 0.4b27-1 + +* Fri Feb 22 2002 Mike A. Harris 0.4b25-5 +- Bumped release up a couple notches to rebuild in rawhide + * Thu Feb 21 2002 Mike A. Harris 0.4b25-1.72.0 - Rebuilt 0.4b25 for erratum release. Fixes various bugs that have been reported in bugzilla which are logged below. Also fixes a bug caused by linking statically to a faulty system library. - Added Provides dump-static line - + * Mon Feb 11 2002 Mike A. Harris 0.4b25-3 - Added missing zlib buildprereq - Rebuild in new environment -* Wed Jan 09 2002 Tim Powers 0.4b25-2 +* Wed Jan 09 2002 Tim Powers - automated rebuild * Wed Nov 21 2001 Mike A. Harris 0.4b25-1 @@ -128,7 +143,7 @@ rm -rf %{buildroot} * Sat Sep 8 2001 Trond Eivind Glomsr�d 0.4b22-6 - Kill the static subpackage - the standard binaries are now static - This removes /usr/sbin/*. The static versions are now in /sbin + This removes /usb/sbin/*. The static versions are now in /sbin (#53433) - Obsolete dump-static diff --git a/sources b/sources index 806d535..6e7e097 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -439e4cde89be6ee7423037e98e42a9ce dump-0.4b25.tar.bz2 +270b147adc0ffba84c6188b385fb8518 dump-0.4b27.tar.bz2