rpms/widelands/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 widelands.flagfix.patch, 1.2, 1.3 widelands.spec, 1.3, 1.4 widelands.scons.patch, 1.1, NONE widelands.workfix.patch, 1.1, NONE

[Karol Trzcionka (karlik)]

Author: karlik

Update of /cvs/pkgs/rpms/widelands/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11237/widelands/devel

Modified Files:
	.cvsignore sources widelands.flagfix.patch widelands.spec 
Removed Files:
	widelands.scons.patch widelands.workfix.patch 
Log Message:
Upgrade to build-11



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 May 2007 09:29:12 -0000	1.2
+++ .cvsignore	10 Sep 2007 14:57:01 -0000	1.3
@@ -1 +1 @@
-widelands-build10-source.tar.bz2
+widelands-build-11-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 May 2007 09:29:12 -0000	1.2
+++ sources	10 Sep 2007 14:57:01 -0000	1.3
@@ -1 +1 @@
-9e452baf7b8f22a27b4e371e2150e017  widelands-build10-source.tar.bz2
+ad41d917f7895b6212009ac584178b55  widelands-build-11-source.tar.bz2

widelands.flagfix.patch:

Index: widelands.flagfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.flagfix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- widelands.flagfix.patch	26 Aug 2007 00:26:10 -0000	1.2
+++ widelands.flagfix.patch	10 Sep 2007 14:57:01 -0000	1.3
@@ -1,10 +1,12 @@
---- ./build/scons-tools/scons_configure.py.flagfix	2007-08-25 13:36:07.000000000 +0200
-+++ ./build/scons-tools/scons_configure.py	2007-08-25 13:47:16.000000000 +0200
-@@ -259,57 +259,4 @@ def do_configure(config_h_file, conf, en
+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)
  
 -	conf.CheckCompilerFlag('-fstack-protector-all', env)
+-	conf.CheckCompilerFlag('-fbounds-check', env)
 -	conf.CheckCompilerFlag('-pipe', env)
 -	conf.CheckCompilerFlag('-Wall', env)
 -	conf.CheckCompilerFlag('-Wcast-align', env)
@@ -59,3 +61,4 @@
 -	if env.strip:
 -		conf.CheckLinkerFlag('-s', env)
 +	conf.CheckCompilerFlag('flagi', env)
+


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/devel/widelands.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- widelands.spec	26 Aug 2007 00:26:10 -0000	1.3
+++ widelands.spec	10 Sep 2007 14:57:01 -0000	1.4
@@ -1,19 +1,17 @@
-%define build_id build10
+%define build_id build-11
 Name:           widelands
 Version:        0
-Release:        0.5.%{build_id}%{?dist}
+Release:        0.6.build11%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://www.widelands.org
 Source0:        http://prdownloads.sourceforge.net/%{name}/%{name}-%{build_id}-source.tar.bz2
-Patch0:         widelands.workfix.patch
-Patch1:         widelands.flagfix.patch
-Patch2:         widelands.scons.patch
+Patch0:         widelands.flagfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: SDL_mixer-devel SDL_image-devel SDL_net-devel SDL_ttf-devel
+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 
 %ifnarch ppc64
 BuildRequires: optipng
@@ -31,19 +29,14 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
-sed -i 's#LOCALE_PATH "locale"#LOCALE_PATH "%{_datadir}/%{name}/locale"##' src/constants.h
 sed -i 's#flagi#%{optflags}##' build/scons-tools/scons_configure.py
-sed -i 's#doc#txts##' txts/SConscript
 
 %build
-scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}
-scons locale datadir=%{_datadir}/%{name} bindir=%{_bindir} build_id=%{build_id}
+scons build=release datadir=%{_datadir}/%{name} bindir=%{_bindir} localedir=%{_datadir}/%{name}/locale build_id=%{build_id}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons install datadir=$RPM_BUILD_ROOT%{_datadir}/%{name} bindir=$RPM_BUILD_ROOT%{_bindir} build_id=%{build_id}
+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
 
@@ -75,11 +68,15 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
@@ -92,6 +89,8 @@
 %{_datadir}/%{name}/*s*
 
 %changelog
+* Mon Sep 10 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.6.build11
+- Upgrade to build-11
 * Sat Aug 25 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.5.build10
 - Patching for compatibility with scons 0.97
 * Tue May 08 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.4.build10


--- widelands.scons.patch DELETED ---


--- widelands.workfix.patch DELETED ---