- updated to build 15

OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=20
This commit is contained in:
Pavol Rusnak 2010-04-28 16:09:31 +00:00 committed by Git OBS Bridge
parent 364aac34f3
commit 31eaf09985
6 changed files with 81 additions and 66 deletions

View File

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

View File

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

13
widelands-localedir.patch Normal file
View File

@ -0,0 +1,13 @@
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -79,7 +79,7 @@ set (WL_SOURCE_CHECKER ${CMAKE_CURRENT_S
set (WLBUILD_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
set (WLBUILD_INSTALL_DATADIR ${WL_INSTALL_DATADIR})
-set (WLBUILD_INSTALL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${WL_INSTALL_DATADIR}/locale")
+set (WLBUILD_INSTALL_LOCALEDIR ${WL_INSTALL_LOCALEDIR})
set (WLBUILD_INSTALL_BINDIR ${WL_INSTALL_BINDIR})
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)

View File

@ -1,44 +0,0 @@
Index: widelands/src/events/event_factory.cc
===================================================================
--- widelands.orig/src/events/event_factory.cc
+++ widelands/src/events/event_factory.cc
@@ -147,6 +147,7 @@ Event & create
case 12: return *new Event_Unhide_Area (name, state);
default:
assert(false);
+ return *new Event_Allow_Building (name, state);
}
}
@@ -184,6 +185,7 @@ Event & create(Section & s, Editor_Game_
case 12: return *new Event_Unhide_Area (s, egbase);
default:
assert(false);
+ return *new Event_Allow_Building (s, egbase);
}
}
Index: widelands/src/map.h
===================================================================
--- widelands.orig/src/map.h
+++ widelands/src/map.h
@@ -1062,6 +1062,7 @@ throw ()
case Map_Object::WALK_W: return l_n(f);
default:
assert(false);
+ return tl_n(f);
}
}
Index: widelands/src/trigger/trigger_factory.cc
===================================================================
--- widelands.orig/src/trigger/trigger_factory.cc
+++ widelands/src/trigger/trigger_factory.cc
@@ -99,6 +99,7 @@ Trigger & create(size_t const id, char c
case 5: return *new Trigger_Vision (name, set);
default:
assert(false);
+ return *new Trigger_Building (name, set);
}
}

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Apr 28 15:24:35 CEST 2010 - prusnak@suse.cz
- updated to build 15
-------------------------------------------------------------------
Sat Feb 20 22:32:05 UTC 2010 - prusnak@suse.cz

View File

@ -1,14 +1,13 @@
Name: widelands
Version: 14
Version: 15
Release: 1
Summary: Open source realtime-strategy game
Group: Amusements/Games
License: GPLv2+
URL: http://www.widelands.org
# repacked from http://dl.sourceforge.net/project/widelands/widelands/build-14/Widelands-Build14-src.7z
Source0: Widelands-Build%{version}-src.tar.bz2
Source1: widelands.desktop
Patch0: widelands-non-void.patch
Source0: http://launchpad.net/widelands/build%{version}/build%{version}/+download/%{name}-build%{version}-src.tar.bz2
Source1: %{name}.desktop
Patch0: %{name}-localedir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
BuildRequires: gcc-c++
BuildRequires: boost-devel
@ -18,13 +17,19 @@ BuildRequires: SDL_net-devel
BuildRequires: SDL_ttf-devel
BuildRequires: SDL_gfx-devel
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: zlib-devel
BuildRequires: ggz-client-libs-devel
BuildRequires: scons
BuildRequires: lua-devel
BuildRequires: python-devel
BuildRequires: cmake
BuildRequires: gettext
BuildRequires: optipng
BuildRequires: fdupes
BuildRequires: doxygen
BuildRequires: update-desktop-files
Requires: %{name}-data = %{version}
%description
Widelands is an open source (GPLed), realtime-strategy game, using SDL and
@ -32,22 +37,46 @@ other free libraries, which is still under development. Widelands is inspired
by Settlers II (Bluebyte) and is partly similar to it, so if you know it, you
perhaps will have a thought, what Widelands is all about.
%package data
Summary: Data files for Widelands
Group: Amusements/Games
License: GPLv2+
Requires: %{name} = %{version}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%description data
Data files for Widelands.
%prep
%setup -q -n %{name}
%patch0 -p1
%setup -q -n %{name}-build%{version}-src
%patch0
%build
export extra_compile_flags="$RPM_OPT_FLAGS"
scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale
# recreate build_and_run.sh contents here
mkdir -p build/compile/locale
ln -s build/compile/locale
cd build/compile
cmake \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DWL_INSTALL_PREFIX=%{_prefix} \
-DWL_INSTALL_BINDIR=%{_bindir} \
-DWL_INSTALL_DATADIR=%{_datadir}/%{name} \
-DWL_INSTALL_LOCALEDIR=%{_datadir}/%{name}/locale \
-DBUILD_SHARED_LIBS=ON \
-DBoost_USE_STATIC_LIBS=OFF \
../..
make %{?_smp_mflags}
%install
scons datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} localedir=$RPM_BUILD_ROOT%{_datadir}/%{name}/locale install
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/game_server
cd build/compile
make DESTDIR=$RPM_BUILD_ROOT install
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 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
done
%suse_update_desktop_file -i %{name}
install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
%suse_update_desktop_file %{name}
%fdupes $RPM_BUILD_ROOT%{_datadir}
%clean
@ -57,12 +86,24 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc COPYING CREDITS ChangeLog
%{_bindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%dir %{_datadir}/icons/hicolor
%dir %{_datadir}/icons/hicolor/*
%dir %{_datadir}/icons/hicolor/*/apps
%dir %{_datadir}/icons/hicolor/128x128
%dir %{_datadir}/icons/hicolor/128x128/apps
%dir %{_datadir}/icons/hicolor/16x16
%dir %{_datadir}/icons/hicolor/16x16/apps
%dir %{_datadir}/icons/hicolor/32x32
%dir %{_datadir}/icons/hicolor/32x32/apps
%dir %{_datadir}/icons/hicolor/48x48
%dir %{_datadir}/icons/hicolor/48x48/apps
%dir %{_datadir}/icons/hicolor/64x64
%dir %{_datadir}/icons/hicolor/64x64/apps
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%files data
%defattr(-,root,root,-)
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%changelog