Hello community, here is the log from the commit of package jogl2 for openSUSE:Factory checked in at 2014-07-11 20:05:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-06 17:40:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jogl2.new/jogl2.changes 2014-07-11 20:05:53.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 7 15:05:52 UTC 2014 - [email protected] + +- Use junit not junit4 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jogl2.spec ++++++ --- /var/tmp/diff_new_pack.z4DP2m/_old 2014-07-11 20:05:54.000000000 +0200 +++ /var/tmp/diff_new_pack.z4DP2m/_new 2014-07-11 20:05:54.000000000 +0200 @@ -16,10 +16,10 @@ # +%define src_name jogl-v%{version} Name: jogl2 Version: 2.0.2 Release: 0 -%define src_name jogl-v%{version} Summary: Java bindings for the OpenGL API License: BSD-2-Clause Group: Development/Libraries/Java @@ -27,7 +27,6 @@ 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 - BuildRequires: ant >= 1.8.0 BuildRequires: ant-contrib BuildRequires: eclipse-swt @@ -39,11 +38,9 @@ BuildRequires: libXt-devel BuildRequires: libXxf86vm-devel BuildRequires: p7zip - Requires: gluegen2 Requires: java Requires: jpackage-utils - BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -58,9 +55,9 @@ %prep # Upstream tarball is a .7z archive, which extracts to a .tar, which has to be further extracted to get the full source -%setup -c -T -n %{src_name} +%setup -q -c -T -n %{src_name} cd .. -/usr/bin/7za e -y %{SOURCE0} +%{_bindir}/7za e -y %{SOURCE0} tar -xf %{src_name}.tar rm %{src_name}.tar cd %{src_name} @@ -98,13 +95,13 @@ %build cd make export CLASSPATH="" -%ant -Dcommon.gluegen.build.done=true \ +ant -Dcommon.gluegen.build.done=true \ -Djavacdebug=true \ -Djavacdebuglevel=lines,vars,source \ -Dc.compiler.debug=true \ \ -Dantlr.jar=%{_javadir}/antlr.jar \ - -Djunit.jar=%{_javadir}/junit4.jar \ + -Djunit.jar=%{_javadir}/junit.jar \ -Dant.jar=%{_javadir}/ant.jar \ -Dant-junit.jar=%{_javadir}/ant/ant-junit.jar \ -Dgluegen.jar=%{_javadir}/gluegen2.jar \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
