Hello community, here is the log from the commit of package jogl2 for openSUSE:Factory checked in at 2015-04-12 00:10:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jogl2 (Old) and /work/SRC/openSUSE:Factory/.jogl2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jogl2" Changes: -------- --- /work/SRC/openSUSE:Factory/jogl2/jogl2.changes 2014-07-11 20:05:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jogl2.new/jogl2.changes 2015-04-12 00:10:02.000000000 +0200 @@ -1,0 +2,20 @@ +Sat Apr 4 03:34:21 UTC 2015 - [email protected] + +- Update to version 2.3.1: + + See list of changes at + https://jogamp.org/wiki/index.php/SW_Tracking_Report_Objectives_for_the_release_2.3.1. + +------------------------------------------------------------------- +Sat Mar 14 23:17:12 UTC 2015 - [email protected] + +- Update to version 2.3.0: + + See list of changes at + https://jogamp.org/wiki/index.php/SW_Tracking_Report_Objectives_for_the_release_2.3.0. +- Add jogl2-disable-tests.patch to disable junit tests for now, + needs additional packages not in obs. +- Disable building of an unimportant experimental plugin as it + caused build failures when prebuilt jar files are not used. +- Update BuildRequires and Requires to enforce version + compatibility with gluegen2. + +------------------------------------------------------------------- Old: ---- jogl-v2.0.2.tar.7z New: ---- jogl-v2.3.1.tar.7z jogl2-disable-tests.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jogl2.spec ++++++ --- /var/tmp/diff_new_pack.5ixMIO/_old 2015-04-12 00:10:04.000000000 +0200 +++ /var/tmp/diff_new_pack.5ixMIO/_new 2015-04-12 00:10:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package jogl2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define src_name jogl-v%{version} Name: jogl2 -Version: 2.0.2 +Version: 2.3.1 Release: 0 Summary: Java bindings for the OpenGL API License: BSD-2-Clause @@ -27,18 +27,20 @@ Source0: http://jogamp.org/deployment/v%{version}/archive/Sources/%{src_name}.tar.7z Patch0: %{name}-0000-update-antlr-ant-contrib-jars.patch Patch1: %{name}-0001-update-ant-contrib-tasks.patch +Patch2: jogl2-disable-tests.patch BuildRequires: ant >= 1.8.0 BuildRequires: ant-contrib BuildRequires: eclipse-swt -BuildRequires: gluegen2-devel +BuildRequires: gluegen2-devel = %{version} BuildRequires: java-devel BuildRequires: jpackage-utils +BuildRequires: libXcursor-devel BuildRequires: libXrandr-devel BuildRequires: libXrender-devel BuildRequires: libXt-devel BuildRequires: libXxf86vm-devel BuildRequires: p7zip -Requires: gluegen2 +Requires: gluegen2 = %{version} Requires: java Requires: jpackage-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -67,9 +69,13 @@ find -name "*.jar" -type f -print -exec rm {} \; find -name "*.apk" -type f -print -exec rm {} \; rm -fr make/lib +# Also remove experimantal applets that requires a bundled jar for building +rm -fr src/newt/classes/com/jogamp/newt/util/applet/JOGLNewtApplet3Run.java +rm -fr src/newt/classes/com/jogamp/newt/util/applet/VersionApplet3.java %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Fix wrong-script-end-of-line-encoding rm make/scripts/*.bat ++++++ jogl2-0000-update-antlr-ant-contrib-jars.patch ++++++ --- /var/tmp/diff_new_pack.5ixMIO/_old 2015-04-12 00:10:04.000000000 +0200 +++ /var/tmp/diff_new_pack.5ixMIO/_new 2015-04-12 00:10:04.000000000 +0200 @@ -11,11 +11,4 @@ <condition property="rootrel.build" value="build"> <not> -@@ -241,6 +241,7 @@ - - <path id="gluegen-gl.classpath"> - <pathelement location="${gluegen.jar}" /> -+ <pathelement location="${antlr.jar}" /> - <pathelement location="${gluegen-gl.jar}" /> - </path> - + ++++++ jogl2-0001-update-ant-contrib-tasks.patch ++++++ --- /var/tmp/diff_new_pack.5ixMIO/_old 2015-04-12 00:10:04.000000000 +0200 +++ /var/tmp/diff_new_pack.5ixMIO/_new 2015-04-12 00:10:04.000000000 +0200 @@ -1,8 +1,8 @@ -Index: jogl-v2.0.2/make/build-jogl.xml +Index: jogl-v2.3.0/make/build-jogl.xml =================================================================== ---- jogl-v2.0.2.orig/make/build-jogl.xml -+++ jogl-v2.0.2/make/build-jogl.xml -@@ -1472,7 +1472,7 @@ +--- jogl-v2.3.0.orig/make/build-jogl.xml ++++ jogl-v2.3.0/make/build-jogl.xml +@@ -1588,7 +1588,7 @@ <!-- have to wrap cc task with outofdate, because otherwise cc links a new library even when no files have been compiled --> @@ -10,12 +10,12 @@ + <outofdate force="true"> <sourcefiles> <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset> - </sourcefiles> -Index: jogl-v2.0.2/make/build-nativewindow.xml + <fileset dir="${obj.joglsub}" includes="*jogl_ffmpegv08*, *jogl_ffmpegv09*, *jogl_ffmpegv10*"/> <!-- requires linkage --> +Index: jogl-v2.3.0/make/build-nativewindow.xml =================================================================== ---- jogl-v2.0.2.orig/make/build-nativewindow.xml -+++ jogl-v2.0.2/make/build-nativewindow.xml -@@ -661,7 +661,7 @@ +--- jogl-v2.3.0.orig/make/build-nativewindow.xml ++++ jogl-v2.3.0/make/build-nativewindow.xml +@@ -675,7 +675,7 @@ <!-- have to wrap cc task with outofdate, because otherwise cc links a new library even when no files have been compiled --> @@ -24,11 +24,11 @@ <sourcefiles> <fileset dir="${project.root}"><patternset refid="@{c.compiler.src.files}"/></fileset> </sourcefiles> -Index: jogl-v2.0.2/make/build-newt.xml +Index: jogl-v2.3.0/make/build-newt.xml =================================================================== ---- jogl-v2.0.2.orig/make/build-newt.xml -+++ jogl-v2.0.2/make/build-newt.xml -@@ -605,7 +605,7 @@ +--- jogl-v2.3.0.orig/make/build-newt.xml ++++ jogl-v2.3.0/make/build-newt.xml +@@ -637,7 +637,7 @@ <!-- have to wrap cc task with outofdate, because otherwise cc links a new library even when no files have been compiled --> ++++++ jogl2-disable-tests.patch ++++++ Index: jogl-v2.3.0/make/build.xml =================================================================== --- jogl-v2.3.0.orig/make/build.xml +++ jogl-v2.3.0/make/build.xml @@ -8,13 +8,13 @@ - Main build target. --> - <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive" /> + <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,developer-zip-archive" /> - <target name="all.debug" description="Debug build nativewindow, jogl and newt projects, incl. all junit tests " depends="init.debug,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive" /> + <target name="all.debug" description="Debug build nativewindow, jogl and newt projects, incl. all junit tests " depends="init.debug,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,developer-zip-archive" /> - <target name="all.but-archives" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile" /> + <target name="all.but-archives" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build" /> - <target name="all.ide" description="Debug IDE build nativewindow, jogl and newt projects, including all junit tests, but don't tag the build or create archives" depends="init.debug,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,test.compile" /> + <target name="all.ide" description="Debug IDE build nativewindow, jogl and newt projects, including all junit tests, but don't tag the build or create archives" depends="init.debug,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir" /> <target name="test.compile"> <ant antfile="build-test.xml" target="test.compile" inheritRefs="true" inheritAll="true"/>
