From cd85dbd105d1dc0c1c9108c3044f89ef42fde043 Mon Sep 17 00:00:00 2001
From: Hans de Goede <jwrdegoede@fedoraproject.org>
Date: Jan 12 2008 12:52:13 +0000
Subject: - Fix compilation with gcc 4.3

- Drop workaround for intel graphics crash, this is "fixed" in SDL now

---

diff --git a/boswars-2.4.1-gcc43.patch b/boswars-2.4.1-gcc43.patch
new file mode 100644
index 0000000..6902e27
--- /dev/null
+++ b/boswars-2.4.1-gcc43.patch
@@ -0,0 +1,11 @@
+diff -up boswars-2.4.1-src/engine/stratagus/stratagus.cpp~ boswars-2.4.1-src/engine/stratagus/stratagus.cpp
+--- boswars-2.4.1-src/engine/stratagus/stratagus.cpp~	2008-01-12 13:45:20.000000000 +0100
++++ boswars-2.4.1-src/engine/stratagus/stratagus.cpp	2008-01-12 13:45:20.000000000 +0100
+@@ -161,6 +161,7 @@
+ #include <time.h>
+ #include <ctype.h>
+ #include <sstream>
++#include <algorithm>
+ 
+ #ifndef _MSC_VER
+ #include <unistd.h>
diff --git a/boswars-wrapper.sh b/boswars-wrapper.sh
deleted file mode 100644
index 25d83a7..0000000
--- a/boswars-wrapper.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if xvinfo | grep -q "Intel(R) Video Overlay"; then
-  export SDL_VIDEO_YUV_HWACCEL=0
-fi
-
-exec boswars "$@"
diff --git a/boswars.desktop b/boswars.desktop
index 48d8c37..2025dcf 100644
--- a/boswars.desktop
+++ b/boswars.desktop
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Bos Wars
 Comment=Bos Wars is a futuristic real-time strategy game
-Exec=boswars-wrapper -d /usr/share/boswars
-Icon=boswars.png
+Exec=boswars -d /usr/share/boswars
+Icon=boswars
 Terminal=false
 StartupNotify=false
 Type=Application
diff --git a/boswars.spec b/boswars.spec
index bb0511f..906823f 100644
--- a/boswars.spec
+++ b/boswars.spec
@@ -1,17 +1,17 @@
 Name:           boswars
 Version:        2.4.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Bos Wars is a futuristic real-time strategy game
 Group:          Amusements/Games
 License:        GPLv2
 URL:            http://www.boswars.org/
 Source0:        http://www.boswars.org/dist/releases/%{name}-%{version}-src.tar.gz
 Source1:        %{name}.desktop
-Source2:        %{name}-wrapper.sh
 Patch0:         boswars-2.4.1-SConstruct.patch
 # incomplete patch to port boswars to the sysytem guichan-0.6 instead of
 # using the included guichan-0.4. Incomplete, NOT finished and NOT working!
 Patch1:         boswars-2.4.1-guichan26.patch
+Patch2:         boswars-2.4.1-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libtheora-devel libvorbis-devel lua-devel SDL-devel libGL-devel
 BuildRequires:  tolua++-devel libpng-devel scons desktop-file-utils
@@ -26,6 +26,7 @@ Bos Wars aims to create a completly original and fun open source RTS game.
 %prep
 %setup -q -n %{name}-%{version}-src
 %patch0 -p1
+%patch2 -p1
 chmod -x engine/guichan/include/guichan/sdl/sdlgraphics.h \
   engine/include/animation.h engine/guichan/sdl/gsdl.cpp
 # we want to use the system version of these
@@ -41,7 +42,6 @@ rm -fr $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
 install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
-install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 install -p -m 644 languages/*.po languages/*.pot \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
 cp -a campaigns graphics maps scripts sounds units video \
@@ -78,13 +78,17 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc *.txt CHANGELOG doc/*.html doc/guichan-copyright.txt
-%{_bindir}/%{name}*
+%{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Sat Jan 12 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 2.4.1-4
+- Fix compilation with gcc 4.3
+- Drop workaround for intel graphics crash, this is "fixed" in SDL now
+
 * Tue Oct 30 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 2.4.1-3
 - Add workaround for boswars crashing on intel integrated video (bz 310841)