From 442d6abe1ba403f5bd4fc09d3ae57555f4e1808e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Nov 20 2018 22:06:22 +0000 Subject: Small spec cleanups - Explicitly indicate qt4-devel BR - Use macros for make invocations - Drop Group tag - Drop icon cache scriptlets for Fedora - Drop redundant attr settings for files - Mark COPYING as a license file --- diff --git a/testdisk.spec b/testdisk.spec index b0107dd..a295ecc 100644 --- a/testdisk.spec +++ b/testdisk.spec @@ -4,9 +4,8 @@ Summary(fr.UTF8): Outil pour vérifier et restaurer des partitions Summary(ru_RU.UTF8): Программа для проверки и восстановления разделов диска Name: testdisk Version: 7.0 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ -Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 URL: http://www.cgsecurity.org/wiki/TestDisk BuildRequires: desktop-file-utils @@ -16,7 +15,7 @@ BuildRequires: libjpeg-devel BuildRequires: libuuid-devel BuildRequires: ncurses-devel >= 5.2 BuildRequires: ntfs-3g-devel -BuildRequires: qt-devel +BuildRequires: qt4-devel BuildRequires: zlib-devel Obsoletes: testdisk-doc < 6.12 @@ -52,7 +51,6 @@ PhotoRec is a signature based file recovery utility. It handles more than %package -n qphotorec Summary: Signature based file carver. Recover lost files -Group: Applications/System %description -n qphotorec QPhotoRec is a Qt version of PhotoRec. It is a signature based file recovery @@ -64,14 +62,15 @@ OpenOffice documents. %build %configure -make %{?_smp_mflags} +%make_build + %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR="$RPM_BUILD_ROOT" install +%make_install %check desktop-file-validate %{buildroot}/%{_datadir}/applications/qphotorec.desktop +%if 0%{?rhel} && 0%{?rhel} < 8 %post -n qphotorec /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -83,13 +82,15 @@ fi %posttrans -n qphotorec /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%endif %files -%doc AUTHORS COPYING ChangeLog NEWS README THANKS +%doc AUTHORS ChangeLog NEWS README THANKS +%license COPYING %doc documentation.html -%attr(755,root,root) %{_bindir}/fidentify -%attr(755,root,root) %{_bindir}/photorec -%attr(755,root,root) %{_bindir}/testdisk +%{_bindir}/fidentify +%{_bindir}/photorec +%{_bindir}/testdisk %{_mandir}/man8/fidentify.8* %{_mandir}/man8/photorec.8* %{_mandir}/man8/testdisk.8* @@ -98,7 +99,7 @@ fi %{_mandir}/zh_CN/man8/testdisk.8* %files -n qphotorec -%attr(755,root,root) %{_bindir}/qphotorec +%{_bindir}/qphotorec %{_mandir}/man8/qphotorec.8* %{_mandir}/zh_CN/man8/qphotorec.8* %{_datadir}/applications/qphotorec.desktop @@ -106,6 +107,14 @@ fi %{_datadir}/icons/hicolor/scalable/apps/qphotorec.svg %changelog +* Tue Nov 20 2018 Neal Gompa - 7.0-14 +- Explicitly indicate qt4-devel BR +- Use macros for make invocations +- Drop Group tag +- Drop icon cache scriptlets for Fedora +- Drop redundant attr settings for files +- Mark COPYING as a license file + * Sat Jul 14 2018 Fedora Release Engineering - 7.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild