From 9f299ac364d286b1f1c00c9c6e0b044010db8649 Mon Sep 17 00:00:00 2001
From: Christophe GRENIER <grenier@fedoraproject.org>
Date: Jul 31 2008 12:15:39 +0000
Subject: Update TestDisk & PhotoRec to version 6.10


---

diff --git a/.cvsignore b/.cvsignore
index b158818..97ba563 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-testdisk-6.9.tar.bz2
-testdisk69_libewf.patch
+testdisk-6.10.tar.bz2
+testdisk-doc-6.10.tar.bz2
diff --git a/sources b/sources
index 067685f..1507cab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c16de07b1e0cf0cd0ccdd58fe2ff89f8  testdisk-6.9.tar.bz2
-3f28dbac662d32bfb8ece9da3b1f106b  testdisk69_libewf.patch
+d3bde0b546d40e029dda4e9861db40ef  testdisk-6.10.tar.bz2
+9f850f4657777add0a063a2bccc219fd  testdisk-doc-6.10.tar.bz2
diff --git a/testdisk.spec b/testdisk.spec
index a9e950a..fc2def4 100644
--- a/testdisk.spec
+++ b/testdisk.spec
@@ -3,12 +3,12 @@ Summary(pl.UTF8):	Narzędzie sprawdzające i odzyskujące partycje
 Summary(fr.UTF8):	Outil pour vérifier et restorer des partitions
 Summary(ru_RU.UTF8): Программа для проверки и восстановления разделов диска
 Name:		testdisk
-Version:	6.9
-Release:	2%{?dist}
+Version:	6.10
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
-Patch0:		testdisk69_libewf.patch
+Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:  e2fsprogs-devel
@@ -17,6 +17,7 @@ BuildRequires:	libjpeg-devel
 BuildRequires:  ntfsprogs-devel
 %endif
 BuildRequires:  libewf-devel
+BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -40,9 +41,47 @@ Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 
+%package doc
+Summary:	TestDisk & PhotoRec documentation
+Group:		Documentation
+Requires:	testdisk = %{version}-%{release}
+
+%description doc
+Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
+NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
+LVM, LVM2, NSS, ReiserFS, UFS, XFS
+
+This package contains testdisk & photorec documentation.
+
+%description doc -l pl.UTF8
+Narzędzie sprawdzające i odzyskujące partycje. Pracuje z partycjami:
+FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
+Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+
+This package contains testdisk & photorec documentation.
+
+%description doc -l fr.UTF8
+Outil pour vérifier et restorer des partitions. Fonctionne avec
+FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
+Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+
+Ce paquet contient la documentation de testdisk & photorec.
+
+%description doc -l ru_RU.UTF8
+Программа для проверки и восстановления разделов диска.
+Поддерживает следующие типы разделов:
+FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
+Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+
+This package contains testdisk & photorec documentation.
+
+%files doc
+%defattr(644,root,root,755)
+%doc doc
+
 %prep
 %setup -q
-%patch0 -p1 -b .list
+%setup -q -a 1
 
 %build
 %configure
@@ -56,12 +95,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS doc
+%doc AUTHORS COPYING ChangeLog NEWS README THANKS
 %attr(755,root,root) %{_sbindir}/testdisk
 %attr(755,root,root) %{_sbindir}/photorec
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
+
 %changelog
+* Thu Jul 31 2008 Christophe Grenier <grenier@cgsecurity.org> 6.10-1
+- Update to latest version
+
 * Wed Mar 19 2008 Christophe Grenier <grenier@cgsecurity.org> 6.9-2
 - Fix for new API in libewf > 20070512