From 40e98a2cbeb6bdcb049a111cdd00a38afb794e37 Mon Sep 17 00:00:00 2001 From: Rahul Sundaram Date: Feb 23 2013 20:16:58 +0000 Subject: remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 - clean up spec to follow current guidelines --- diff --git a/djview4.spec b/djview4.spec index 22448ce..7b0704d 100644 --- a/djview4.spec +++ b/djview4.spec @@ -1,7 +1,7 @@ Summary: DjVu viewer Name: djview4 Version: 4.8 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://djvu.sourceforge.net/djview4.html @@ -13,7 +13,6 @@ BuildRequires: desktop-file-utils BuildRequires: djvulibre-devel >= 3.5.19 # For plugin, see #756950 BuildRequires: glib2-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description DjView4 is a DjVu document viewer with the following features: @@ -45,7 +44,6 @@ QTDIR=%{_libdir}/qt4 QMAKE=qmake-qt4 %configure --enable-nsdejavu %{__make} %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} %{__make} DESTDIR=%{buildroot} INSTALL="%{__install} -p" \ install-djview install-nsdejavu plugindir=%{_libdir}/mozilla/plugins @@ -55,34 +53,31 @@ QTDIR=%{_libdir}/qt4 QMAKE=qmake-qt4 %configure --enable-nsdejavu # desktop file %{__install} -p -m 0644 -D desktopfiles/hi32-djview4.png \ %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/djvulibre-djview4.png -desktop-file-install --vendor fedora --dir %{buildroot}%{_datadir}/applications \ +desktop-file-install --dir %{buildroot}%{_datadir}/applications \ desktopfiles/djvulibre-djview4.desktop -%clean -%{__rm} -rf %{buildroot} - %post update-mime-database %{_datadir}/mime &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun update-mime-database %{_datadir}/mime &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +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(-, root, root) %doc COPYRIGHT COPYING NEWS README %{_bindir}/%{name} %dir %{_datadir}/djvu %{_datadir}/djvu/%{name} %{_mandir}/man1/%{name}.1* -%{_datadir}/applications/fedora-djvulibre-%{name}.desktop +%{_datadir}/applications/djvulibre-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/djvulibre-%{name}.png %files plugin @@ -90,6 +85,10 @@ fi %{_mandir}/man1/nsdejavu.1* %changelog +* Sat Feb 22 2013 Rahul Sundaram - 4.8-9 +- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 +- clean up spec to follow current guidelines + * Wed Feb 13 2013 Fedora Release Engineering - 4.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild