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

[Rahul Sundaram]

commit a8d3c12c665d4c7622d72f0540e644c7d63c9263
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Fri Aug 26 06:32:41 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 icon cache scriplets as per current packaging guidelines
    Fix the desktop file to follow the latest spec

 freedoom.desktop |    3 +--
 freedoom.spec    |   48 +++++++++++++++++++++---------------------------
 2 files changed, 22 insertions(+), 29 deletions(-)
---
diff --git a/freedoom.desktop b/freedoom.desktop
index f412631..8811901 100644
--- a/freedoom.desktop
+++ b/freedoom.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Freedoom
 GenericName=Free Doom
 Comment=A new set of Doom levels
 Exec=prboom -iwad /usr/share/doom/freedoom.wad
-Icon=freedoom.png
+Icon=freedoom
 Terminal=false
 Type=Application
 Categories=Game;ActionGame;
diff --git a/freedoom.spec b/freedoom.spec
index 5072f4f..34b9db4 100644
--- a/freedoom.spec
+++ b/freedoom.spec
@@ -1,18 +1,17 @@
-%define waddir  %{_datadir}/doom
+%global waddir  %{_datadir}/doom
 
 Name:           freedoom
 
-Version:        0.6.4
-Release:        3%{?dist}
+Version:        0.7
+Release:        1%{?dist}
 Summary:        Replacement game files for doom game engines
 
 Group:          Amusements/Games
 License:        BSD
 URL:            https://savannah.nongnu.org/projects/freedoom/
-Source0:        http://download.savannah.gnu.org/releases-noredirect/freedoom/freedoom-iwad/freedoom-iwad-0.6.4.zip
+Source0:        http://download.savannah.gnu.org/releases-noredirect/%{name}/%{name}-iwad/%{name}-iwad-%{version}.zip
 Source1:        freedoom.desktop
 Source2:        freedoom.png
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  desktop-file-utils
@@ -27,51 +26,46 @@ order to play Doom. Freedoom aims to create a Free alternative. Combined with
 the GPL-licensed Doom source code this will result in a completely Free
 Doom-based game.
 
-
 %prep
 %setup -q -n freedoom-iwad-%{version}
 
-
 %build
 # Game data files.  Nothing to build!
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -pD -m 0644 doom2.wad $RPM_BUILD_ROOT/%{waddir}/freedoom.wad
+install -pD -m 0644 doom2.wad %{buildroot}/%{waddir}/freedoom.wad
 
-desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        %{SOURCE1}
+desktop-file-install --dir %{buildroot}/%{_datadir}/applications %{SOURCE1}
 
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
+install -p -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
 
 %post
-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
-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,-)
 %{waddir}/%{name}.wad
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %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 icon cache scriplets 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