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

[Rahul Sundaram]

commit 8ab5fdea4d0493852cf051c4280f773dea6850f8
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Tue Mar 5 01:59:48 2013 -0500

    remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
    
    - replace file requires with package requires for dejavu sans fonts
    - use make_install macro
    - drop obsolete version requirements for build dependencies
    - update gtk icon cache scriplets to follow current guidelines
    - drop defattr

 enigma.spec |   41 +++++++++++++++++++++++++----------------
 1 files changed, 25 insertions(+), 16 deletions(-)
---
diff --git a/enigma.spec b/enigma.spec
index 188dc59..1361e0f 100644
--- a/enigma.spec
+++ b/enigma.spec
@@ -1,6 +1,6 @@
 Name:           enigma
 Version:        1.01
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Clone of the ATARI game Oxyd
 
 Group:          Amusements/Games
@@ -17,18 +17,17 @@ Patch5:         enigma-gcc-4.6-ftbfs.patch
 Patch6:         enigma-gcc-4.7-ftbfs.patch
 Patch7:         enigma-libpng15.patch
 
-Requires:       %{_datadir}/fonts/dejavu/DejaVuSans.ttf 
-Requires:       %{_datadir}/fonts/dejavu/DejaVuSansCondensed.ttf
+Requires:       dejavu-sans-fonts
 
-BuildRequires:  SDL-devel >= 1.2  
-BuildRequires:  SDL_image-devel >= 1.2 
-BuildRequires:  SDL_mixer-devel >= 1.2.4
-BuildRequires:  SDL_ttf-devel >= 2.0.4
+BuildRequires:  SDL-devel
+BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_ttf-devel
 BuildRequires:  gettext
 BuildRequires:  libpng-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  zlib-devel >= 1.2.0
-BuildRequires:  tetex >= 2.0.2
+BuildRequires:  zlib-devel
+BuildRequires:  tetex
 BuildRequires:  xerces-c-devel
 
 %description
@@ -56,7 +55,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf __doc
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 mkdir __doc
 mv $RPM_BUILD_ROOT%{_datadir}/doc/enigma/ __doc
 
@@ -68,8 +67,6 @@ ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
 desktop-file-install \
-  --delete-original                                        \
-  --vendor fedora                                          \
   --remove-key Version \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications            \
   $RPM_BUILD_ROOT%{_datadir}/applications/enigma.desktop
@@ -77,26 +74,38 @@ desktop-file-install \
 %find_lang %{name}
 
 %post
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
+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 -f %{name}.lang
-%defattr(-,root,root,-)
 %doc README AUTHORS CHANGES COPYING ACKNOWLEDGEMENTS __doc/*
 %{_datadir}/enigma
 %{_bindir}/enigma
 %{_mandir}/man?/enigma.*
 %{_datadir}/icons/hicolor/48x48/apps/enigma.png
 %{_datadir}/pixmaps/enigma.png
-%{_datadir}/applications/*enigma.desktop
+%{_datadir}/applications/enigma.desktop
 # we don't need the enet stuff
 %exclude %{_includedir}/enet/
 %exclude %{_libdir}/libenet.a
 
 %changelog
+* Mon Mar 04 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 1.01-23
+- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
+- replace file requires with package requires for dejavu sans fonts
+- use make_install macro
+- drop obsolete version requirements for build dependencies
+- update gtk icon cache scriplets to follow current guidelines
+- drop defattr
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.01-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild