From ff01d5db49c8982e1f15cf7e6fe279238633c020 Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Nov 18 2010 12:40:17 +0000 Subject: Update to 1.13. --- diff --git a/.gitignore b/.gitignore index 3267db0..bbc25ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ ddrescue-1.8.tar.bz2 +/ddrescue-1.13.tar.gz diff --git a/ddrescue-1.13-testsuite.patch b/ddrescue-1.13-testsuite.patch new file mode 100644 index 0000000..8bb0325 --- /dev/null +++ b/ddrescue-1.13-testsuite.patch @@ -0,0 +1,31 @@ +diff -up ddrescue-1.13/testsuite/check.sh.test ddrescue-1.13/testsuite/check.sh +--- ddrescue-1.13/testsuite/check.sh.test 2010-08-27 19:50:11.000000000 +0300 ++++ ddrescue-1.13/testsuite/check.sh 2010-11-18 14:39:05.076190104 +0200 +@@ -7,7 +7,8 @@ + + LC_ALL=C + export LC_ALL +-objdir=`pwd` ++pwd=`pwd` ++objdir=`dirname $pwd` + testdir=`cd "$1" ; pwd` + DDRESCUE="${objdir}"/ddrescue + framework_failure() { echo "failure in testing framework" ; exit 1 ; } +@@ -20,7 +21,7 @@ fi + if [ -d tmp ] ; then rm -rf tmp ; fi + mkdir tmp + printf "testing ddrescue-%s..." "$2" +-cd "${objdir}"/tmp ++cd "${pwd}"/tmp + + cat "${testdir}"/test.txt > in || framework_failure + fail=0 +@@ -47,7 +48,7 @@ printf . + echo + if [ ${fail} = 0 ] ; then + echo "tests completed successfully." +- cd "${objdir}" && rm -r tmp ++ cd "${pwd}" && rm -r tmp + else + echo "tests failed." + fi diff --git a/ddrescue.spec b/ddrescue.spec index d62d60b..efc3445 100644 --- a/ddrescue.spec +++ b/ddrescue.spec @@ -1,61 +1,64 @@ Name: ddrescue -Version: 1.8 -Release: 6%{?dist} +Version: 1.13 +Release: 1%{?dist} Summary: Data recovery tool trying hard to rescue data in case of read errors Group: Applications/System License: GPLv3+ URL: http://www.gnu.org/software/ddrescue/ddrescue.html -Source0: http://ftp.gnu.org/gnu/ddrescue/ddrescue-%{version}.tar.bz2 +Source0: http://ftp.gnu.org/gnu/ddrescue/ddrescue-%{version}.tar.gz +# Patch correct location of binary to run tests +Patch0: ddrescue-1.13-testsuite.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - +Requires(post): info +Requires(preun): info %description GNU ddrescue is a data recovery tool. It copies data from one file or block -device (hard disc, cdrom, etc) to another, trying hard to rescue data in +device (hard disc, cd-rom, etc) to another, trying hard to rescue data in case of read errors. GNU ddrescue does not truncate the output file if not asked to. So, every time you run it on the same output file, it tries to fill in the gaps. - %prep %setup -q - +%patch0 -p1 -b .test %build # not a real autotools configure script, flags need to be passed specially %configure CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" make %{?_smp_mflags} - %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_infodir}/dir - %clean rm -rf %{buildroot} +%check +cd testsuite +./check.sh %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : - %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/ddrescue +%{_mandir}/man1/ddrescue.1* %{_infodir}/%{name}.info* %changelog +* Thu Nov 18 2010 Jussi Lehtola - 1.13-1 +- Update to 1.13. + * Fri Jul 24 2009 Fedora Release Engineering - 1.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 03187f4..9627f52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51451893ea96a5f9943523743a6a35ae ddrescue-1.8.tar.bz2 +0afc4130882a993772385629d1c0a32e ddrescue-1.13.tar.gz