From f8fe77161cc70c315acebe6ff01477ec9cd82cc8 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 2 Nov 2014 15:51:08 +0100 Subject: [PATCH] Create qphotorec.desktop --- Makefile.am | 8 +++ icons/48x48/apps/qphotorec.png | Bin 0 -> 3492 bytes icons/Makefile.am | 22 ++++++ icons/scalable/apps/qphotorec.svg | 115 ++++++++++++++++++++++++++++++ linux/qphotorec.desktop | 10 +++ linux/testdisk.spec.in | 29 ++++++-- 6 files changed, 179 insertions(+), 5 deletions(-) create mode 100644 icons/48x48/apps/qphotorec.png create mode 100644 icons/scalable/apps/qphotorec.svg create mode 100644 linux/qphotorec.desktop diff --git a/Makefile.am b/Makefile.am index 64bfeb5f..88d74838 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ EXTRA_DIST = AUTHORS COPYING ChangeLog INFO INSTALL NEWS README THANKS compile.s documentation.html \ dos/readme.txt \ linux/testdisk.spec.in \ + linux/qphotorec.desktop \ src/icon_ph.rc src/icon_qph.rc src/icon_tst.rc \ src/photorec_64x64.png \ src/gnome/README \ @@ -26,9 +27,16 @@ AUTOMAKE_OPTIONS = gnits install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir) $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog $(top_srcdir)/NEWS $(top_srcdir)/README $(top_srcdir)/THANKS $(top_srcdir)/documentation.html $(DESTDIR)$(docdir) +if USEQT + $(mkinstalldirs) $(DESTDIR)$(datadir)/applications + $(INSTALL_DATA) $(top_srcdir)/linux/qphotorec.desktop $(DESTDIR)$(datadir)/applications +endif uninstall-hook: rm -rf $(DESTDIR)$(docdir) +if USEQT + rm -f $(DESTDIR)$(datadir)/applications/qphotorec.desktop +endif static: rm -f src/testdisk src/testdisk.exe src/photorec src/photorec.exe src/fidentify src/fidentify.exe src/qphotorec src/qphotorec.exe diff --git a/icons/48x48/apps/qphotorec.png b/icons/48x48/apps/qphotorec.png new file mode 100644 index 0000000000000000000000000000000000000000..7ccce3b4a4c833c1d8338e37ef0bda7cd5e93024 GIT binary patch literal 3492 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linux/qphotorec.desktop b/linux/qphotorec.desktop new file mode 100644 index 00000000..003a33f9 --- /dev/null +++ b/linux/qphotorec.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=QPhotoRec +GenericName=Data Recovery Utility +Icon=qphotorec +TryExec=/usr/bin/qphotorec +Exec=/usr/bin/qphotorec %F +Terminal=false +Categories=System;Filesystem;Qt; diff --git a/linux/testdisk.spec.in b/linux/testdisk.spec.in index 09672a7c..b200b3a6 100644 --- a/linux/testdisk.spec.in +++ b/linux/testdisk.spec.in @@ -21,14 +21,12 @@ BuildRequires: libewf-devel BuildRequires: libjpeg-devel BuildRequires: libuuid-devel BuildRequires: ncurses-devel >= 5.2 -%ifnarch ppc ppc64 -#BuildRequires: ntfsprogs-devel BuildRequires: ntfs-3g-devel -%endif -BuildRequires: openssl-devel BuildRequires: zlib-devel +BuildRequires: qt-devel +BuildRequires: desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: testdisk-doc +Obsoletes: testdisk-doc < 6.12 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %description @@ -86,17 +84,38 @@ 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 %{_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 %attr(755,root,root) %{_bindir}/fidentify %attr(755,root,root) %{_bindir}/photorec +%attr(755,root,root) %{_bindir}/qphotorec %attr(755,root,root) %{_bindir}/testdisk %changelog