update to build17

OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=31
This commit is contained in:
Dirk Stoecker 2012-05-06 08:41:06 +00:00 committed by Git OBS Bridge
parent 973e69e824
commit 283c69a387
6 changed files with 27 additions and 17 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:457e74295a83e1dc43903c748bc740c11bf8858dee5d1b9aeb1dfd45ecc0db5e
size 3454727

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d8db3c15c30314cb220c6d79d93d3d31e7bce2722c93d2c385d643c3c669625d
size 137808494

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5
size 175547379

View File

@ -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)

View File

@ -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 Fri Nov 25 22:06:22 UTC 2011 - jengelh@medozas.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package widelands # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,13 +19,13 @@
%define build_launchpad 0 %define build_launchpad 0
Name: widelands Name: widelands
Version: build16 Version: build17
Release: 1 Release: 1
Summary: Open source realtime-strategy game Summary: Open source realtime-strategy game
Group: Amusements/Games/Strategy/Other Group: Amusements/Games/Strategy/Other
License: GPLv2+ License: GPLv2+
URL: http://www.widelands.org URL: http://www.widelands.org
Source0: %name-build16-src.tar.bz2 Source0: %name-%{version}-src.tar.bz2
Source1: %{name}.desktop Source1: %{name}.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -39,7 +39,6 @@ BuildRequires: libpng-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: ggz-client-libs-devel
BuildRequires: lua-devel BuildRequires: lua-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: cmake BuildRequires: cmake
@ -55,6 +54,7 @@ Requires: %{name}-data = %{version}
Requires: perl Requires: perl
Source2: launchpad-export.tar.gz Source2: launchpad-export.tar.gz
%endif %endif
Patch1: widelands-build17_boostfix.diff
%description %description
Widelands is an open source (GPLed), realtime-strategy game, using SDL and 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 %prep
%setup -q -n %{name}-%version-src %setup -q -n %{name}-%version-src
%patch1 -p1
%if %build_launchpad %if %build_launchpad
# for launchpad translation update # for launchpad translation update
cd .. cd ..
@ -86,10 +87,8 @@ find po -name "*.po" |perl -ne 'chomp;$a=$_;$a=~s{/[^/]*-}{/}; rename $_,"widela
mkdir -p build/locale mkdir -p build/locale
cd build cd build
# -DWL_VERSION=%{version} to skip revision check, should be removed for final release
cmake \ cmake \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DWL_VERSION=%{version} \
-DWL_INSTALL_PREFIX=%{_prefix} \ -DWL_INSTALL_PREFIX=%{_prefix} \
-DWL_INSTALL_BINDIR=bin \ -DWL_INSTALL_BINDIR=bin \
-DWL_INSTALL_DATADIR=share/%{name} \ -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 %files data -f %{name}.lang
%defattr(-,root,root,-) %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}
%dir %{_datadir}/%{name}/locale %dir %{_datadir}/%{name}/locale
%dir %{_datadir}/%{name}/locale/*
%dir %{_datadir}/%{name}/locale/*/LC_MESSAGES
%{_datadir}/%{name}/[^l]* %{_datadir}/%{name}/[^l]*
%else
%{_datadir}/%{name}
%endif
%changelog %changelog