[scorchwentbonkers] Rebuilt for new allegro-4.4

[Hans de Goede]

commit 58099b470145591f6af1873b8f1e976e97223e8b
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Jul 13 10:05:53 2011 +0200

    Rebuilt for new allegro-4.4

 scorchwentbonkers-1.1-al-4.4.patch |   12 ++++++++++++
 scorchwentbonkers.spec             |   27 +++++++++++++--------------
 2 files changed, 25 insertions(+), 14 deletions(-)
---
diff --git a/scorchwentbonkers-1.1-al-4.4.patch b/scorchwentbonkers-1.1-al-4.4.patch
new file mode 100644
index 0000000..b93039b
--- /dev/null
+++ b/scorchwentbonkers-1.1-al-4.4.patch
@@ -0,0 +1,12 @@
+diff -up scorchwentbonkers-1.1/Makefile.linux~ scorchwentbonkers-1.1/Makefile.linux
+--- scorchwentbonkers-1.1/Makefile.linux~	2011-07-13 00:01:07.000000000 +0200
++++ scorchwentbonkers-1.1/Makefile.linux	2011-07-13 00:02:42.972219677 +0200
+@@ -55,7 +55,7 @@ SRCS = $(subst .o,.cpp,$(OBJS))
+ DEPENDS = Makefile.dep
+ EXENAME = swb
+ 
+-LIBS = -ljpgal -lagl `allegro-config --libs` `pkg-config --libs AllegroOGG` -lGL -lGLU -ldumb -laldmb -lpthread
++LIBS = -ljpgalleg -lalleggl `allegro-config --libs` `pkg-config --libs AllegroOGG` -lGL -lGLU -ldumb -laldmb -lpthread
+ 
+ CXX = g++
+ RM = rm -f
diff --git a/scorchwentbonkers.spec b/scorchwentbonkers.spec
index bd608f7..5f5837c 100644
--- a/scorchwentbonkers.spec
+++ b/scorchwentbonkers.spec
@@ -1,6 +1,6 @@
 Name:           scorchwentbonkers
 Version:        1.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Realtime remake of Scorched Earth
 Group:          Amusements/Games
 License:        zlib
@@ -16,7 +16,7 @@ Patch1:         %{name}-support-16bpp.patch
 Patch2:         %{name}-unixify.patch
 Patch3:         %{name}-fullscreen.patch
 Patch4:         %{name}-divbyzero.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch5:         %{name}-1.1-al-4.4.patch
 BuildRequires:  alleggl-devel jpgalleg-devel dumb-devel AllegroOGG-devel 
 BuildRequires:  libGLU-devel desktop-file-utils
 Requires:       hicolor-icon-theme
@@ -36,6 +36,7 @@ for controlling your tank. The game is real-time instead of turn based.
 %patch2 -p1 -z .unix
 %patch3 -p1 -z .fs
 %patch4 -p1 -z .dbz
+%patch5 -p1
 sed -i 's/\r//' doc/readme.htm
 
 
@@ -45,7 +46,6 @@ make %{?_smp_mflags} -f Makefile.linux PREFIX=%{_prefix} \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make -f Makefile.linux install PREFIX=$RPM_BUILD_ROOT%{_prefix}
 
 # below is the desktop file and icon stuff.
@@ -58,22 +58,18 @@ install -p -m 644 %{SOURCE2} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 
 
-%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
+/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,-)
@@ -85,6 +81,9 @@ fi
 
 
 %changelog
+* Wed Jul 13 2011 Hans de Goede <hdegoede at redhat.com> - 1.1-10
+- Rebuilt for new allegro-4.4
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild