diff --git a/.gitignore b/.gitignore index 559cf63..e3e5e45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -dump-0.4b43.tar.gz -/dump-0.4b44.tar.gz -/dump-0.4b45.tar.gz -/dump-0.4b46.tar.gz +/dump-0.4b47.tar.gz diff --git a/dump-apath.patch b/dump-apath.patch new file mode 100644 index 0000000..6ba6fa1 --- /dev/null +++ b/dump-apath.patch @@ -0,0 +1,35 @@ +diff --git a/common/legacy_indexer.c b/common/legacy_indexer.c +index c60830c..e4aa16d 100644 +--- a/common/legacy_indexer.c ++++ b/common/legacy_indexer.c +@@ -41,8 +41,7 @@ extern int tapeno; + extern int Afile; /* archive file descriptor */ + static int AfileActive = 1;/* Afile flag */ + +-//extern char *Apath; +-char *Apath; ++extern char *Apath; + + #ifdef USE_QFA + static int GetTapePos (long long *); +diff --git a/dump/main.c b/dump/main.c +index 98c2333..a42182f 100644 +--- a/dump/main.c ++++ b/dump/main.c +@@ -104,6 +104,7 @@ char *dumpdates; /* name of the file containing dump date information*/ + char lastlevel[NUM_STR_SIZE];/* dump level of previous dump */ + char level[NUM_STR_SIZE];/* dump level of this dump */ + int zipflag; /* which compression method */ ++char *Apath; /* archive file name */ + int Afile = -1; /* archive file descriptor */ + int uflag; /* update flag */ + int mflag; /* dump metadata only if possible */ +@@ -211,7 +212,7 @@ main(int argc, char *argv[]) + #endif + time_t tnow; + char *diskparam; +- char *Apath = NULL; ++ Apath = NULL; + + spcl.c_label[0] = '\0'; + spcl.c_date = time(NULL); diff --git a/dump.spec b/dump.spec index 266c65a..e67826a 100644 --- a/dump.spec +++ b/dump.spec @@ -1,4 +1,4 @@ -%define PREVER b46 +%define PREVER b47 %define DUMP_VERSION 0.4%{PREVER} %define _legacy_common_support 1 @@ -7,9 +7,9 @@ Summary: Programs for backing up and restoring ext2/ext3/ext4 filesystems Name: dump Epoch: 1 Version: 0.4 -Release: 0.45.%{PREVER}%{?dist} +Release: 0.46.%{PREVER}%{?dist} License: BSD -URL: http://dump.sourceforge.net/ +URL: https://sourceforge.net/projects/dump/ Source: http://downloads.sourceforge.net/dump/dump-%{DUMP_VERSION}.tar.gz BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 BuildRequires: zlib-devel, bzip2-devel, automake, make @@ -25,7 +25,7 @@ Provides: dump-static Patch0: dump-buildfix.patch Patch1: dump-remove-lzo.patch -Patch2: dump-glibc_xattr.patch +Patch2: dump-apath.patch %description The dump package contains both dump and restore. Dump examines files @@ -44,13 +44,7 @@ restoring filesystems after backups. %patch0 -p1 -b .buildfix %patch1 -p1 -b .remove-lzo -%patch2 -p1 -b .glibc_xattr - -for i in MAINTAINERS COPYING ChangeLog; do - iconv -f iso-8859-1 -t utf-8 $i -o $i.new - touch -r $i $i.new - mv $i.new $i -done +%patch2 -p1 -b .apath %build autoreconf -fiv @@ -107,11 +101,20 @@ popd %{_mandir}/man8/rrestore.8* %changelog +* Mon Feb 08 2021 Jeff Makey - 1:0.4-0.46.b47 +- New upstream release 0.4b47 +- Update main URL. +- Drop dump-glibc_xattr patch, now applied upstream. +- Drop documentation conversion from ISO-8859-1 to UTF-8, now applied upstream. +- Print correct name of archive table of contents file (#1727392). + * Tue Jan 26 2021 Fedora Release Engineering - 1:0.4-0.45.b46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +- Add make to BuildRequires. * Mon Jul 27 2020 Fedora Release Engineering - 1:0.4-0.44.b46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +- Use standard make_build and make_install macros in spec file. * Wed Feb 12 2020 Václav Doležal - 1:0.4-0.43.b46 - Use library functions for manipulating xattrs (#1795953) diff --git a/sources b/sources index 30733a3..3c264cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c463f797e7e8a1112fabf5cbf8e1855 dump-0.4b46.tar.gz +SHA512 (dump-0.4b47.tar.gz) = e9c567fe2ffad196b9657c551d83f7607758f3704cad6cb407514bbe2bc765c16968997dc3a5bc92b9eb5900fa5bd6e7cebc92c81afff53339fca92891a5259d