Accepting request 142710 from home:worldcitizen:branches:games

Quick n lazy lua fix
Added a gcc47 patch

OBS-URL: https://build.opensuse.org/request/show/142710
OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=32

widelands-build17-gcc47.diff

@@ -0,0 +1,12 @@
+diff -Naur widelands-build17-src.orig/src/main.cc widelands-build17-src/src/main.cc
+--- widelands-build17-src.orig/src/main.cc	2012-04-23 11:46:49.000000000 +0200
++++ widelands-build17-src/src/main.cc	2012-11-24 19:07:53.000000000 +0100
+@@ -31,6 +31,8 @@
+ 
+ #include <SDL_main.h>
+ 
++#include <unistd.h>
++
+ #ifndef WIN32
+ #include <syslog.h>
+ #include <fcntl.h>

widelands.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Nov 24 17:59:02 UTC 2012 - joop.boonen@opensuse.org
+
+- Quick n lazy lua fix
+- Added a gcc47 patch
+
 -------------------------------------------------------------------
 Sat May  5 19:26:16 UTC 2012 - opensuse@dstoecker.de
 

widelands.spec

@@ -20,41 +20,48 @@
 
 Name:           widelands
 Version:        build17
-Release:        1
+Release:        0
 Summary:        Open source realtime-strategy game
+License:        GPL-2.0+
 Group:          Amusements/Games/Strategy/Other
-License:        GPLv2+
+Url:            http://www.widelands.org
-URL:            http://www.widelands.org
+Source0:        %{name}-%{version}-src.tar.bz2
-Source0:        %name-%{version}-src.tar.bz2
 Source1:        %{name}.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  SDL_gfx-devel
-BuildRequires:  gcc-c++
-BuildRequires:  boost-devel
-BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_net-devel
 BuildRequires:  SDL_ttf-devel
-BuildRequires:  SDL_gfx-devel
+BuildRequires:  boost-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libtiff-devel
-BuildRequires:  zlib-devel
-BuildRequires:  lua-devel
-BuildRequires:  python-devel
 BuildRequires:  cmake
-BuildRequires:  gettext
-BuildRequires:  optipng
-BuildRequires:  fdupes
 BuildRequires:  doxygen
+BuildRequires:  fdupes
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
 BuildRequires:  glew-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  optipng
+BuildRequires:  python-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  zlib-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} >= 1220
+BuildRequires:  lua51-devel
+%else
+BuildRequires:  lua-devel
+%endif
 Requires:       %{name}-data = %{version}
 %if %build_launchpad
+Source2:        launchpad-export.tar.gz
 # for launchpad translation update
 Requires:       perl
-Source2:        launchpad-export.tar.gz
 %endif
+# PATCH-FIX-UPSTREAM widelands-build17_boostfix.diff
 Patch1:         widelands-build17_boostfix.diff
+# PATCH-FIX-UPSTREAM widelands-build17-gcc47.diff
+Patch2:         widelands-build17-gcc47.diff
 
 %description
 Widelands is an open source (GPLed), realtime-strategy game, using SDL and
@@ -64,6 +71,7 @@ perhaps will have a thought, what Widelands is all about.
 
 %package data
 Summary:        Data files for Widelands
+Group:          Amusements/Games/Strategy/Other
 Requires:       %{name} = %{version}
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
@@ -73,12 +81,13 @@ BuildArch:      noarch
 Data files for Widelands. Including localization, maps graphics and music.
 
 %prep
-%setup -q -n %{name}-%version-src
+%setup -q -n %{name}-%{version}-src
 %patch1 -p1
+%patch2 -p1
 %if %build_launchpad
 # for launchpad translation update
 cd ..
-tar -xzf %SOURCE2
+tar -xzf %{SOURCE2}
 find po -name "*.po" |perl -ne 'chomp;$a=$_;$a=~s{/[^/]*-}{/}; rename $_,"widelands/$a";'
 %endif
 
@@ -100,14 +109,14 @@ make %{?_smp_mflags}
 
 %install
 cd build
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 cd ..
 for i in 16 32 48 64 128; do
-  install -D -m 0644 pics/wl-ico-${i}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+  install -D -m 0644 pics/wl-ico-${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
 done
-install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
 %suse_update_desktop_file %{name}
-%fdupes $RPM_BUILD_ROOT%{_datadir}
+%fdupes %{buildroot}%{_datadir}
 %find_lang %{name} --all-name
 
 %files