[ed2k_hash] remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247

[Rahul Sundaram]

commit 55b479a25cda127da497bc16579a564082c9abbd
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Mon Feb 25 01:25:11 2013 -0500

    remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
    
    - clean up spec to follow current guidelines
    - fix desktop file to follow specification

 ed2k_hash.desktop |    3 +--
 ed2k_hash.spec    |   33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/ed2k_hash.desktop b/ed2k_hash.desktop
index 5952a69..2c0f5c5 100644
--- a/ed2k_hash.desktop
+++ b/ed2k_hash.desktop
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=ed2k_hash GUI
 GenericName=ED2k links generator
 Exec=ed2k_hash_gui
-Icon=ed2k_hash.png
+Icon=ed2k_hash
 Terminal=false
 Type=Application
 Categories=Utility;
diff --git a/ed2k_hash.spec b/ed2k_hash.spec
index a804e45..14ebb84 100644
--- a/ed2k_hash.spec
+++ b/ed2k_hash.spec
@@ -3,7 +3,7 @@
 Summary: Edonkey 2000 file hash calculator
 Name: ed2k_hash
 Version: 0.4.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 URL: http://ed2k-tools.sourceforge.net/index.shtml
 Group: Applications/File
 Source0: http://downloads.sourceforge.net/sourceforge/ed2k-tools/%{name}-%{version}.tar.gz
@@ -15,7 +15,6 @@ Patch1: %{name}-warnings.patch
 Patch2: %{name}-gcc43.patch
 Patch3: %{name}-ld.patch
 License: GPLv2+
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: fltk-devel
 BuildRequires: desktop-file-utils
 
@@ -41,29 +40,26 @@ A GUI tool that outputs ed2k-links for given files.
 %{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 iconv -f iso8859-1 -t utf8 AUTHORS > AUTHORS.utf8 && mv AUTHORS.utf8 AUTHORS
 mkdir -p $RPM_BUILD_ROOT%{_iconsdir}
 install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_iconsdir}/%{name}.png
 
-desktop-file-install --vendor fedora 			\
-	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
-	--add-category X-Fedora				\
-	%{SOURCE1}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+desktop-file-install --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1}
 
 %post gui
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun gui
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_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 gui
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %defattr(-,root,root,755)
@@ -74,10 +70,15 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %defattr(-,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO ed2k_hash/docs/en/*.html
 %{_bindir}/%{name}_gui
-%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_iconsdir}/%{name}.png
 
 %changelog
+* Mon Feb 25 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 0.4.0-17
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- clean up spec to follow current guidelines
+- fix desktop file to follow specification
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild