rpms/boswars/F-7 boswars-wrapper.sh, NONE, 1.1 boswars.desktop, 1.1, 1.2 boswars.spec, 1.1, 1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/boswars/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20233

Modified Files:
	boswars.desktop boswars.spec 
Added Files:
	boswars-wrapper.sh 
Log Message:
* Tue Oct 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-3
- Add workaround for boswars crashing on intel integrated video (bz 310841)



--- NEW FILE boswars-wrapper.sh ---
#!/bin/bash

if xvinfo | grep -q "Intel(R) Video Overlay"; then
  export SDL_VIDEO_YUV_HWACCEL=0
fi

exec boswars "$@"


Index: boswars.desktop
===================================================================
RCS file: /cvs/extras/rpms/boswars/F-7/boswars.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boswars.desktop	11 Sep 2007 07:25:58 -0000	1.1
+++ boswars.desktop	30 Oct 2007 14:19:48 -0000	1.2
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Bos Wars
 Comment=Bos Wars is a futuristic real-time strategy game
-Exec=boswars -d /usr/share/boswars
+Exec=boswars-wrapper -d /usr/share/boswars
 Icon=boswars.png
 Terminal=false
 StartupNotify=false


Index: boswars.spec
===================================================================
RCS file: /cvs/extras/rpms/boswars/F-7/boswars.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boswars.spec	11 Sep 2007 07:25:58 -0000	1.1
+++ boswars.spec	30 Oct 2007 14:19:48 -0000	1.2
@@ -1,12 +1,13 @@
 Name:           boswars
 Version:        2.4.1
-Release:        2%{?dist}
+Release:        3%{?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!
@@ -14,6 +15,7 @@
 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
+Requires:       hicolor-icon-theme xorg-x11-utils
 
 %description
 Bos Wars is a futuristic real-time strategy game. It is possible to play
@@ -39,6 +41,7 @@
 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 \
@@ -75,13 +78,16 @@
 %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
+* Tue Oct 30 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-3
+- Add workaround for boswars crashing on intel integrated video (bz 310841)
+
 * Mon Sep 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-2
 - Add missing BuildRequires libpng-devel