Accepting request 55226 from home:dstoecker

OBS-URL: https://build.opensuse.org/request/show/55226
OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=26
This commit is contained in:
Pavol Rusnak 2010-12-08 17:27:41 +00:00 committed by Git OBS Bridge
parent 9ce1b235a6
commit 3e8a6358ee
6 changed files with 37 additions and 69 deletions

3
launchpad-export.tar.gz Normal file
View File

@ -0,0 +1,3 @@
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:99cfc86318e74a9abfe85493bf0a072d7ac99d9a3cdaa44922e9a5e027d1be03
size 107471022

View File

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

View File

@ -1,53 +0,0 @@
Index: src/editor/ui_menus/editor_main_menu_new_map.cc
===================================================================
--- src/editor/ui_menus/editor_main_menu_new_map.cc.orig
+++ src/editor/ui_menus/editor_main_menu_new_map.cc
@@ -113,7 +113,7 @@ Main_Menu_New_Map::Main_Menu_New_Map(Edi
posx, posy, width, height,
g_gr->get_picture(PicMod_UI, "pics/but1.png"),
&Main_Menu_New_Map::button_clicked, *this, 4,
- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
posy += height + spacing + spacing + spacing;
@@ -142,7 +142,7 @@ void Main_Menu_New_Map::button_clicked(i
if (m_currentworld == m_worlds.size())
m_currentworld = 0;
m_world->set_title
- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name
+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name
());
break;
}
Index: src/editor/ui_menus/editor_main_menu_random_map.cc
===================================================================
--- src/editor/ui_menus/editor_main_menu_random_map.cc.orig
+++ src/editor/ui_menus/editor_main_menu_random_map.cc
@@ -272,7 +272,7 @@ Main_Menu_New_Random_Map::Main_Menu_New_
posx, posy, width, height,
g_gr->get_picture(PicMod_UI, "pics/but1.png"),
&Main_Menu_New_Random_Map::button_clicked, *this, 8,
- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
posy += height + spacing + spacing + spacing;
@@ -343,7 +343,7 @@ void Main_Menu_New_Random_Map::button_cl
if (m_currentworld == m_worlds.size())
m_currentworld = 0;
m_world->set_title
- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
break;
case 9:
break;
@@ -476,7 +476,7 @@ void Main_Menu_New_Random_Map::id_edit_b
(strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str()))
++m_currentworld;
m_world->set_title
- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
button_clicked(-1); // Update other values in UI as well

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 17 18:11:10 UTC 2010 - opensuse@dstoecker.de
- update to daily source version 2010-11-17 (bzr revision 5723)
-------------------------------------------------------------------
Wed Apr 28 15:24:35 CEST 2010 - prusnak@suse.cz

View File

@ -1,14 +1,15 @@
%define build_launchpad 1
Name: widelands
Version: 15
Version: 2010_12_01_r5763
Release: 1
Summary: Open source realtime-strategy game
Group: Amusements/Games
License: GPLv2+
URL: http://www.widelands.org
Source0: http://launchpad.net/widelands/build%{version}/build%{version}/+download/%{name}-build%{version}-src.tar.bz2
Source0: %{name}-bzr-%{version}-src.tar.bz2
Source1: %{name}.desktop
Patch0: %{name}-localedir.patch
Patch1: %{name}-constructor.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
BuildRequires: gcc-c++
BuildRequires: boost-devel
@ -31,6 +32,11 @@ BuildRequires: fdupes
BuildRequires: doxygen
BuildRequires: update-desktop-files
Requires: %{name}-data = %{version}
%if %build_launchpad
# for launchpad translation update
Requires: perl
Source2: launchpad-export.tar.gz
%endif
%description
Widelands is an open source (GPLed), realtime-strategy game, using SDL and
@ -51,30 +57,37 @@ BuildArch: noarch
Data files for Widelands.
%prep
%setup -q -n %{name}-build%{version}-src
%setup -q -n %{name}
%patch0
%patch1
%if %build_launchpad
# for launchpad translation update
cd ..
tar -xzf %SOURCE2
find po -name "*.po" |perl -ne 'chomp;$a=$_;$a=~s/\/[^\/]*-/\//; rename $_,"widelands/$a";'
%endif
%build
# recreate build_and_run.sh contents here
mkdir -p build/compile/locale
ln -s build/compile/locale
cd build/compile
# recreate compile.sh contents here
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} \
-DWL_INSTALL_LOCALEDIR=%{_datadir}/%{name}/locale \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_TYPE="Release" \
-DBoost_USE_STATIC_LIBS=OFF \
../..
..
make %{?_smp_mflags}
%install
cd build/compile
cd build
make DESTDIR=$RPM_BUILD_ROOT install
cd ../..
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
done