[spring] - F16 compile fix.

Gilboa Davara gilboa at fedoraproject.org
Sun Aug 28 14:35:55 UTC 2011


commit 822b570ee4328fd2ef6af72e0ec819a5c96f2a2f
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date:   Sun Aug 28 17:35:31 2011 +0300

    - F16 compile fix.

 spring-f16-java.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 spring.spec           |    7 ++++++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/spring-f16-java.patch b/spring-f16-java.patch
new file mode 100644
index 0000000..60200b5
--- /dev/null
+++ b/spring-f16-java.patch
@@ -0,0 +1,44 @@
+--- AI/Interfaces/Java/bin/jna_wrappEvents.awk.old	2011-08-22 17:16:11.886331007 +0300
++++ AI/Interfaces/Java/bin/jna_wrappEvents.awk	2011-08-22 17:17:09.967621579 +0300
+@@ -473,7 +473,7 @@
+ }
+ 
+ # beginn of struct S*Event
+-/^\struct S.*Event( \{)?/ {
++/^struct S.*Event( \{)?/ {
+ 
+ 	isInsideEvtStruct = 1;
+ 	ind_evtMember = 0;
+--- ./AI/Interfaces/Java/bin/jna_wrappCommands.awk.old	2011-08-22 17:19:50.940656913 +0300
++++ ./AI/Interfaces/Java/bin/jna_wrappCommands.awk	2011-08-22 17:20:05.451479919 +0300
+@@ -341,7 +341,7 @@
+ }
+ 
+ # beginn of struct S*Command
+-/^\struct S.*Command( \{)?/ {
++/^struct S.*Command( \{)?/ {
+ 
+ 	isInsideCmdStruct = 1;
+ 	ind_cmdMember = 0;
+--- ./AI/Wrappers/Cpp/bin/wrappEvents.awk.old	2011-08-22 17:20:40.292055024 +0300
++++ ./AI/Wrappers/Cpp/bin/wrappEvents.awk	2011-08-22 17:20:55.930864335 +0300
+@@ -366,7 +366,7 @@
+ }
+ 
+ # beginn of struct S*Event
+-/^\struct S.*Event( \{)?/ {
++/^struct S.*Event( \{)?/ {
+ 
+ 	isInsideEvtStruct = 1;
+ 	ind_evtMember = 0;
+--- ./AI/Wrappers/Cpp/bin/wrappCommands.awk.old	2011-08-22 17:20:46.849975058 +0300
++++ ./AI/Wrappers/Cpp/bin/wrappCommands.awk	2011-08-22 17:20:59.948815345 +0300
+@@ -387,7 +387,7 @@
+ }
+ 
+ # beginn of struct S*Command
+-/^\struct S.*Command( \{)?/ {
++/^struct S.*Command( \{)?/ {
+ 
+ 	isInsideCmdStruct = 1;
+ 	ind_cmdMember = 0;
diff --git a/spring.spec b/spring.spec
index fa49a6c..a71f4b3 100644
--- a/spring.spec
+++ b/spring.spec
@@ -1,6 +1,6 @@
 Name:			spring
 Version:		0.82.7.1
-Release:		5%{?dist}
+Release:		6%{?dist}
 Summary:		Multiplayer, 3D realtime strategy combat game
 
 Group:			Amusements/Games
@@ -17,6 +17,7 @@ Source0:		http://downloads.sourceforge.net/project/springrts/springrts/spring-%{
 Source1:		spring-README.Fedora
 Patch0:			spring-gcc46-include-fix.patch
 Patch1:			spring-gcc46-tempfloat-compile-fix.patch
+Patch2:			spring-f16-java.patch
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,6 +58,7 @@ great resource, read it here: http://spring.clan-sy.com/wiki/Main_Page
 # Compile patches.
 %patch0 -p0 -b .spring-gcc46-include-compile-fix
 %patch1 -p0 -b .spring-gcc46-tempfloat-compile-fix
+%patch2 -p0 -b .spring-f16-java-compile-fix
 
 cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
@@ -147,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 22 2011 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 0.82.7.1-6
+- Java/F16 compile fix.
+
 * Tue Jul 26 2011 Bruno Wolff III <bruno at wolff.to> - 0.82.7.1-5
 - Rebuild for boost 1.47 soname bump
 


More information about the scm-commits mailing list