pool/widelands
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- updated to build 14

Browse Source 
- Fixed spec file to actiually build release 13

OBS-URL: https://build.opensuse.org/package/show/games/widelands?expand=0&rev=17
This commit is contained in:
Pavol Rusnak 2010-02-20 23:24:08 +00:00 committed by Git OBS Bridge
parent 30e8b38cca
commit 76f6a6ccf2
7 changed files with 82 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Widelands-Build14-src.tar.bz2 Normal file
View File

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

33
widelands-b13-return-non-void.diff
View File

@ -1,33 +0,0 @@
diff -ur widelands-b13/src/events/event_factory.cc widelands-b13.patched//src/events/event_factory.cc
--- widelands-b13/src/events/event_factory.cc 2008-09-22 22:46:52.000000000 +0200
+++ widelands-b13.patched//src/events/event_factory.cc 2009-05-01 22:41:10.000000000 +0200
@@ -131,6 +131,7 @@
case 12: return *new Event_Unhide_Area (name, state);
default:
assert(false);
+ return *new Event_Allow_Building (name, state);
}
}
diff -ur widelands-b13/src/map.h widelands-b13.patched//src/map.h
--- widelands-b13/src/map.h 2008-10-10 22:53:46.000000000 +0200
+++ widelands-b13.patched//src/map.h 2009-05-01 22:58:33.000000000 +0200
@@ -1038,6 +1038,7 @@
case Map_Object::WALK_W: return l_n(f);
default:
assert(false);
+ return tl_n(f);
}
}
diff -ur widelands-b13/src/trigger/trigger_factory.cc widelands-b13.patched//src/trigger/trigger_factory.cc
--- widelands-b13/src/trigger/trigger_factory.cc 2008-09-22 22:46:52.000000000 +0200
+++ widelands-b13.patched//src/trigger/trigger_factory.cc 2009-05-01 22:40:23.000000000 +0200
@@ -93,6 +93,7 @@
case 5: return *new Trigger_Vision (name, set);
default:
assert(false);
+ return *new Trigger_Building (name, set);
}
}

3
widelands-build13-source.tar.bz2
View File

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

36
widelands-non-void.patch Normal file
View File

@ -0,0 +1,36 @@
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);
}
}
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);
}
}

5
widelands.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Feb 20 22:32:05 UTC 2010 - prusnak@suse.cz
- updated to build 14
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 1 22:04:14 CEST 2009 - dominique.leuenberger@tmf-group.com Fri May 1 22:04:14 CEST 2009 - dominique.leuenberger@tmf-group.com

1
widelands.desktop
View File

@ -6,4 +6,3 @@ Comment=Build a growing settlement and rule the world
Icon=widelands Icon=widelands
Exec=widelands Exec=widelands
Categories=Game;StrategyGame; Categories=Game;StrategyGame;

97
widelands.spec
View File

@ -1,23 +1,30 @@
# norootforbuild
%define build_id build13
Name: widelands Name: widelands
Version: 13 Version: 14
Release: 1 Release: 1
Summary: Open source realtime-strategy game Summary: Open source realtime-strategy game
Group: Amusements/Games Group: Amusements/Games
License: GPLv2+ License: GPLv2+
URL: http://www.widelands.org URL: http://www.widelands.org
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{build_id}-source.tar.bz2 # 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 Source1: widelands.desktop
Patch0: widelands-b13-return-non-void.diff Patch0: widelands-non-void.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
BuildRequires: gcc-c++
BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel SDL_gfx-devel BuildRequires: boost-devel
BuildRequires: update-desktop-files scons gettext libpng-devel zlib-devel ctags BuildRequires: SDL_mixer-devel
BuildRequires: gcc-c++ boost-devel fdupes BuildRequires: SDL_image-devel
BuildRequires: SDL_net-devel
BuildRequires: SDL_ttf-devel
BuildRequires: SDL_gfx-devel
BuildRequires: libpng-devel
BuildRequires: zlib-devel
BuildRequires: ggz-client-libs-devel
BuildRequires: scons
BuildRequires: gettext
BuildRequires: optipng
BuildRequires: fdupes
BuildRequires: update-desktop-files
%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
@ -25,71 +32,37 @@ 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 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. perhaps will have a thought, what Widelands is all about.
%prep %prep
%setup -q -n %{name}-b13 %setup -q -n %{name}
%patch0 -p1 %patch0 -p1
sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
%build %build
export extra_compile_flags="$RPM_OPT_FLAGS" export extra_compile_flags="$RPM_OPT_FLAGS"
scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id} scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale
# ./build-widelands.sh
%install %install
scons datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} localedir=$RPM_BUILD_ROOT%{_datadir}/%{name}/locale build_id=%{build_id} 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}/doc
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/game_server rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/game_server
for i in 16 32 48 64 128; do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps install -D -m 0644 pics/wl-ico-${i}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
cp -a pics/wl-logo-64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png done
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications %suse_update_desktop_file -i %{name}
%fdupes $RPM_BUILD_ROOT%{_datadir}
%suse_update_desktop_file -i %{name} Game StrategyGame
%fdupes $RPM_BUILD_ROOT
cd $RPM_BUILD_ROOT
find usr/share/widelands/locale/ -maxdepth 1 -type d -name \*_\* | sed -n 's#\(usr/share/widelands/locale/\(.*\)_.*\)#%lang(\2) /\1#p' > %{_builddir}/%{name}-b13/%{name}.files
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
# %%pre %files
# preparing system before update
# cat << EOF | while read name; do rm -rf "%{_datadir}/widelands/maps/${name}.wmf"; done
#Checkmate
#Dry Riverbed
#Elven Forests
#Enemy in sight
#Finlakes
#Firegames
#Four Castles
#Glacier Lake
#Golden Peninsula
#Lake of tranquility
#Plateau
#Riverlands
#The Oasis Triangle
#The big lake
#The long way
#Two frontiers
#War of the Valleys
#EOF
%files -f %{name}.files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc ChangeLog COPYING CREDITS %doc COPYING CREDITS ChangeLog
%{_bindir}/%{name} %{_bindir}/%{name}
%dir %{_datadir}/icons/hicolor
%dir %{_datadir}/icons/hicolor/64x64
%dir %{_datadir}/icons/hicolor/64x64/apps
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/locale %{_datadir}/%{name}/*
%{_datadir}/%{name}/*s* %dir %{_datadir}/icons/hicolor
%{_datadir}/%{name}/global %dir %{_datadir}/icons/hicolor/*
%dir %{_datadir}/icons/hicolor/*/apps
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%changelog %changelog