[testdisk/f13/master] sync to f15, fix build against ntfs-3g ntfsprogs

Mon Apr 25 16:38:26 UTC 2011

commit 0cdcb60c3c4877b0ad2e99f90bca8bff1ae400a8
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Mon Apr 25 12:38:17 2011 -0400

    sync to f15, fix build against ntfs-3g ntfsprogs

 testdisk.spec |   45 +++++++++++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 14 deletions(-)
---

diff --git a/testdisk.spec b/testdisk.spec
index b6bd06c..cf162c6 100644
--- a/testdisk.spec
+++ b/testdisk.spec
@@ -1,22 +1,22 @@
 Summary:	Tool to check and undelete partition, PhotoRec recovers lost files
 Summary(pl.UTF8):	Narzędzie sprawdzające i odzyskujące partycje
-Summary(fr.UTF8):	Outil pour vérifier et restorer des partitions
+Summary(fr.UTF8):	Outil pour vérifier et restaurer des partitions
 Summary(ru_RU.UTF8): Программа для проверки и восстановления разделов диска
 Name:		testdisk
 Version:	6.11
-Release:	6%{?dist}
+Release:	9%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
 Source1:	http://www.cgsecurity.org/testdisk-doc-%{version}.tar.bz2
 Patch0:		http://www.cgsecurity.org/photorec_611_exif_bound_checking_v2.patch
+Patch1:		http://www.cgsecurity.org/testdisk_611_ntfs-3g.patch.bz2
 URL:		http://www.cgsecurity.org/wiki/TestDisk
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	libjpeg-devel
 %ifnarch ppc ppc64
-# See https://bugzilla.redhat.com/show_bug.cgi?id=407151
-BuildRequires:	ntfsprogs-devel
+BuildRequires:	ntfs-3g-devel
 %endif
 BuildRequires:	libewf-devel
 BuildRequires:	zlib-devel
@@ -29,7 +29,7 @@ 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
 PhotoRec is a signature based file recovery utility. It handles more than
-100 file formats including jpg, MSOffice, OpenOffice documents.
+100 file formats including JPG, MSOffice, OpenOffice documents.
 
 %description -l pl.UTF8
 Narzędzie sprawdzające i odzyskujące partycje. Pracuje z partycjami:
@@ -40,8 +40,8 @@ Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
 TestDisk vérifie et récupère les partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
-PhotoRec gère plus d'une centaine de formats de fichiers dont les jpeg, les documents
-MSOffice ou OpenOffice.
+PhotoRec gère plus d'une centaine de formats de fichiers dont les JPEG,
+les documents MSOffice ou OpenOffice.
 
 %description -l ru_RU.UTF8
 Программа для проверки и восстановления разделов диска.
@@ -58,22 +58,26 @@ Requires:	testdisk = %{version}-%{release}
 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
+PhotoRec is a signature based file recovery utility. It handles more than
+100 file formats including JPG, MSOffice, OpenOffice documents.
 
-This package contains testdisk & photorec documentation.
+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.
+This package contains TestDisk & PhotoRec documentation.
 
 %description doc -l fr.UTF8
-Outil pour vérifier et restorer des partitions. Fonctionne avec
+Outil pour vérifier et restaurer des partitions. Fonctionne avec
 FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
 Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec gère plus d'une centaine de formats de fichiers dont les JPEG,
+les documents MSOffice ou OpenOffice.
 
-Ce paquet contient la documentation de testdisk & photorec.
+Ce paquet contient la documentation de TestDisk & PhotoRec.
 
 %description doc -l ru_RU.UTF8
 Программа для проверки и восстановления разделов диска.
@@ -81,12 +85,13 @@ Ce paquet contient la documentation de testdisk & photorec.
 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.
+This package contains TestDisk & PhotoRec documentation.
 
 %prep
 %setup -q
 %setup -q -a 1
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -94,6 +99,9 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR="$RPM_BUILD_ROOT" install
+mkdir -p ${RPM_BUILD_ROOT}/%{_bindir}
+mv ${RPM_BUILD_ROOT}/%{_sbindir}/testdisk ${RPM_BUILD_ROOT}/%{_bindir}/testdisk
+mv ${RPM_BUILD_ROOT}/%{_sbindir}/photorec ${RPM_BUILD_ROOT}/%{_bindir}/photorec
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,8 +109,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS
-%attr(755,root,root) %{_sbindir}/testdisk
-%attr(755,root,root) %{_sbindir}/photorec
+%attr(755,root,root) %{_bindir}/testdisk
+%attr(755,root,root) %{_bindir}/photorec
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 
@@ -111,6 +119,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc
 
 %changelog
+* Sat Apr 16 2011 Christophe Grenier <grenier at cgsecurity.org> - 6.11-9
+- Rebuild for ntfs-3g
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.11-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Aug 27 2010 Christophe Grenier <grenier at cgsecurity.org> 6.11-7
+- Move binaries to /usr/bin (#628050)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 6.11-6
 - rebuilt with new openssl
 
