[bolzplatz2006] Build all class files in 1.5 format or higher (rhbz#842580)
Hans de Goede
jwrdegoede at fedoraproject.org
Thu Jul 26 09:46:53 UTC 2012
commit b92cb67d8ae059235686bd810df651ebb9c98ca7
Author: Hans de Goede <hdegoede at redhat.com>
Date: Thu Jul 26 11:51:30 2012 +0200
Build all class files in 1.5 format or higher (rhbz#842580)
bolzplatz2006-class-version15.patch | 46 +++++++++++++++++++++++++++++++++++
bolzplatz2006.spec | 7 ++++-
2 files changed, 52 insertions(+), 1 deletions(-)
---
diff --git a/bolzplatz2006-class-version15.patch b/bolzplatz2006-class-version15.patch
new file mode 100644
index 0000000..bcb62bf
--- /dev/null
+++ b/bolzplatz2006-class-version15.patch
@@ -0,0 +1,46 @@
+diff -up bolzplatz2006-1.0.3/libsrc/lwjgl/build.xml~ bolzplatz2006-1.0.3/libsrc/lwjgl/build.xml
+--- bolzplatz2006-1.0.3/libsrc/lwjgl/build.xml~ 2012-07-25 11:28:54.000000000 +0200
++++ bolzplatz2006-1.0.3/libsrc/lwjgl/build.xml 2012-07-26 10:49:26.793605978 +0200
+@@ -292,16 +292,16 @@
+
+ <!-- Compiles the Java source code -->
+ <target name="compile" description="Compiles the java source code">
+- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/*.java" source="1.4" target="1.4" taskname="lwjgl" />
+- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/input/**" source="1.4" target="1.4" taskname="input" />
+- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/openal/**" source="1.4" target="1.4" taskname="openal" />
++ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/*.java" source="1.5" target="1.5" taskname="lwjgl" />
++ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/input/**" source="1.5" target="1.5" taskname="input" />
++ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/openal/**" source="1.5" target="1.5" taskname="openal" />
+ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/audio/*.java" source="1.5" target="1.5" taskname="audio" />
+ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/audio/vorbis/*.java" source="1.5" target="1.5" taskname="audio-vorbis" />
+- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" target="1.4" taskname="opengl" />
+- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" target="1.4" taskname="test" />
+- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.4" target="1.4" taskname="examples" />
+- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/**" excludes="org/lwjgl/util/generator/**" source="1.4" target="1.4" taskname="util" />
+- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/devil/**" source="1.4" target="1.4" taskname="devil"/>
++ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.5" target="1.5" taskname="opengl" />
++ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.5" target="1.5" taskname="test" />
++ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.5" target="1.5" taskname="examples" />
++ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/**" excludes="org/lwjgl/util/generator/**" source="1.5" target="1.5" taskname="util" />
++ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/devil/**" source="1.5" target="1.5" taskname="devil"/>
+ </target>
+
+ <!-- Generates the native headers from source files -->
+@@ -363,7 +363,7 @@
+
+ <!-- Creates the Javadoc -->
+ <target name="javadoc" description="Creates javadoc from java source code">
+- <javadoc destdir="${lwjgl.docs}/javadoc" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
++ <javadoc destdir="${lwjgl.docs}/javadoc" author="true" version="true" use="true" source="1.5" windowtitle="LWJGL API">
+ <fileset refid="lwjgl.javadoc.fileset" />
+ <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
+ <bottom><![CDATA[<i>Copyright © 2002-2005 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+@@ -372,7 +372,7 @@
+
+ <!-- Compiles the Java source code -->
+ <target name="generators" description="Compiles the native method generators">
+- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/generator/**.java" source="1.4" target="1.4" taskname="generator">
++ <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/generator/**.java" source="1.5" target="1.5" taskname="generator">
+ <compilerarg value="-Xlint:all"/>
+ </javac>
+ </target>
diff --git a/bolzplatz2006.spec b/bolzplatz2006.spec
index daa51d3..90416cb 100644
--- a/bolzplatz2006.spec
+++ b/bolzplatz2006.spec
@@ -7,7 +7,7 @@
Name: bolzplatz2006
Version: 1.0.3
-Release: 19%{?dist}
+Release: 20%{?dist}
Summary: Slam Soccer 2006 is a funny football game in 3D-comic-style
Summary(fr): Coup de Foot 2006 est un jeu comique en 3D
Summary(de): Bolzplatz 2006 ist ein spaßiges Fußballspiel im 3D-Comic-Stil
@@ -34,6 +34,7 @@ Patch6: %{name}-lwjgl-Makefile.patch
Patch7: %{name}-no-xrandr.patch
Patch8: %{name}-versioned-openal.patch
Patch9: %{name}-1.0.3-libpng15.patch
+Patch10: %{name}-class-version15.patch
BuildRequires: ant-nodeps sdljava dom4j vecmath1.2 swig xml-commons-apis
BuildRequires: libGLU-devel DevIL-devel libXxf86vm-devel libjpeg-devel
BuildRequires: libpng-devel libXext-devel libXrandr-devel libXcursor-devel
@@ -126,6 +127,7 @@ popd
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
cp %{SOURCE7} .
sed -i 's/\r//' license.txt
# we use the system versions of these
@@ -241,6 +243,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Thu Jul 26 2012 Hans de Goede <hdegoede at redhat.com> - 1.0.3-20
+- Build all class files in 1.5 format or higher (rhbz#842580)
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list