Author: kvolny Update of /cvs/nonfree/rpms/ufoai/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv14440 Modified Files: .cvsignore sources ufoai-wrapper.sh ufoai.spec Removed Files: ufoai-2.3-libdir.patch Log Message: * Mon Mar 14 2011 Karel Volny <kvolny(a)redhat.com&gt; 2.3.1-1 - Version bump - Fixes RPMFusion bug #1546 - See the release annoucement for list of changes: http://ufoai.ninex.info/wiki/index.php/News/2010#UFO:_Alien_Invasion_2.3_... - .spec cleanup - Adds workaround for crash on Intel cards Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/ufoai/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Sep 2010 13:15:45 -0000 1.3 +++ .cvsignore 14 Mar 2011 14:13:50 -0000 1.4 @@ -1 +1 @@ -ufoai-2.3-source.tar.bz2 +ufoai-2.3.1-source.tar.bz2 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/ufoai/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Sep 2010 13:15:45 -0000 1.3 +++ sources 14 Mar 2011 14:13:51 -0000 1.4 @@ -1 +1 @@ -9d180ed896a58fe0e514601cd7637dc1 ufoai-2.3-source.tar.bz2 +87b3e1bf3439dc6e5413936034f47d17 ufoai-2.3.1-source.tar.bz2 Index: ufoai-wrapper.sh =================================================================== RCS file: /cvs/nonfree/rpms/ufoai/devel/ufoai-wrapper.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ufoai-wrapper.sh 14 Sep 2010 13:15:45 -0000 1.1 +++ ufoai-wrapper.sh 14 Mar 2011 14:13:52 -0000 1.2 @@ -4,6 +4,21 @@ checkDriOK UFO:AI +confdir="$HOME/.ufoai/2.3.1/base" +conffile="$confdir/config.cfg" + +if glxinfo | grep "renderer string" | grep Intel &> /dev/null ; then + if [ -f $conffile ]; then + if grep r_programs $conffile | grep 1 &> /dev/null ; then + zenity --warning --text "You have GLSL Shaders enabled in your ufoai configuration file while using Intel OpenGL driver. This is known to crash the game or the X Server. It is highly recommended to turn the option off (Options => Video => GLSL Shaders)." + fi + else + mkdir -p $confdir + echo 'set r_programs "0" a' > $conffile + zenity --info --text "Intel OpenGL driver detected. Disabling GLSL Shaders due to known problems (game or X Server crash)." + fi +fi + exec ufo \ +set fs_i18ndir /usr/share/locale \ "\$@" Index: ufoai.spec =================================================================== RCS file: /cvs/nonfree/rpms/ufoai/devel/ufoai.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ufoai.spec 14 Oct 2010 21:00:29 -0000 1.6 +++ ufoai.spec 14 Mar 2011 14:13:53 -0000 1.7 @@ -1,6 +1,6 @@ Name: ufoai -Version: 2.3 -Release: 2%{?dist} +Version: 2.3.1 +Release: 1%{?dist} Summary: UFO: Alien Invasion Group: Amusements/Games @@ -12,7 +12,6 @@ Patch0: ufoai-2.3-no-lua.patch Patch1: ufoai-2.3-radiant-ldl.patch Patch2: ufoai-2.3-desktop-files.patch -Patch3: ufoai-2.3-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -117,23 +116,19 @@ %prep %setup -q -n %{name}-%{version}-source -# allow to set the library path -#%patch -p1 # ufoai-2.3-no-lua.patch - disable bundled lua %patch0 -p0 # ufoai-2.3-radiant-ldl.patch - add 'ldl' to RADIANT_LIBS -%patch1 -p0 +# need to use fuzz, the Makefile has changed since 2.3 +%patch1 -F2 -p0 # ufoai-2.3-desktop-files.patch - fix executable and icon names %patch2 -p0 ## we do not like "arch-dependent-file" in /usr/share # change the target for the library sed -i -e "s/base/./" build/game.mk -# ufoai-2.3-libdir.patch - search for the library within system library path -%patch3 -p0 %build -#%configure --disable-ufo2map --disable-uforadiant --enable-release %configure --enable-release make %{?_smp_mflags} make %{?_smp_mflags} lang @@ -148,7 +143,7 @@ %install rm -rf %{buildroot} # we don't use -# make install_exec DESTDIR=%{buildroot} +# make install_exec DESTDIR=%%{buildroot} # simply because it does not work ... ## client @@ -181,8 +176,8 @@ install -D -m 0755 ufomodel %{buildroot}%{_bindir} install -D src/tools/blender/md2tag_export.py %{buildroot}%{_datadir}/%{name}/tools/md2tag_export.py # not available in our sources -#install -D -m 0644 contrib/scripts/bashcompletion/ufo2map %{buildroot}%{_sysconfdir}/bash_completion.d/ufo2map -#install -D -m 0644 contrib/scripts/bashcompletion/ufomodel %{buildroot}%{_sysconfdir}/bash_completion.d/ufomodel +#install -D -m 0644 contrib/scripts/bashcompletion/ufo2map %%{buildroot}%%{_sysconfdir}/bash_completion.d/ufo2map +#install -D -m 0644 contrib/scripts/bashcompletion/ufomodel %%{buildroot}%%{_sysconfdir}/bash_completion.d/ufomodel ## install uforadiant install -D -m 0755 radiant/uforadiant %{buildroot}%{_bindir}/uforadiant @@ -249,7 +244,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -# we need to use full path so %doc does not the cleanup +# we need to use full path so %%doc does not the cleanup %dir %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/README %doc %{_docdir}/%{name}-%{version}/COPYING @@ -271,7 +266,6 @@ %files doc %defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version} -#%doc %{_docdir}/%{name}-%{version}/*.pdf %lang(en) %doc %{_docdir}/%{name}-%{version}/ufo-manual_EN.pdf @@ -289,7 +283,7 @@ %{_bindir}/ufomodel %dir %{_datadir}/%{name}/ # not available in our sources -#%{_sysconfdir}/bash_completion.d/ +#%%{_sysconfdir}/bash_completion.d/ %doc %{_mandir}/man6/ufo2map.6* %{_datadir}/%{name}/tools/ @@ -307,6 +301,14 @@ %changelog +* Mon Mar 14 2011 Karel Volny <kvolny(a)redhat.com&gt; 2.3.1-1 +- Version bump +- Fixes RPMFusion bug #1546 +- See the release annoucement for list of changes: + http://ufoai.ninex.info/wiki/index.php/News/2010#UFO:_Alien_Invasion_2.3_... +- .spec cleanup +- Adds workaround for crash on Intel cards + * Thu Oct 14 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.3-2 - Rebuilt for gcc bug --- ufoai-2.3-libdir.patch DELETED ---