[boswars] New upstream release 2.7 (rhbz#970057)

[Hans de Goede]

commit 09e95b5827ef6174170ad7abd02aeabee23feac9
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Aug 2 16:41:17 2013 +0200

    New upstream release 2.7 (rhbz#970057)

 .gitignore   |    1 +
 boswars.spec |   24 ++++++++++++++++--------
 sources      |    2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aea992f..fec1fe6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 boswars-2.6-src.tar.gz
 /boswars-2.6.1-src.tar.gz
+/boswars-2.7-src.tar.gz
diff --git a/boswars.spec b/boswars.spec
index 3e58970..27a932d 100644
--- a/boswars.spec
+++ b/boswars.spec
@@ -1,6 +1,6 @@
 Name:           boswars
-Version:        2.6.1
-Release:        9%{?dist}
+Version:        2.7
+Release:        1%{?dist}
 Summary:        Bos Wars is a futuristic real-time strategy game
 Group:          Amusements/Games
 License:        GPLv2
@@ -11,8 +11,9 @@ Patch0:         boswars-2.4.1-SConstruct.patch
 # incomplete patch to port boswars to the system guichan-0.6 instead of
 # using the included guichan-0.4. Incomplete, NOT finished and NOT working!
 #Patch1:         boswars-2.4.1-guichan26.patch
-# Lua 5.2
-Patch2:		boswars-2.6.1-lua-5.2.patch
+# Lua 5.2 patch needs to be ported to boswars-2.7, more importantly we first
+# need a tolua++ which works with 5.2, we should use compat-lua51 for now
+#Patch2:         boswars-2.6.1-lua-5.2.patch
 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
@@ -26,7 +27,6 @@ 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 -b .lua-52
 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
@@ -38,14 +38,19 @@ scons %{?_smp_mflags} opengl=1 CC="gcc $RPM_OPT_FLAGS" CXX="g++ $RPM_OPT_FLAGS"
 %install
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
-install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}
+install -m 755 build/boswars-release $RPM_BUILD_ROOT%{_bindir}/%{name}
 install -p -m 644 languages/*.po languages/*.pot \
   $RPM_BUILD_ROOT%{_datadir}/%{name}/languages
 cp -a campaigns graphics intro maps scripts sounds units patches \
   $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+  --vendor fedora            \
+%endif
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  %{SOURCE1}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 install -p -m 644 graphics/ui/elites_claw.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
@@ -66,10 +71,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc *.txt CHANGELOG doc/*.html doc/guichan-copyright.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 %changelog
+* Fri Aug  2 2013 Hans de Goede <hdegoede at redhat.com> - 2.7-1
+- New upstream release 2.7 (rhbz#970057)
+
 * Mon May 13 2013 Tom Callaway <spot at fedoraproject.org> - 2.6.1-9
 - lua 5.2
 
diff --git a/sources b/sources
index 412c331..b16f0ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f0fcf440e8d765c484f09074f993b40  boswars-2.6.1-src.tar.gz
+ffb7423a27e1821ab12ca7283f932cbf  boswars-2.7-src.tar.gz