From 19ff97fc62588ed19d65ed6275b53656fba67dd7 Mon Sep 17 00:00:00 2001
From: Michal Ambroz <rebus@seznam.cz>
Date: Aug 02 2012 21:34:10 +0000
Subject: Update to version 1.16

Merge remote-tracking branch 'origin/master' into el6

Conflicts:
	.gitignore
	ddrescue.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index 3267db0..7d2acf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 ddrescue-1.8.tar.bz2
+/ddrescue-1.13.tar.gz
+/ddrescue-1.16.tar.gz
+/ddrescue-1.16.tar.gz.sig
diff --git a/ddrescue-1.13-testsuite.patch b/ddrescue-1.13-testsuite.patch
deleted file mode 100644
index 8bb0325..0000000
--- a/ddrescue-1.13-testsuite.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 efc3445..49c8897 100644
--- a/ddrescue.spec
+++ b/ddrescue.spec
@@ -1,13 +1,12 @@
 Name:           ddrescue
-Version:        1.13
+Version:        1.16
 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.gz
-# Patch correct location of binary to run tests
-Patch0:         ddrescue-1.13-testsuite.patch
+Source1:        http://ftp.gnu.org/gnu/ddrescue/ddrescue-%{version}.tar.gz.sig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): info
 Requires(preun): info
@@ -21,7 +20,6 @@ fill in the gaps.
 
 %prep
 %setup -q
-%patch0 -p1 -b .test
 
 %build
 # not a real autotools configure script, flags need to be passed specially
@@ -37,8 +35,7 @@ rm -f %{buildroot}%{_infodir}/dir
 rm -rf %{buildroot}
 
 %check
-cd testsuite
-./check.sh
+make check
 
 %post
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
@@ -52,10 +49,24 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/ddrescue
+%{_bindir}/ddrescuelog
 %{_mandir}/man1/ddrescue.1*
+%{_mandir}/man1/ddrescuelog.1*
 %{_infodir}/%{name}.info*
 
 %changelog
+* Thu Aug 02 2012 Michal Ambroz <rebus AT_ seznam.cz> - 1.16-1
+- Update to 1.16.
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Thu Nov 18 2010 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.13-1
 - Update to 1.13.
 
diff --git a/sources b/sources
index 9627f52..61b608f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-0afc4130882a993772385629d1c0a32e  ddrescue-1.13.tar.gz
+57b67407e882c6418531d48a2f20d16b  ddrescue-1.16.tar.gz
+bf072280587665d82829be15eb6fc9ad  ddrescue-1.16.tar.gz.sig