rpms/hedgewars/devel hedgewars-0.9.0-debuginfo.patch, 1.4, 1.5 hedgewars.spec, 1.24, 1.25

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/hedgewars/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27138

Modified Files:
	hedgewars-0.9.0-debuginfo.patch hedgewars.spec 
Log Message:
* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 0.9.12-2
- Use RPM_OPT_FLAGS when building c++ code and pass -g to fpc (#542000)


hedgewars-0.9.0-debuginfo.patch:
 hedgewars-src-0.9.12/hedgewars/CMakeLists.txt |    2 +-
 hedgewars-src-0.9.7/CMakeLists.txt            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: hedgewars-0.9.0-debuginfo.patch
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars-0.9.0-debuginfo.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- hedgewars-0.9.0-debuginfo.patch	4 Nov 2008 10:11:49 -0000	1.4
+++ hedgewars-0.9.0-debuginfo.patch	1 Dec 2009 14:11:25 -0000	1.5
@@ -10,3 +10,15 @@ diff -up hedgewars-src-0.9.7/CMakeLists.
  endif(WIN32 AND NOT UNIX)
  
  set(CPACK_SOURCE_IGNORE_FILES
+diff -up hedgewars-src-0.9.12/hedgewars/CMakeLists.txt~ hedgewars-src-0.9.12/hedgewars/CMakeLists.txt
+--- hedgewars-src-0.9.12/hedgewars/CMakeLists.txt~	2009-10-18 18:55:53.000000000 +0200
++++ hedgewars-src-0.9.12/hedgewars/CMakeLists.txt	2009-12-01 15:06:23.000000000 +0100
+@@ -96,7 +96,7 @@ endif (NOT pascal_compiler)
+ set(pascal_compiler_flags ${noexecstack_flags} "-B" "-FE../bin" "-Fl../bin/" "-Cs2000000" "-vwi" ${hwengine_project})
+ 
+ if(OPTIMIZATIONS)
+-	set(pascal_compiler_flags "-O2" "-Xs" "-Nu" ${pascal_compiler_flags})
++	set(pascal_compiler_flags "-g" "-O2" "-Xs" "-Nu" ${pascal_compiler_flags})
+ 	if(APPLE AND NOT universal_build)
+ 		set(pascal_compiler_flags "-fPIC" "-CfSSE2" ${pascal_compiler_flags})	#instruction set for ppc is 7400
+ 	endif()			


Index: hedgewars.spec
===================================================================
RCS file: /cvs/extras/rpms/hedgewars/devel/hedgewars.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- hedgewars.spec	23 Nov 2009 22:45:16 -0000	1.24
+++ hedgewars.spec	1 Dec 2009 14:11:26 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           hedgewars
 Version:        0.9.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        2D tankbattle game with the tanks replaced by hedgehogs
 Group:          Amusements/Games
 License:        GPL+
@@ -31,6 +31,7 @@ such as the "Rope" or "Parachute", to mo
 %prep
 %setup -q -n %{name}-src-%{version}
 %patch0 -p1
+sed -i "s/-w -O2 -fomit-frame-pointer/$RPM_OPT_FLAGS/" CMakeLists.txt
 
 
 %build
@@ -88,6 +89,9 @@ fi
 
 
 %changelog
+* Tue Dec  1 2009 Hans de Goede <hdegoede at redhat.com> 0.9.12-2
+- Use RPM_OPT_FLAGS when building c++ code and pass -g to fpc (#542000)
+
 * Mon Nov 23 2009 Hans de Goede <hdegoede at redhat.com> 0.9.12-1
 - New upstream release 0.9.12
 - Remove included google-droid font, use the font from the