From 1e82a3e42a45036e31518d25bd85a82598db9649 Mon Sep 17 00:00:00 2001
From: Karol Trzcionka <karlik@fedoraproject.org>
Date: Apr 09 2008 18:36:27 +0000
Subject: Update to build-12


---

diff --git a/.cvsignore b/.cvsignore
index 65d44d3..412b09b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-widelands-build-11-source.tar.bz2
+widelands-build-12-source.tar.bz2
diff --git a/sources b/sources
index 2f629fb..436bdd1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad41d917f7895b6212009ac584178b55  widelands-build-11-source.tar.bz2
+1b551106e0f613f63abd7e6bdc9cebf6  widelands-build-12-source.tar.bz2
diff --git a/widelands.flagfix.patch b/widelands.flagfix.patch
index 297f813..8e54226 100644
--- a/widelands.flagfix.patch
+++ b/widelands.flagfix.patch
@@ -1,42 +1,13 @@
 diff -up ./build/scons-tools/scons_configure.py.flagfix ./build/scons-tools/scons_configure.py
---- ./build/scons-tools/scons_configure.py.flagfix	2007-06-03 17:17:45.000000000 +0200
-+++ ./build/scons-tools/scons_configure.py	2007-09-08 00:03:37.000000000 +0200
-@@ -263,58 +263,4 @@ def do_configure(config_h_file, conf, en
- 			print 'Could not find efence, so doing a debug-efence build is impossible !'
- 			env.Exit(1)
+--- ./build/scons-tools/scons_configure.py.flagfix	2008-04-06 20:39:50.000000000 +0200
++++ ./build/scons-tools/scons_configure.py	2008-04-06 20:40:32.000000000 +0200
+@@ -440,35 +440,7 @@ def do_configure_compiler_warnings(confi
+ 	#conf.CheckCompilerFlag('-Werror', env)
  
+ def do_configure_compiler_features(config_h_file, conf, env):
 -	conf.CheckCompilerFlag('-fstack-protector-all', env)
 -	conf.CheckCompilerFlag('-fbounds-check', env)
 -	conf.CheckCompilerFlag('-pipe', env)
--	conf.CheckCompilerFlag('-Wall', env)
--	conf.CheckCompilerFlag('-Wcast-align', env)
--	conf.CheckCompilerFlag('-Wcast-qual', env)
--	conf.CheckCompilerFlag('-Wconversion', env)
--	conf.CheckCompilerFlag('-Wdisabled-optimization', env)
--	conf.CheckCompilerFlag('-Wextra', env)
--	#conf.CheckCompilerFlag('-Wfloat-equal', env)
--	#conf.CheckCompilerFlag('-Wformat=2', env)
--	conf.CheckCompilerFlag('-Winline', env)
--	conf.CheckCompilerFlag('-Winvalid-pch', env)
--	conf.CheckCompilerFlag('-Wmissing-format-attribute', env)
--	conf.CheckCompilerFlag('-Wmissing-include-dirs', env)
--	conf.CheckCompilerFlag('-Wmissing-noreturn', env)
--	conf.CheckCompilerFlag('-Wno-comment', env)
--	conf.CheckCompilerFlag('-Wnormalized=nfc', env)
--	#conf.CheckCompilerFlag('-Wold-style-cast', env)
--	#conf.CheckCompilerFlag('-Wpadded', env)
--	conf.CheckCompilerFlag('-Wpointer-arith', env)
--	conf.CheckCompilerFlag('-Wunsafe-loop-optimizations', env)
--	conf.CheckCompilerFlag('-Wshadow', env)
--	conf.CheckCompilerFlag('-Wstack-protector', env)
--	conf.CheckCompilerFlag('-Wstrict-aliasing=2', env)
--	#conf.CheckCompilerFlag('-Wunreachable-code', env)
--	conf.CheckCompilerFlag('-Wwrite-strings', env)
--
--	#conf.CheckCompilerFlag('-Wno-deprecated-declarations', env)
--	#conf.CheckCompilerFlag('-Wno-unused-variable', env)
--	#conf.CheckCompilerFlag('-Wno-unused-parameter', env)
--	#conf.CheckCompilerFlag('-Werror', env)
 -
 -	if env.optimize:
 -		# !!!! -fomit-frame-pointer breaks execeptions !!!!
@@ -51,14 +22,27 @@ diff -up ./build/scons-tools/scons_configure.py.flagfix ./build/scons-tools/scon
 -	if env.profile:
 -		conf.CheckCompilerFlag('-pg', env)
 -		conf.CheckCompilerFlag('-fprofile-arcs', env)
--		conf.CheckLinkerFlag('-pg', env)
--		conf.CheckLinkerFlag('-fprofile-arcs', env)
 -
 -	if env.debug:
 -		conf.CheckCompilerFlag('-g', env)
 -		conf.CheckCompilerFlag('-fmessage-length=0', env)
 -
+-def do_configure_linker_features(config_h_file, conf, env):
+-	if env.profile:
+-		conf.CheckLinkerFlag('-pg', env)
+-		conf.CheckLinkerFlag('-fprofile-arcs', env)
+-
 -	if env.strip:
 -		conf.CheckLinkerFlag('-s', env)
 +	conf.CheckCompilerFlag('flagi', env)
-
+ 
+ def do_configure(conf, env):
+ 	config_h_file=write_configh_header()
+@@ -480,7 +452,6 @@ def do_configure(conf, env):
+ 
+ 	do_configure_compiler_warnings(config_h_file, conf, env)
+ 	do_configure_compiler_features(config_h_file, conf, env)
+-	do_configure_linker_features(config_h_file, conf, env)
+ 
+ 	write_configh(config_h_file, env)
+ 	write_configh_footer(config_h_file)
diff --git a/widelands.spec b/widelands.spec
index 1db9b78..3acc133 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -1,7 +1,7 @@
-%define build_id build-11
+%define build_id build-12
 Name:           widelands
 Version:        0
-Release:        0.9.build11%{?dist}
+Release:        0.10.build12%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
@@ -30,19 +30,6 @@ perhaps will have a thought, what Widelands is all about.
 %setup -q -n %{name}
 %patch0 -p0
 sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
-#begin porting to gcc43
-find src -type f -exec sed -i 's/#include <string>/#include <string>\n#include <cstring>/' {} \; ;
-sed -i 's/#include <stdexcept>/#include <stdexcept>\n#include <typeinfo>/' src/main.cc
-sed -i 's/#include <algorithm>/#include <algorithm>\n#include <climits>/' src/network.cc
-sed -i 's/#include <vector>/#include <vector>\n#include <algorithm>/' src/text_parser.cc
-sed -i 's/user_info(std::string name, std::string name, std::string room)/user_info(std::string user, std::string game, std::string room)/' src/ui/ui_fs_menus/fullscreen_menu_inet_lobby.h
-sed -i 's/#include <cstdarg>/#include <cstdarg>\n#include <algorithm>/' src/transport.cc
-sed -i 's/#include <set>/#include <set>\n#include <algorithm>/' src/editor_game_base.cc
-sed -i 's/std::abs/abs/' src/ui/ui_basic/ui_window.cc
-sed -i 's/#include <vector>/#include <vector>\n#include <climits>\n#include <cstdlib>/' src/editor/tools/multi_select.h
-sed -i 's/#include <vector>/#include <vector>\n#include <climits>\n#include <cstdlib>/' src/filesystem/filesystem.cc
-sed -i 's/#include <cstring>/#include <cstring>\n#include <cstdlib>/' src/filesystem/zip_filesystem.cc
-#end
 
 %build
 scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id}
@@ -51,7 +38,7 @@ scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_d
 rm -rf $RPM_BUILD_ROOT
 scons datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} localedir=$RPM_BUILD_ROOT%{_datadir}/%{name} build_id=%{build_id} install
 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
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
 cp -a pics/wl-logo-64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
@@ -70,7 +57,6 @@ EOF
 desktop-file-install --vendor="fedora"                \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/   \
         %{name}.desktop
-#  --delete-original                                        \
 
 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}/%{name}.files
@@ -123,6 +109,8 @@ fi
 %{_datadir}/%{name}/*s*
 
 %changelog
+* Wed Apr 09 2008 Karol Trzcionka <karlikt at gmail.com> - 0-0.10.build12
+- Update to build12
 * Sun Feb 10 2008 Karol Trzcionka <karlikt at gmail.com> - 0-0.9.build11
 - Fix building with gcc43
 * Sat Feb 09 2008 Karol Trzcionka <karlikt at gmail.com> - 0-0.8.build11