rpms/widelands/F-8 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 widelands.flagfix.patch, 1.3, 1.4 widelands.spec, 1.5, 1.6

[Karol Trzcionka (karlik)]

Author: karlik

Update of /cvs/pkgs/rpms/widelands/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22415/F-8

Modified Files:
	.cvsignore sources widelands.flagfix.patch widelands.spec 
Log Message:
Update to build-12



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Sep 2007 14:57:01 -0000	1.3
+++ .cvsignore	9 Apr 2008 18:36:07 -0000	1.4
@@ -1 +1 @@
-widelands-build-11-source.tar.bz2
+widelands-build-12-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Sep 2007 14:57:01 -0000	1.3
+++ sources	9 Apr 2008 18:36:07 -0000	1.4
@@ -1 +1 @@
-ad41d917f7895b6212009ac584178b55  widelands-build-11-source.tar.bz2
+1b551106e0f613f63abd7e6bdc9cebf6  widelands-build-12-source.tar.bz2

widelands.flagfix.patch:

Index: widelands.flagfix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-8/widelands.flagfix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- widelands.flagfix.patch	10 Sep 2007 14:57:01 -0000	1.3
+++ widelands.flagfix.patch	9 Apr 2008 18:36:07 -0000	1.4
@@ -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 @@
 -	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)


Index: widelands.spec
===================================================================
RCS file: /cvs/pkgs/rpms/widelands/F-8/widelands.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- widelands.spec	17 Sep 2007 16:15:01 -0000	1.5
+++ widelands.spec	9 Apr 2008 18:36:07 -0000	1.6
@@ -1,7 +1,7 @@
-%define build_id build-11
+%define build_id build-12
 Name:           widelands
 Version:        0
-Release:        0.7.build11%{?dist}
+Release:        0.10.build12%{?dist}
 Summary:        Open source realtime-strategy game
 
 Group:          Amusements/Games
@@ -38,19 +38,18 @@
 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
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 cat > widelands.desktop <<EOF
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Name=Widelands
 GenericName=Realtime Strategy Game
 Comment=Build a growing settlement and rule the world
-Icon=widelands.png
+Icon=widelands
 Exec=widelands
 Categories=Game;StrategyGame;
 EOF
@@ -58,7 +57,6 @@
 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
@@ -111,6 +109,13 @@
 %{_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
+- Rebuild for gcc43
+- Changes in desktop file
 * Mon Sep 17 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.7.build11
 - Fix update problems
 * Mon Sep 10 2007 Karol Trzcionka <karlikt at gmail.com> - 0-0.6.build11