diff --git a/dump-0.4b43.tar.bz2 b/dump-0.4b43.tar.bz2 deleted file mode 100644 index 0f22cf2..0000000 --- a/dump-0.4b43.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e0567723c0a6ba2bc9a8bb93d94bfab2504947e49fd9d40d4a9e486c4c092fe -size 247463 diff --git a/dump-0.4b44.tar.gz b/dump-0.4b44.tar.gz new file mode 100644 index 0000000..c9286a5 --- /dev/null +++ b/dump-0.4b44.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78cb75632ac5e99dca38af3a2574303eee3c5a7af464011d279421d8b0e64f96 +size 296691 diff --git a/dump-buildfix.patch b/dump-buildfix.patch new file mode 100644 index 0000000..5134fa4 --- /dev/null +++ b/dump-buildfix.patch @@ -0,0 +1,27 @@ +diff -up dump-0.4b44/configure.in.buildfix dump-0.4b44/configure.in +--- dump-0.4b44/configure.in.buildfix 2011-06-14 14:37:49.659652746 +0200 ++++ dump-0.4b44/configure.in 2011-06-14 14:40:47.361349814 +0200 +@@ -415,6 +415,11 @@ if test "$ext2fs_h" = no -o "x$EXT2FS_LI + AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs) + fi + ++PKG_CHECK_MODULES(COM_ERR, [com_err]) ++if test -n "$STATIC" ; then ++ COM_ERR_LIBS=`$PKG_CONFIG --libs --static com_err` ++fi ++ + dnl + dnl Check for ext2fs_read_inode_full + dnl +diff -up dump-0.4b44/MCONFIG.in.buildfix dump-0.4b44/MCONFIG.in +--- dump-0.4b44/MCONFIG.in.buildfix 2011-06-14 14:41:00.869323616 +0200 ++++ dump-0.4b44/MCONFIG.in 2011-06-14 14:41:12.947300187 +0200 +@@ -40,7 +40,7 @@ GINC+= @EXT2FS_CFLAGS@ + # indicate where the ext2fs library can be found (this is not needed if you + # have run `make install-libs' in the e2fsprogs source directory). + #GLIBDIR= -L/usr/src/e2fsprogs-0.5c/lib +-GLIBS= $(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@ ++GLIBS= $(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@ @COM_ERR_LIBS@ + + # + # Definitions (don't change them unless you know what you are doing) diff --git a/dump.changes b/dump.changes index 4799785..5ac28b0 100644 --- a/dump.changes +++ b/dump.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Feb 24 18:37:52 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Update urls +- Add patch dump-buildfix.patch +- Update to 0.4b44 + * Recognize ext4 partitions in dump -w commands (Sourceforge bug + #3125587, RedHat bug #658890). + * Fix an issue with multi volume backups, which breaks restoring + of files which are splitted on two or more volumes and are + starting on 2nd tape or later (RedHat bug #507948). + * Fix a bug in dump when dumping files with holes. This bug was + introduced in 0.4b42 while adding ext4 support. (Sourceforge + bug #3133762). + * Fix a bug in restore -P where useless index files for + compressed dumps were created (Debian bug #583093). + * Fix SYS_clone invocation on s390 architectures (Sourceforge + bug #3303235). + * Fix static builds. + * Add quick regression script from Bear Giles. + * Fix a bug introduced in 0.4b43 causing restore to crash when + asking for a new volume when doing multi-volume restores. + ------------------------------------------------------------------- Sun Nov 16 21:32:00 UTC 2014 - Led diff --git a/dump.spec b/dump.spec index f6307b5..dfa3ae3 100644 --- a/dump.spec +++ b/dump.spec @@ -1,7 +1,7 @@ # # spec file for package dump # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,71 +17,71 @@ Name: dump -BuildRequires: automake -BuildRequires: e2fsprogs-devel -BuildRequires: libselinux-devel -BuildRequires: readline-devel -BuildRequires: zlib-devel -Version: 0.4b43 +Version: 0.4b44 Release: 0 -Source: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-pathnames.patch -Patch1: %{name}-%{version}-destdir.patch -Patch2: %{name}-%{version}-configure.patch -Patch3: %{name}-%{version}-include.patch -Patch4: %{name}-0.4b43-fix-bashisms.patch -Url: http://dump.sourceforge.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Backup Program License: BSD-3-Clause Group: Productivity/Archiving/Backup +Url: http://dump.sourceforge.net +Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.gz +Patch0: %{name}-0.4b43-pathnames.patch +Patch1: %{name}-0.4b43-destdir.patch +Patch2: %{name}-0.4b43-configure.patch +Patch3: %{name}-0.4b43-include.patch +Patch4: %{name}-0.4b43-fix-bashisms.patch +Patch5: %{name}-buildfix.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: e2fsprogs-devel +BuildRequires: libselinux-devel +BuildRequires: libtool +BuildRequires: readline-devel +BuildRequires: zlib-devel Requires: rmt +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The dump package contains both dump and restore. Dump examines files in a file system, determines which ones need to be backed up, and -copies those files to a specified disk, tape, or other storage medium. +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 file system. %prep -%setup -#mkdir ext2fs -#sed -e "s|ino_t|__ino_t|g" /usr/include/ext2fs/ext2fs.h >ext2fs/ext2fs.h +%setup -q %patch0 %patch1 %patch2 %patch3 %patch4 -p1 +%patch5 -p1 %build -%define prefix /usr -%define sysconfdir /etc -aclocal -autoconf -%configure --sbindir=/sbin \ - --enable-rmt \ - --with-ldopts= \ - --with-ccopts="-I$PWD -Wall" \ - --with-binowner=root \ - --with-bingrp=root \ - --with-binmode=0755 \ - --with-manowner=root \ - --with-mangrp=root \ - --with-manmode=0644 \ - --enable-readline \ - --enable-largefile +autoreconf -fi +%configure \ + --sbindir=/sbin \ + --enable-rmt \ + --with-ldopts= \ + --with-ccopts="-I$PWD -Wall" \ + --with-binowner=root \ + --with-bingrp=root \ + --with-binmode=0755 \ + --with-manowner=root \ + --with-mangrp=root \ + --with-manmode=0644 \ + --enable-readline \ + --enable-largefile make %{?_smp_mflags} %install -install -d $RPM_BUILD_ROOT/etc \ - $RPM_BUILD_ROOT/sbin \ - $RPM_BUILD_ROOT/%{_mandir}/man8 -make DESTDIR=$RPM_BUILD_ROOT/ install +install -d %{buildroot}/etc \ + %{buildroot}/sbin \ + %{buildroot}/%{_mandir}/man8 +make DESTDIR=%{buildroot}/ install #do not install rmt #ln -sf ../sbin/rmt $RPM_BUILD_ROOT/etc/rmt -rm $RPM_BUILD_ROOT/sbin/rmt -rm $RPM_BUILD_ROOT/%{_mandir}/man8/rmt.* +rm %{buildroot}/sbin/rmt +rm %{buildroot}/%{_mandir}/man8/rmt.* %files %defattr(-, root, root)