[freedoom-freedm] Update to latest upstream release No need to explicitly define buildroot, defattr or have a clean st

[Rahul Sundaram]

commit b0c133777aaa8951af56414d64bb147a281517a2
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Fri Aug 26 07:41:34 2011 +0530

    Update to latest upstream release
    No need to explicitly define buildroot, defattr or have a clean stage anymore
    Replace define with global as per current packaging guidelines
    Fix the desktop file to follow the latest spec

 freedoom-freedm.desktop |    3 +--
 freedoom-freedm.spec    |   31 ++++++++++++-------------------
 2 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/freedoom-freedm.desktop b/freedoom-freedm.desktop
index c53e52c..f0ee4d0 100644
--- a/freedoom-freedm.desktop
+++ b/freedoom-freedm.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Freedoom Deathmatch
 GenericName=Free Doom
 Comment=A set of Doom Deathmatch levels
 Exec=prboom -iwad /usr/share/doom/freedm.wad
-Icon=freedoom.png
+Icon=freedoom
 Terminal=false
 Type=Application
 Categories=Game;ActionGame;
diff --git a/freedoom-freedm.spec b/freedoom-freedm.spec
index 30a5b41..903321e 100644
--- a/freedoom-freedm.spec
+++ b/freedoom-freedm.spec
@@ -1,17 +1,16 @@
-%define waddir  %{_datadir}/doom
+%global waddir  %{_datadir}/doom
 
 Name:           freedoom-freedm
 
-Version:        0.6.4
-Release:        3%{?dist}
+Version:        0.7
+Release:        1%{?dist}
 Summary:        Deathmatch levels for Doom
 
 Group:          Amusements/Games
 License:        BSD
 URL:            https://savannah.nongnu.org/projects/freedoom/
-Source0:        http://download.savannah.gnu.org/releases-noredirect/freedoom/freedm/freedm-0.6.4.zip
+Source0:        http://download.savannah.gnu.org/releases-noredirect/freedoom/freedm/freedm-%{version}.zip
 Source1:        freedoom-freedm.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
@@ -21,35 +20,29 @@ Requires:       prboom freedoom
 A set of deathmatch levels for the DOOM game engine, based on the
 freely redistributable Freedoom game files.
 
-
 %prep
 %setup -q -n freedm-%{version}
 
-
 %build
 # Game data files.  Nothing to build!
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -pD -m 0644 freedm.wad $RPM_BUILD_ROOT/%{waddir}/freedm.wad
-
-desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        %{SOURCE1}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -pD -m 0644 freedm.wad %{buildroot}/%{waddir}/freedm.wad
 
+desktop-file-install --dir %{buildroot}/%{_datadir}/applications %{SOURCE1}
 
 %files
-%defattr(-,root,root,-)
 %{waddir}/freedm.wad
 %{_datadir}/applications/*.desktop
 %doc README COPYING CREDITS NEWS
 
-
-
 %changelog
+* Fri Aug 26 2011 Rahul Sundaram <sundaram at fedoraproject.org> - 0.7-1
+- Update to latest upstream release
+- No need to explicitly define buildroot, defattr or have a clean stage anymore
+- Replace define with global as per current packaging guidelines
+- Fix the desktop file to follow the latest spec
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild