diff --git a/.gitignore b/.gitignore index 1e8ab8f..d42005a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,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 56753a2..f70dba8 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -b1f0edabc9035e9ec9c8e0a95059ff3f testdisk-6.14.tar.bz2 -7bef71b92299213e9617d9f300811387 testdisk_614_docdir.patch -5124496be718ceae87f21e70c26d1a1d testdisk_614_fix_ext2_check.patch +f0cfe4ca9dd35f2878b2704251665e9f testdisk-7.0.tar.bz2 diff --git a/testdisk.spec b/testdisk.spec index 671d2d7..507f119 100644 --- a/testdisk.spec +++ b/testdisk.spec @@ -3,21 +3,21 @@ 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: 4%{?dist} +Version: 7.0 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 -Patch0: http://www.cgsecurity.org/testdisk_614_docdir.patch -Patch1: http://www.cgsecurity.org/testdisk_614_fix_ext2_check.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 +BuildRequires: libuuid-devel +BuildRequires: ncurses-devel >= 5.2 BuildRequires: ntfs-3g-devel -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 @@ -53,8 +53,6 @@ PhotoRec is a signature based file recovery utility. It handles more than %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure @@ -66,22 +64,44 @@ make DESTDIR="$RPM_BUILD_ROOT" install %clean rm -rf $RPM_BUILD_ROOT +%check +desktop-file-validate %{buildroot}/%{_datadir}/applications/qphotorec.desktop + +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +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 +/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}/qphotorec %attr(755,root,root) %{_bindir}/testdisk %{_mandir}/man8/fidentify.8* %{_mandir}/man8/photorec.8* +%{_mandir}/man8/qphotorec.8* %{_mandir}/man8/testdisk.8* +%{_mandir}/zh_CN/man8/fidentify.8* +%{_mandir}/zh_CN/man8/photorec.8* +%{_mandir}/zh_CN/man8/qphotorec.8* +%{_mandir}/zh_CN/man8/testdisk.8* +%{_datadir}/applications/qphotorec.desktop +%{_datadir}/icons/hicolor/48x48/apps/qphotorec.png +%{_datadir}/icons/hicolor/scalable/apps/qphotorec.svg %changelog -* Wed Apr 8 2015 Tom Callaway - 6.14-4 -- rebuild for new ntfs-3g - -* Thu Feb 27 2014 Kalev Lember - 6.14-3 -- Rebuilt for ntfs-3g soname bump +* Sat Apr 18 2015 Christophe Grenier - 7.0-1 +- Update to latest version +- This version includes some security fixes. * Wed Nov 06 2013 Christophe Grenier - 6.14-2 - Patch for additional ext2 check (Bug #1027026)