Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at 2012-02-10 17:14:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_6_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_6_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_6_0-openjdk", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2012-01-27 15:17:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.java-1_6_0-openjdk.new/java-1_6_0-openjdk.changes 2012-02-10 17:14:42.000000000 +0100 @@ -1,0 +2,16 @@ +Fri Feb 3 14:06:13 UTC 2012 - [email protected] + +- apply ppc patch also on s390/s390x +- add a 3 more void-return fixes to ppc patch + +------------------------------------------------------------------- +Fri Feb 3 11:01:40 UTC 2012 - [email protected] + +- update to icedtea6-1.11, openjdk b24 +- ARM assembly language port reinstated and updated +- Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" +- Drop the outdated NIO2 backport. Users who want NIO2 should use IcedTea 2.x. +- Shark has been disabled +- Fixed build with GCC 4.7 + +------------------------------------------------------------------- Old: ---- f0f676c5a2c6.tar.gz icedtea6-1.10.5.tar.gz icedtea6-replace-gcc-stack-marking.patch jaxp144_01.zip jdk6-jaxws-b20.zip openjdk-6-src-b22-28_feb_2011-fedora.tar.bz2 New: ---- icedtea6-1.11.tar.gz jaxp144_03.zip jdk6-jaxws2_1_6-2011_06_13.zip openjdk-6-src-b24-14_nov_2011-fedora.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.HezTJI/_old 2012-02-10 17:14:50.000000000 +0100 +++ /var/tmp/diff_new_pack.HezTJI/_new 2012-02-10 17:14:50.000000000 +0100 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define gcjbootstrap 0 %define jit_arches %{ix86} x86_64 @@ -38,10 +37,10 @@ # If runtests is 0 test suites will not be run. %define runtests 0 -%define icedteaver 1.10.5 +%define icedteaver 1.11 %define icedteasnapshot %{nil} -%define openjdkver b22 -%define openjdkdate 28_feb_2011 +%define openjdkver b24 +%define openjdkdate 14_nov_2011 %define accessmajorver 1.23 %define accessminorver 0 @@ -55,7 +54,7 @@ %define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/ %define openjdkurl %{openjdkurlbase}%{openjdkver}/ -%define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.bz2 +%define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz %define mauvedate 2008-10-22 @@ -147,14 +146,12 @@ Source5: mauve-%{mauvedate}.tar.bz2 # from Fedora rpm Source6: mauve_tests -#Source7: %{hotspoturl}f0f676c5a2c6.tar.gz #Source8: %{jaxpurl}jaxp144_01.zip #Source9: %{jafurl}jdk6-jaf-b20.zip #Source10: %{jaxwsurl}jdk6-jaxws-b20.zip -Source7: f0f676c5a2c6.tar.gz -Source8: jaxp144_01.zip +Source8: jaxp144_03.zip Source9: jdk6-jaf-b20.zip -Source10: jdk6-jaxws-b20.zip +Source10: jdk6-jaxws2_1_6-2011_06_13.zip Source1000: java-1_6_0-openjdk-rpmlintrc # those properties are for opeSUSE only Source1001: fontconfig.SuSE.properties @@ -203,9 +200,6 @@ # PATCH-FIX-OPENSUSE: forward support for bouncycastle provider - requested by rgarrigue, # will be sent to fedora as well. Applied only on systems with enabled nss (11.2+) Patch135: icedtea6-1.10.2-bouncycastle-provider-support.patch -# PATCH-FIX-UPSTREAM: http://icedtea.classpath.org/hg/icedtea6/rev/012505ce3d0d -# fixes build on 11.1/i586 and sle11/i586, which fails because code behind GNU_stack.note in linux_x64_32.so -Patch136: icedtea6-replace-gcc-stack-marking.patch #PATCH-FIX-OPENSUSE: no -Werror on ecj based build as well Patch137: openjdk-ecj-6-src-b22-no-werror.patch # PATCH-FIX-UPSTREAM bnc#524505 @@ -223,8 +217,10 @@ BuildRequires: automake BuildRequires: alsa-lib-devel +%ifnarch %{arm} BuildRequires: quilt BuildRequires: vim +%endif BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: giflib-devel @@ -389,6 +385,7 @@ %package devel Summary: Java SDK based on OpenJDK 6 and IcedTea 6 +Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} Requires(pre): %{_sbindir}/update-alternatives Provides: java-1.6.0-openjdk-devel = %{version}-%{release} @@ -417,6 +414,7 @@ %package demo # As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: Summary: Sources for building demo applications with OpenJDK 6 +Group: Development/Languages/Java Provides: java-1.6.0-openjdk-demo = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} @@ -430,6 +428,7 @@ %package src # As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: Summary: OpenJDK 6 Java class sources for developers +Group: Development/Languages/Java Requires: %{name}-devel = %{version}-%{release} %description src @@ -442,6 +441,7 @@ %package javadoc # As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: Summary: Documentation of the Java API of OpenJDK 6 +Group: Development/Languages/Java Requires(pre): %{_sbindir}/update-alternatives Provides: java-1.6.0-openjdk-javadoc = %{version}-%{release} Provides: java-javadoc = %{version}-%{release} @@ -460,7 +460,6 @@ %setup -q -n icedtea6-%{icedteaver} -T -D -a 5 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2 %patch0 -b .optflags -%patch136 -p1 -b .gnu-stack %patch1000 -p1 cp %{SOURCE6} . @@ -492,8 +491,6 @@ --enable-pulse-java \ --enable-nss \ %endif - --with-hotspot-build=hs20 \ - --with-hotspot-src-zip=%{SOURCE7} \ --with-jaf-drop-zip=%{SOURCE9} \ --with-jaxp-drop-zip=%{SOURCE8} \ --with-jaxws-drop-zip=%{SOURCE10} \ @@ -539,7 +536,7 @@ %endif %if ! %{gcjbootstrap} -%ifarch ppc ppc64 +%ifarch ppc ppc64 s390 s390x qpatch -p1 %{PATCH110} %endif %endif ++++++ generate-fedora-zip.sh ++++++ --- /var/tmp/diff_new_pack.HezTJI/_old 2012-02-10 17:14:50.000000000 +0100 +++ /var/tmp/diff_new_pack.HezTJI/_new 2012-02-10 17:14:50.000000000 +0100 @@ -79,11 +79,9 @@ openjdk/jdk/src/share/demo/java2d/J2DBench -find openjdk -type f -perm 0444 | xargs chmod -f 0644 - # Create new tarball with new name. pushd openjdk > /dev/null - tar cjf ../$(basename $1 .tar.gz)-fedora.tar.bz2 * + tar czf ../$(basename $1 .tar.gz)-fedora.tar.gz * popd > /dev/null # Remove old unzipped openjdk dir. ++++++ icedtea6-1.10.5.tar.gz -> icedtea6-1.11.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_6_0-openjdk/icedtea6-1.10.5.tar.gz /work/SRC/openSUSE:Factory/.java-1_6_0-openjdk.new/icedtea6-1.11.tar.gz differ: char 5, line 1 ++++++ java-1_6_0-openjdk-suse-desktop-files.patch ++++++ --- /var/tmp/diff_new_pack.HezTJI/_old 2012-02-10 17:14:50.000000000 +0100 +++ /var/tmp/diff_new_pack.HezTJI/_new 2012-02-10 17:14:50.000000000 +0100 @@ -1,13 +1,28 @@ -Index: icedtea6-1.4/jconsole.desktop +Index: icedtea6-1.11/jconsole.desktop =================================================================== ---- icedtea6-1.4.orig/jconsole.desktop -+++ icedtea6-1.4/jconsole.desktop +--- icedtea6-1.11.orig/jconsole.desktop 2012-01-31 04:18:49.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,10 +0,0 @@ +-[Desktop Entry] +-Name=OpenJDK Monitoring & Management Console +-Comment=Monitor and manage OpenJDK applications +-Exec=/home/omajid/temp/icedtea6-release/openjdk.build/j2sdk-image/bin/jconsole +-Icon=java +-Terminal=false +-Type=Application +-StartupWMClass=sun-tools-jconsole-JConsole +-Categories=Development;Monitor;Java; +-Version=1.0 +Index: icedtea6-1.11/jconsole.desktop.in +=================================================================== +--- icedtea6-1.11.orig/jconsole.desktop.in 2012-01-31 02:47:06.000000000 +0100 ++++ icedtea6-1.11/jconsole.desktop.in 2012-02-03 10:43:39.532929067 +0100 @@ -1,10 +1,11 @@ [Desktop Entry] Name=OpenJDK Monitoring & Management Console +GenericName=OpenJDK Monitoring & Management Console Comment=Monitor and manage OpenJDK applications - Exec=/usr/bin/jconsole + Exec=@ABS_JAVA_HOME_DIR@/bin/jconsole Icon=java Terminal=false Type=Application @@ -15,16 +30,16 @@ -Categories=Development;Monitor;Java; +Categories=Development;Profiling; Version=1.0 -Index: icedtea6-1.4/policytool.desktop +Index: icedtea6-1.11/policytool.desktop.in =================================================================== ---- icedtea6-1.4.orig/policytool.desktop -+++ icedtea6-1.4/policytool.desktop +--- icedtea6-1.11.orig/policytool.desktop.in 2012-01-31 02:47:06.000000000 +0100 ++++ icedtea6-1.11/policytool.desktop.in 2012-02-03 10:44:27.024473928 +0100 @@ -1,10 +1,11 @@ [Desktop Entry] Name=OpenJDK Policy Tool +GenericName=OpenJDK Policy Tool Comment=Manage OpenJDK policy files - Exec=/usr/bin/policytool + Exec=@ABS_JAVA_HOME_DIR@/bin/policytool Icon=java Terminal=false Type=Application @@ -32,3 +47,18 @@ -Categories=Development;Java; +Categories=Utility;Security; Version=1.0 +Index: icedtea6-1.11/policytool.desktop +=================================================================== +--- icedtea6-1.11.orig/policytool.desktop 2012-01-31 04:18:49.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,10 +0,0 @@ +-[Desktop Entry] +-Name=OpenJDK Policy Tool +-Comment=Manage OpenJDK policy files +-Exec=/home/omajid/temp/icedtea6-release/openjdk.build/j2sdk-image/bin/policytool +-Icon=java +-Terminal=false +-Type=Application +-StartupWMClass=sun-security-tools-PolicyTool +-Categories=Development;Java; +-Version=1.0 ++++++ openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch ++++++ --- /var/tmp/diff_new_pack.HezTJI/_old 2012-02-10 17:14:50.000000000 +0100 +++ /var/tmp/diff_new_pack.HezTJI/_new 2012-02-10 17:14:50.000000000 +0100 @@ -417,3 +417,32 @@ } // These routines are only used on cpu architectures that +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2012/01/25 13:21:54 1.1 ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp 2012/01/25 13:22:02 +@@ -28,6 +28,7 @@ + + int MethodHandles::adapter_conversion_ops_supported_mask() { + ShouldNotCallThis(); ++ return 0; + } + + void MethodHandles::generate_method_handle_stub(MacroAssembler* masm, +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2012/02/01 23:57:44 1.1 ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp 2012/02/01 23:58:51 +@@ -57,6 +57,7 @@ + RegisterOrConstant MacroAssembler::delayed_value_impl( + intptr_t* delayed_value_addr, Register tmpl, int offset) { + ShouldNotCallThis(); ++ return RegisterOrConstant(tmpl); + } + + void MacroAssembler::store_oop(jobject obj) { +--- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2012/02/01 23:59:21 1.1 ++++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp 2012/02/01 23:59:38 +@@ -34,5 +34,6 @@ + Register tmp, + int offset) { + ShouldNotCallThis(); ++ return RegisterOrConstant(tmp); + } + }; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
