[lbrickbuster2] New upstream release 2.6.3 This fixes building with libpng-1.5 (amongst other things)

[Hans de Goede]

commit 6dcee6326381d77cc38f048c42f19a8ac27897bd
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Dec 6 23:31:59 2011 +0100

    New upstream release 2.6.3
    This fixes building with libpng-1.5 (amongst other things)

 lbrickbuster2-callback-fix.patch        |   45 ---------
 lbrickbuster2-save-shared-hiscore.patch |  154 -------------------------------
 lbrickbuster2.spec                      |   68 +++++++-------
 3 files changed, 35 insertions(+), 232 deletions(-)
---
diff --git a/lbrickbuster2.spec b/lbrickbuster2.spec
index 9a249e1..eb2c55b 100644
--- a/lbrickbuster2.spec
+++ b/lbrickbuster2.spec
@@ -1,24 +1,19 @@
 # we ship lbreakout2 under a different name because of trademark concerns
 %define realname lbreakout2
-%define prever beta-7
-%define _prever beta7
 
 Name:           lbrickbuster2
-Version:        2.6
-Release:        0.13.%{_prever}%{?dist}
+Version:        2.6.3
+Release:        1%{?dist}
 Summary:        Brickbuster arcade game
 License:        GPLv2+
 Group:          Amusements/Games
 URL:            http://lgames.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/lgames/%{realname}-%{version}%{prever}.tar.gz
+Source0:        http://downloads.sourceforge.net/lgames/%{realname}-%{version}.tar.gz
 # replacement art changing the logos from lbreakout2 to lbrickbuster2
 Source1:        %{name}-art.tar.gz
 Source2:        %{name}.desktop
 Patch0:         lbrickbuster2-rebrand-images.patch  
-Patch1:         lbrickbuster2-callback-fix.patch
-Patch2:         lbrickbuster2-save-shared-hiscore.patch
-Patch3:         lbrickbuster2-default-fullscreen.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:         lbrickbuster2-default-fullscreen.patch
 BuildRequires:  SDL_mixer-devel libpng-devel ImageMagick desktop-file-utils
 BuildRequires:  gettext
 Requires:       hicolor-icon-theme
@@ -36,11 +31,9 @@ the integrated level editor.
 
 
 %prep
-%setup -q -a 1 -n %{realname}-%{version}%{prever}
+%setup -q -a 1 -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 # fully automated rebrand to lbrickbuster
 for i in `find -type f -not -name "*.png" -not -name "*.wav"`; do
   touch -r $i $i.stamp
@@ -56,6 +49,9 @@ mv client/levels/LBreakout2 client/levels/LBrickbuster2
 mv fr_top.png menuback.png client/gfx/AbsoluteB
 mv client/gfx/AbsoluteB/fr_*.png client/gfx/AbsoluteB/menuback.png client/gfx
 rm client/gfx/Oz/fr_*.png client/gfx/Moiree/fr_*.png
+mv lbreakout32.gif lbrickbuster32.gif
+mv lbreakout48.gif lbrickbuster48.gif
+mv lbreakout2.desktop.in lbrickbuster2.desktop.in
 # rebranding done, other fixes / cleanups below
 sed -i 's|/usr/doc/%{name}|%{_defaultdocdir}/%{name}|g' po/*.po client/help.c
 iconv -f ISO_8859-1 -t utf-8 ChangeLog > ChangeLog.tmp
@@ -69,54 +65,60 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 install -p -m 644 AUTHORS COPYING ChangeLog README TODO \
   $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
 %find_lang %{name}
 
-# Install desktop entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+# Install desktop entry, fix icon location
+rm $RPM_BUILD_ROOT%{_datadir}/icons/lbrickbuster48.gif
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+sed -i 's|/usr/share/icons/lbrickbuster48.gif|%{name}|' \
+    $RPM_BUILD_ROOT%{_datadir}/applications/lbrickbuster2.desktop
 desktop-file-install \
-    --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    %{SOURCE2}
-convert lbreakout48.gif \
+    --vendor fedora  --delete-original \
+    --add-category=ArcadeGame --add-category=BlocksGame \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+    $RPM_BUILD_ROOT%{_datadir}/applications/lbrickbuster2.desktop
+convert lbrickbuster32.gif \
+    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+touch -r lbrickbuster32.gif \
+    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+convert lbrickbuster48.gif \
     $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-touch -r lbreakout48.gif \
+touch -r lbrickbuster48.gif \
     $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %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
+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
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc %{_defaultdocdir}/%{name}
 %attr(2755, root, games) %{_bindir}/%{name}
 %{_bindir}/%{name}server
 %{_datadir}/%{name}
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) %{_var}/games/%{name}.hscr
 
 
 %changelog
+* Tue Dec 06 2011 Hans de Goede <hdegoede at redhat.com> - 2.6.3-1
+- New upstream release 2.6.3
+- This fixes building with libpng-1.5 (amongst other things)
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 2.6-0.13.beta7
 - Rebuild for new libpng