[testdisk/f15] 6.12-1
Christophe GRENIER
grenier at fedoraproject.org
Thu May 12 19:43:36 UTC 2011
commit fa6426846db43bff0223b97b37d86e377cf08f29
Author: Christophe Grenier <grenier at cgsecurity.org>
Date: Thu May 12 21:43:15 2011 +0200
6.12-1
.gitignore | 1 +
sources | 5 +--
testdisk.spec | 89 +++++++++++++++-----------------------------------------
3 files changed, 26 insertions(+), 69 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 718f182..a62c020 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,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
+/testdisk-6.12.tar.bz2
diff --git a/sources b/sources
index 3dbc1b4..25f6d44 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-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
+6ef653301f309156f3a802233a3139c1 testdisk-6.12.tar.bz2
diff --git a/testdisk.spec b/testdisk.spec
index cf162c6..c6aa0da 100644
--- a/testdisk.spec
+++ b/testdisk.spec
@@ -3,14 +3,11 @@ Summary(pl.UTF8): Narzędzie sprawdzające i odzyskujące partycje
Summary(fr.UTF8): Outil pour vérifier et restaurer des partitions
Summary(ru_RU.UTF8): Программа для проверки и восстановления разделов диска
Name: testdisk
-Version: 6.11
-Release: 9%{?dist}
+Version: 6.12
+Release: 1%{?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
@@ -23,75 +20,39 @@ BuildRequires: zlib-devel
BuildRequires: openssl-devel
BuildRequires: libuuid-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Obsoletes: testdisk-doc
%description
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
+NTFS, ext2, ext3, ext4, btrfs, 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.
+200 file formats including JPG, MSOffice, OpenOffice documents.
%description -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
+FAT12, FAT16, FAT32, NTFS, ext2, ext3, ext4, btrfs, 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
+200 file formats including JPG, MSOffice, OpenOffice documents.
%description -l fr.UTF8
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,
+FAT12, FAT16, FAT32, NTFS, ext2, ext3, ext4, btrfs, BeFS, CramFS, HFS, JFS,
+Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS
+PhotoRec gère plus de 200 formats de fichiers dont les JPEG,
les documents MSOffice ou OpenOffice.
%description -l ru_RU.UTF8
Программа для проверки и восстановления разделов диска.
Поддерживает следующие типы разделов:
-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
+FAT12, FAT16, FAT32, NTFS, ext2, ext3, ext4, btrfs, 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.
-
-%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 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.
-
-%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.
+200 file formats including JPG, MSOffice, OpenOffice documents.
%prep
%setup -q
-%setup -q -a 1
-%patch0 -p1
-%patch1 -p1
%build
%configure
@@ -99,9 +60,6 @@ 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
@@ -109,16 +67,17 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
-%attr(755,root,root) %{_bindir}/testdisk
+%attr(755,root,root) %{_bindir}/fidentify
%attr(755,root,root) %{_bindir}/photorec
-%{_mandir}/man1/testdisk.1*
-%{_mandir}/man1/photorec.1*
-
-%files doc
-%defattr(644,root,root,755)
-%doc doc
+%attr(755,root,root) %{_bindir}/testdisk
+%{_mandir}/man8/fidentify.8*
+%{_mandir}/man8/photorec.8*
+%{_mandir}/man8/testdisk.8*
%changelog
+* Thu May 12 2011 Christophe Grenier <grenier at cgsecurity.org> - 6.12.1
+- Update to latest version
+
* Sat Apr 16 2011 Christophe Grenier <grenier at cgsecurity.org> - 6.11-9
- Rebuild for ntfs-3g
More information about the scm-commits
mailing list