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

[Rahul Sundaram]

commit 8314ca5b1dc1eaa7ea46b4496e52d9a176b2b7b6
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Fri Feb 22 16:47:51 2013 -0500

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

 CriticalMass.spec |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/CriticalMass.spec b/CriticalMass.spec
index 014630a..30f2003 100644
--- a/CriticalMass.spec
+++ b/CriticalMass.spec
@@ -1,6 +1,6 @@
 Name:           CriticalMass
 Version:        1.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        SDL/OpenGL space shoot'em up game also known as critter
 Group:          Amusements/Games
 License:        GPLv2+
@@ -23,7 +23,6 @@ unprepared, your government was unable to defend its precious resources. As
 a last effort to recapture some of the "goodies", you have been placed into
 a tiny spacecraft and sent after them.
 
-
 %prep
 %setup -q
 %patch0 -p1
@@ -31,7 +30,6 @@ a tiny spacecraft and sent after them.
 %patch2 -p1
 sed -i 's/curl-gnutls/curl/g' configure
 
-
 %build
 %configure
 # ./configure doesn't properly pick up our CFLAGS, and we need to override
@@ -40,9 +38,8 @@ sed -i 's/curl-gnutls/curl/g' configure
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE=1 -D_REENTRANT -DGAME_HAS_HERO_PARTICLE -I/usr/include/SDL"
 make CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS -std=c++0x"
 
-
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/critter-wrapper
 
 # remove unwanted utility
@@ -50,14 +47,11 @@ rm $RPM_BUILD_ROOT%{_bindir}/Packer
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora            \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE1}
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps
 install -p -m 644 critter.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps
 
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -70,17 +64,19 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-
 %files
 %doc COPYING Readme.html TODO
 %{_bindir}/critter*
 %{_datadir}/Critical_Mass
 %{_mandir}/man6/critter.6*
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/256x256/apps/critter.png
 
-
 %changelog
+* Fri Feb 22 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 1.5-7
+- 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 <rel-eng at lists.fedoraproject.org> - 1.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild