[testdisk/el5/master] rebuild with new ntfs-3g Move binaries to /usr/bin (#628050)

Mon May 9 07:36:05 UTC 2011

commit c9959a35cbfd47872280a12d856fe4d265206c98
Author: Christophe Grenier <grenier at cgsecurity.org>
Date:   Mon May 9 09:35:17 2011 +0200

    rebuild with new ntfs-3g
    Move binaries to /usr/bin (#628050)

 .gitignore    |    1 +
 sources       |    1 +
 testdisk.spec |   41 ++++++++++++++++++++++++++++-------------
 3 files changed, 30 insertions(+), 13 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index be389f6..718f182 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 testdisk-6.11.tar.bz2
 testdisk-doc-6.11.tar.bz2
 photorec_611_exif_bound_checking_v2.patch
+/testdisk_611_ntfs-3g.patch.bz2
diff --git a/sources b/sources
index 8b73f12..3dbc1b4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 11f8fe95dcd190b69b782efa65b29ba1  testdisk-6.11.tar.bz2
 8ed6b23ae64bf1cf9a15371ea7481fa5  testdisk-doc-6.11.tar.bz2
 525350908048a5c90c932464375b08a3  photorec_611_exif_bound_checking_v2.patch
+447781ad32a77dcdc6b8df0e23b9cc7f  testdisk_611_ntfs-3g.patch.bz2
diff --git a/testdisk.spec b/testdisk.spec
index b27acc3..33e152b 100644
--- a/testdisk.spec
+++ b/testdisk.spec
@@ -1,20 +1,23 @@
 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:	3%{?dist}
+Release:	4%{?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
-BuildRequires:	ntfsprogs-devel
+%ifnarch ppc ppc64
+BuildRequires:	ntfs-3g-devel
+%endif
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,7 +26,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:
@@ -34,8 +37,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
 Программа для проверки и восстановления разделов диска.
@@ -52,22 +55,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
 Программа для проверки и восстановления разделов диска.
@@ -75,12 +82,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 --without-ewf
@@ -88,6 +96,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
@@ -95,8 +106,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*
 
@@ -105,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc
 
 %changelog
+* Mon May  9 2011 Christophe Grenier <grenier at cgsecurity.org> 6.11-4
+- rebuild with new ntfs-3g
+- Move binaries to /usr/bin (#628050)
+
 * Wed May  6 2009 Christophe Grenier <grenier at cgsecurity.org> 6.11-3
 - Use upstream patch v2
 
