rpms/widelands/devel widelands-boost.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 widelands.flagfix.patch, 1.5, 1.6 widelands.spec, 1.14, 1.15

Fri Jan 15 17:50:31 UTC 2010

Author: jwrdegoede

Update of /cvs/pkgs/rpms/widelands/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11267

Modified Files:
	.cvsignore sources widelands.flagfix.patch widelands.spec 
Added Files:
	widelands-boost.patch 
Log Message:
* Fri Jan 15 2010 Hans de Goede <hdegoede at redhat.com> - 0-0.16.Build14
- Rebase to new upstream release Build14
- Fix FTBFS (#511430)


widelands-boost.patch:
 picture.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE widelands-boost.patch ---
diff -up widelands/src/graphic/picture.h~ widelands/src/graphic/picture.h
--- widelands/src/graphic/picture.h~	2009-06-14 18:49:06.000000000 +0200
+++ widelands/src/graphic/picture.h	2010-01-15 16:48:20.000000000 +0100
@@ -17,12 +17,13 @@
  *
  */
 
-#define BOOST_SP_DISABLE_THREADS
-#include <boost/shared_ptr.hpp>
 #include <stdint.h>
 
 #ifndef PICTURE_ID
 #define PICTURE_ID
+
+#include <boost/shared_ptr.hpp>
+
 struct Picture;
 typedef boost::shared_ptr<Picture> PictureID;
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	4 Dec 2008 21:40:11 -0000	1.6
+++ .cvsignore	15 Jan 2010 17:50:31 -0000	1.7
@@ -1 +1 @@
-Widelands-Build13-src.tar.bz2
+Widelands-Build14-src.7z


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	4 Dec 2008 21:40:12 -0000	1.6
+++ sources	15 Jan 2010 17:50:31 -0000	1.7
@@ -1 +1 @@
-5e39f80b668d303abf693c48afa0c4bc  Widelands-Build13-src.tar.bz2
+06d63783b82b68af7af26198bc0a5afa  Widelands-Build14-src.7z

widelands.flagfix.patch:
 scons_configure.py |   30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

Index: widelands.flagfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.flagfix.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- widelands.flagfix.patch	16 Nov 2008 18:03:19 -0000	1.5
+++ widelands.flagfix.patch	15 Jan 2010 17:50:31 -0000	1.6
@@ -1,7 +1,7 @@
-diff -up ./build/scons-tools/scons_configure.py.flagfix ./build/scons-tools/scons_configure.py
---- ./build/scons-tools/scons_configure.py.flagfix	2008-10-05 16:59:26.000000000 +0200
-+++ ./build/scons-tools/scons_configure.py	2008-11-06 16:21:27.000000000 +0100
-@@ -435,28 +435,7 @@ def do_configure_compiler_warnings(conf,
+diff -up widelands/build/scons-tools/scons_configure.py.orig widelands/build/scons-tools/scons_configure.py
+--- widelands/build/scons-tools/scons_configure.py.orig	2009-09-27 15:17:12.000000000 +0200
++++ widelands/build/scons-tools/scons_configure.py	2010-01-15 14:18:05.000000000 +0100
+@@ -465,33 +465,7 @@ def do_configure_compiler_warnings(conf,
  	#conf.CheckCompilerFlag('-Werror', env)
  
  def do_configure_compiler_features(conf, env):
@@ -9,16 +9,21 @@ diff -up ./build/scons-tools/scons_confi
 -	conf.CheckCompilerFlag('-fbounds-check', env)
 -	conf.CheckCompilerFlag('-pipe', env)
 -
--	if env.optimize:
--		# !!!! -fomit-frame-pointer breaks execeptions !!!!
--		conf.CheckCompilerFlag('-fexpensive-optimizations', env)
--		conf.CheckCompilerFlag('-finline-functions', env)
--		conf.CheckCompilerFlag('-ffast-math', env)
--		conf.CheckCompilerFlag('-funroll-loops', env)
--		conf.CheckCompilerFlag('-O3', env)
+-	import platform
+-	if (platform.architecture()[0] == '64bit'):
+-		# Some stuff for 64bit architectures:
+-		conf.CheckCompilerFlag('-m64', env)
 -	else:
--		conf.CheckCompilerFlag('-O0', env)
--		conf.CheckCompilerFlag('-funit-at-a-time', env)
+-		if env.optimize: # no optimization on 64bit atm - leads to segfaults
+-			 # !!!! -fomit-frame-pointer breaks exceptions !!!!
+-			 conf.CheckCompilerFlag('-fexpensive-optimizations', env)
+-			 conf.CheckCompilerFlag('-finline-functions', env)
+-			 conf.CheckCompilerFlag('-ffast-math', env)
+-			 conf.CheckCompilerFlag('-funroll-loops', env)
+-			 conf.CheckCompilerFlag('-O3', env)
+-		else:
+-			 conf.CheckCompilerFlag('-O0', env)
+-			 conf.CheckCompilerFlag('-funit-at-a-time', env)
 -
 -	if env.profile:
 -		conf.CheckCompilerFlag('-pg', env)
@@ -31,7 +36,7 @@ diff -up ./build/scons-tools/scons_confi
  
  def do_configure_linker_features(conf, env):
  	if env.profile:
-@@ -474,7 +453,7 @@ def do_configure(conf, env):
+@@ -509,7 +483,7 @@ def do_configure(conf, env):
  
  	do_configure_compiler_warnings(conf, env)
  	do_configure_compiler_features(conf, env)


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- widelands.spec	27 Jul 2009 07:15:45 -0000	1.14
+++ widelands.spec	15 Jan 2010 17:50:31 -0000	1.15
@@ -1,19 +1,20 @@
-%define build_id Build13
+%define build_id Build14
 Name:           widelands
 Version:        0
-Release:        0.15.%{build_id}%{?dist}
+Release:        0.16.%{build_id}%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.widelands.org
-Source0:        http://prdownloads.sourceforge.net/%{name}/Widelands-%{build_id}-src.tar.bz2
+Source0:        http://downloads.sourceforge.net/%{name}/Widelands-%{build_id}-src.7z
 Patch0:         widelands.flagfix.patch
+Patch1:         widelands-boost.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel SDL_gfx-devel
-BuildRequires: desktop-file-utils scons gettext libpng-devel zlib-devel ctags boost-devel 
-BuildRequires: optipng
+BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel
+BuildRequires: SDL_gfx-devel boost-devel ggz-base-libs-devel libpng-devel
+BuildRequires: desktop-file-utils scons gettext ctags optipng p7zip
 
 Requires:      hicolor-icon-theme
 
@@ -25,14 +26,23 @@ perhaps will have a thought, what Widela
 
 
 %prep
-%setup -q -n %{name}-b13
-%patch0 -p0
+%setup -q -c -T
+7za x %{SOURCE0}
+pushd %{name}
+%patch0 -p1
+%patch1 -p1
 sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
+popd
+
 
 %build
+pushd %{name}
 scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale install_prefix= prefer_localdata=0 build_id=%{build_id} %{?_smp_mflags}
+popd
+
 
 %install
+pushd %{name}
 rm -rf $RPM_BUILD_ROOT
 scons datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} localedir=$RPM_BUILD_ROOT%{_datadir}/%{name}/locale build_id=%{build_id} install
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
@@ -55,13 +65,17 @@ desktop-file-install --vendor="fedora"  
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/   \
         %{name}.desktop
 
-cd $RPM_BUILD_ROOT
-find usr/share/widelands/locale/ -maxdepth 1 -type d -name \*_\* | sed -n 's#\(usr/share/widelands/\(.*\)_.*\)#%lang(\2) /\1#p' >  %{_builddir}/%{name}-b13/%{name}.files
-find usr/share/widelands/ -mindepth 1 -maxdepth 1 -type d -not -name locale | sed -n 's#\(usr/share/widelands/*\)#/\1#p' >>  %{_builddir}/%{name}-b13/%{name}.files
+popd
+pushd $RPM_BUILD_ROOT
+find usr/share/widelands/locale/ -maxdepth 1 -type d -name \*_\* | sed -n 's#\(usr/share/widelands/\(.*\)_.*\)#%lang(\2) /\1#p' > %{_builddir}/%{name}-%{version}/%{name}.files
+find usr/share/widelands/ -mindepth 1 -maxdepth 1 -not -name locale | sed -n 's#\(usr/share/widelands/*\)#/\1#p' >> %{_builddir}/%{name}-%{version}/%{name}.files
+popd
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
 # preparing system before update
 cat << EOF | while read name; do rm -rf "%{_datadir}/widelands/maps/${name}.wmf"; done
@@ -96,16 +110,22 @@ if [ -x %{_bindir}/gtk-update-icon-cache
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+
 %files -f %{name}.files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING CREDITS
+%doc %{name}/ChangeLog %{name}/COPYING %{name}/CREDITS
 %{_bindir}/%{name}
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/locale
 
+
 %changelog
+* Fri Jan 15 2010 Hans de Goede <hdegoede at redhat.com> - 0-0.16.Build14
+- Rebase to new upstream release Build14
+- Fix FTBFS (#511430)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.15.Build13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

