grenier pushed to testdisk (el6). "update to 7.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Apr 19 07:58:00 UTC 2015
>From d5ded6e8013b51118d0a24e1d5dd98fdfd1e2579 Mon Sep 17 00:00:00 2001
From: Christophe Grenier <grenier at cgsecurity.org>
Date: Sun, 19 Apr 2015 09:57:44 +0200
Subject: update to 7.0
diff --git a/.gitignore b/.gitignore
index 774c9db..8e57be0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ photorec_611_exif_bound_checking_v2.patch
/testdisk-6.14.tar.bz2
/testdisk_614_docdir.patch
/testdisk_614_fix_ext2_check.patch
+/testdisk-7.0.tar.bz2
diff --git a/sources b/sources
index a10ff5b..f70dba8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-b1f0edabc9035e9ec9c8e0a95059ff3f testdisk-6.14.tar.bz2
-5124496be718ceae87f21e70c26d1a1d testdisk_614_fix_ext2_check.patch
+f0cfe4ca9dd35f2878b2704251665e9f testdisk-7.0.tar.bz2
diff --git a/testdisk.spec b/testdisk.spec
index 34645c3..c049d5a 100644
--- a/testdisk.spec
+++ b/testdisk.spec
@@ -3,24 +3,25 @@ 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.14
-Release: 3%{?dist}
+Version: 7.0
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
-Patch1: http://www.cgsecurity.org/testdisk_614_fix_ext2_check.patch
+Patch1: testdisk-7.0-qphotorec.patch
URL: http://www.cgsecurity.org/wiki/TestDisk
-BuildRequires: ncurses-devel >= 5.2
+BuildRequires: desktop-file-utils
BuildRequires: e2fsprogs-devel
+BuildRequires: libewf-devel
BuildRequires: libjpeg-devel
-%ifnarch ppc ppc64
+BuildRequires: libuuid-devel
+BuildRequires: ncurses-devel >= 5.2
BuildRequires: ntfs-3g-devel
-%endif
-BuildRequires: libewf-devel
+BuildRequires: qt-devel
BuildRequires: zlib-devel
-BuildRequires: libuuid-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: testdisk-doc < 6.12
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%description
Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
@@ -52,12 +53,20 @@ Linux Raid, Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS.
PhotoRec is a signature based file recovery utility. It handles more than
440 file formats including JPG, MSOffice, OpenOffice documents.
+%package -n qphotorec
+Summary: Signature based file carver. Recover lost files
+
+%description -n qphotorec
+QPhotoRec is a Qt version of PhotoRec. It is a signature based file recovery
+utility. It handles more than 440 file formats including JPG, MSOffice,
+OpenOffice documents.
+
%prep
%setup -q
%patch1 -p1
%build
-%configure
+%configure --docdir=%{_pkgdocdir}
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -66,17 +75,47 @@ make DESTDIR="$RPM_BUILD_ROOT" install
%clean
rm -rf $RPM_BUILD_ROOT
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/qphotorec.desktop
+
+%post -n qphotorec
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun -n qphotorec
+if [ $1 -eq 0 ] ; then
+ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans -n qphotorec
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS documentation.html
+%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%attr(755,root,root) %{_bindir}/fidentify
%attr(755,root,root) %{_bindir}/photorec
%attr(755,root,root) %{_bindir}/testdisk
%{_mandir}/man8/fidentify.8*
%{_mandir}/man8/photorec.8*
%{_mandir}/man8/testdisk.8*
+%{_mandir}/zh_CN/man8/fidentify.8*
+%{_mandir}/zh_CN/man8/photorec.8*
+%{_mandir}/zh_CN/man8/testdisk.8*
+
+%files -n qphotorec
+%attr(755,root,root) %{_bindir}/qphotorec
+%{_mandir}/man8/qphotorec.8*
+%{_mandir}/zh_CN/man8/qphotorec.8*
+%{_datadir}/applications/qphotorec.desktop
+%{_datadir}/icons/hicolor/48x48/apps/qphotorec.png
+%{_datadir}/icons/hicolor/scalable/apps/qphotorec.svg
%changelog
+* Sat Apr 18 2015 Christophe Grenier <grenier at cgsecurity.org> - 7.0-1
+- Update to latest version
+- This version includes some security fixes.
+
* Wed Apr 8 2015 Tom Callaway <spot at fedoraproject.org> - 6.14-3
- rebuild for ntfs-3g-2015.3.14
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/testdisk.git/commit/?h=el6&id=d5ded6e8013b51118d0a24e1d5dd98fdfd1e2579
More information about the scm-commits
mailing list