From 283c69a387a0dc1a04f0d18aaa9786d3c41263d686f726a2f2e8d400f7bce737 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Sun, 6 May 2012 08:41:06 +0000
Subject: [PATCH] update to build17

OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=31
---
 launchpad-export.tar.gz         |  3 ---
 widelands-build16-src.tar.bz2   |  3 ---
 widelands-build17-src.tar.bz2   |  3 +++
 widelands-build17_boostfix.diff | 12 ++++++++++++
 widelands.changes               |  5 +++++
 widelands.spec                  | 18 +++++++-----------
 6 files changed, 27 insertions(+), 17 deletions(-)
 delete mode 100644 launchpad-export.tar.gz
 delete mode 100644 widelands-build16-src.tar.bz2
 create mode 100644 widelands-build17-src.tar.bz2
 create mode 100644 widelands-build17_boostfix.diff

diff --git a/launchpad-export.tar.gz b/launchpad-export.tar.gz
deleted file mode 100644
index 0216d61..0000000
--- a/launchpad-export.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:457e74295a83e1dc43903c748bc740c11bf8858dee5d1b9aeb1dfd45ecc0db5e
-size 3454727
diff --git a/widelands-build16-src.tar.bz2 b/widelands-build16-src.tar.bz2
deleted file mode 100644
index 78e5dd7..0000000
--- a/widelands-build16-src.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8db3c15c30314cb220c6d79d93d3d31e7bce2722c93d2c385d643c3c669625d
-size 137808494
diff --git a/widelands-build17-src.tar.bz2 b/widelands-build17-src.tar.bz2
new file mode 100644
index 0000000..e2ba4ee
--- /dev/null
+++ b/widelands-build17-src.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5
+size 175547379
diff --git a/widelands-build17_boostfix.diff b/widelands-build17_boostfix.diff
new file mode 100644
index 0000000..c8091ac
--- /dev/null
+++ b/widelands-build17_boostfix.diff
@@ -0,0 +1,12 @@
+diff -ur widelands-build17-src/CMakeLists.txt widelands-build17-src_fix/CMakeLists.txt
+--- widelands-build17-src/CMakeLists.txt	2012-04-23 11:46:49.000000000 +0200
++++ widelands-build17-src_fix/CMakeLists.txt	2012-05-05 22:02:24.000000000 +0200
+@@ -140,7 +140,7 @@
+ else (WL_UNIT_TESTS)
+   message(STATUS "Disabled Unit Tests")
+   set (Boost_FIND_COMPONENTS signals)
+-  set (Boost_USE_STATIC_LIBS   ON)
++#  set (Boost_USE_STATIC_LIBS   ON)
+   set (Boost_USE_MULTITHREADED ON)
+   set (Boost_DETAILED_FAILURE_MSG ON)
+   find_package(Boost 1.35.0 COMPONENTS signals REQUIRED)
diff --git a/widelands.changes b/widelands.changes
index 3eabf3c..3e26bc6 100644
--- a/widelands.changes
+++ b/widelands.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May  5 19:26:16 UTC 2012 - opensuse@dstoecker.de
+
+- update to build 17
+
 -------------------------------------------------------------------
 Fri Nov 25 22:06:22 UTC 2011 - jengelh@medozas.de
 
diff --git a/widelands.spec b/widelands.spec
index f1d2fbc..c0c0956 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package widelands
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,13 @@
 %define build_launchpad 0
 
 Name:           widelands
-Version:        build16
+Version:        build17
 Release:        1
 Summary:        Open source realtime-strategy game
 Group:          Amusements/Games/Strategy/Other
 License:        GPLv2+
 URL:            http://www.widelands.org
-Source0:        %name-build16-src.tar.bz2
+Source0:        %name-%{version}-src.tar.bz2
 Source1:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
@@ -39,7 +39,6 @@ BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  zlib-devel
-BuildRequires:  ggz-client-libs-devel
 BuildRequires:  lua-devel
 BuildRequires:  python-devel
 BuildRequires:  cmake
@@ -55,6 +54,7 @@ Requires:       %{name}-data = %{version}
 Requires:       perl
 Source2:        launchpad-export.tar.gz
 %endif
+Patch1:         widelands-build17_boostfix.diff
 
 %description
 Widelands is an open source (GPLed), realtime-strategy game, using SDL and
@@ -74,6 +74,7 @@ Data files for Widelands. Including localization, maps graphics and music.
 
 %prep
 %setup -q -n %{name}-%version-src
+%patch1 -p1
 %if %build_launchpad
 # for launchpad translation update
 cd ..
@@ -86,10 +87,8 @@ find po -name "*.po" |perl -ne 'chomp;$a=$_;$a=~s{/[^/]*-}{/}; rename $_,"widela
 mkdir -p build/locale
 cd build
 
-# -DWL_VERSION=%{version} to skip revision check, should be removed for final release
 cmake \
   -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-  -DWL_VERSION=%{version} \
   -DWL_INSTALL_PREFIX=%{_prefix} \
   -DWL_INSTALL_BINDIR=bin \
   -DWL_INSTALL_DATADIR=share/%{name} \
@@ -131,13 +130,10 @@ install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.de
 
 %files data -f %{name}.lang
 %defattr(-,root,root,-)
-# skip locale subdir, included in .lang file, only valid for < 12.1 as 12.1 detects only in /usr/share/locale
-%if 0%{?suse_version} < 1210
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/locale
+%dir %{_datadir}/%{name}/locale/*
+%dir %{_datadir}/%{name}/locale/*/LC_MESSAGES
 %{_datadir}/%{name}/[^l]*
-%else
-%{_datadir}/%{name}
-%endif
 
 %changelog