commit java-1_6_0-openjdk for openSUSE:Factory
Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at Sat Oct 3 00:17:58 CEST 2009. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-08-19 11:52:15.000000000 +0200 +++ java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-09-29 09:24:11.000000000 +0200 @@ -1,0 +2,24 @@ +Tue Sep 29 07:22:16 UTC 2009 - mvyskocil@suse.cz + +- fixed bnc#542545: added 32/64bit specific provides to be compatible with + other JVM and OpenOffice.org + +------------------------------------------------------------------- +Thu Sep 10 13:23:08 UTC 2009 - mvyskocil@suse.cz + +- Updates: + * icedtea6-1.6 - fixes bnc#537969 + * hospot 09f7962b8b44 +- patches changes: + * added icedtea6-1.6-npplugin-xulrunner191.patch + * added java-1.6.0-openjdk-sparc-fixes.patch (from Fedora) + * added java-1.6.0-openjdk-sparc-hotspot.patch (from Fedora) + * added icedtea6-1.6-no-return-in-nonvoid-function.patch + (allows build on 11.1) + * regenerated java-1.6.0-openjdk-java-access-bridge-security.patch + * regenerated java-1.6.0-openjdk-makefile.patch + * removed icedtead6-1.5-npplugin-xulrunner191.patch + * removed java-1.6.0-openjdk-execvpe.patch + * removed java-1.6.0-openjdk-netx.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- icedtea6-1.5.1.tar.bz2 icedtead6-1.5-nppplugin-xulrunner191.patch java-1.6.0-openjdk-execvpe.patch java-1.6.0-openjdk-netx.patch New: ---- icedtea6-1.6-no-return-in-nonvoid-function.patch icedtea6-1.6-nppplugin-xulrunner191.patch icedtea6-1.6.tar.bz2 java-1.6.0-openjdk-sparc-fixes.patch java-1.6.0-openjdk-sparc-hotspot.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.xuGfpG/_old 2009-10-03 00:03:50.000000000 +0200 +++ /var/tmp/diff_new_pack.xuGfpG/_new 2009-10-03 00:03:50.000000000 +0200 @@ -18,7 +18,7 @@ %define gcjbootstrap 0 %define runtests 0 -%define icedteaver 1.5.1 +%define icedteaver 1.6 %define icedteasnapshot %{nil} %define openjdkver b16 %define openjdkdate 24_apr_2009 @@ -30,7 +30,7 @@ %define visualvmurl http://icedtea.classpath.org/visualvm/ %define netbeansurl http://nbi.netbeans.org/files/documents/210/2056/ %define hotspoturl http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/ -%define hotspotsnapshot -f9d938ede196 +%define hotspotsnapshot -09f7962b8b44 %define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/ %define openjdkurl %{openjdkurlbase}%{openjdkver}/ %define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.bz2 @@ -102,7 +102,7 @@ Obsoletes: %obsoletes %endif Version: 1.6.0.0_%{openjdkver} -Release: 3 +Release: 4 Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 Group: Development/Languages/Java License: GPL v2 only ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception @@ -143,20 +143,20 @@ # tar -cjf hotspot${HOTSPOT_SNAPSHOT}.tar.bz2 hotspot-${HOTSPOT_SNAPSHOT} # Used a hotspot from Fedora package Source11: %{hotspoturl}/hotspot.tar.gz -# FIXME: This patch needs to be fixed. optflags argument -# -mtune=generic is being ignored because it breaks several graphical -# applications. Source1000: java-1_6_0-openjdk-rpmlintrc # those properties are for opeSUSE only Source1001: fontconfig.SuSE.properties +# FIXME: This patch needs to be fixed. optflags argument +# -mtune=generic is being ignored because it breaks several graphical +# applications. Patch0: java-1.6.0-openjdk-optflags.patch Patch1: java-1.6.0-openjdk-java-access-bridge-tck.patch Patch2: java-1.6.0-openjdk-makefile.patch Patch3: java-1.6.0-openjdk-java-access-bridge-idlj.patch Patch4: java-1.6.0-openjdk-java-access-bridge-security.patch Patch5: java-1.6.0-openjdk-accessible-toolkit.patch -Patch8: java-1.6.0-openjdk-netx.patch -Patch9: java-1.6.0-openjdk-execvpe.patch +Patch6: java-1.6.0-openjdk-sparc-fixes.patch +Patch7: java-1.6.0-openjdk-sparc-hotspot.patch # SUSE patches Patch104: openjdk-6-src-b09-gcc4-warningfixes.patch Patch107: openjdk-6-src-b14-no-return-in-nonvoid-function.patch @@ -166,10 +166,13 @@ # will be sent to upstream after sign of SCA (http://openjdk.java.net/contribute/) Patch110: openjdk-6-src-b16-no-return-in-nonvoid-function-ppc.patch Patch112: openjdk-6-src-b16-no-return-in-nonvoid-function.patch -Patch113: icedtead6-1.5-nppplugin-xulrunner191.patch +Patch113: icedtea6-1.6-nppplugin-xulrunner191.patch # PATCH-FIX-OPENSUSE bnc#490610 # Icedtea lcms patches are not correct, this fixes it Patch114: openjdk-6-src-b16-lcms.patch +# PATCH-FIX-OPENSUSE +# sent to distro-pkg-dev ML +Patch115: icedtea6-1.6-no-return-in-nonvoid-function.patch # PATCH-FIX-UPSTREAM bnc#524505 Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -288,6 +291,20 @@ Provides: jre1.4.x Provides: jre1.5.x Provides: jre1.6.x +# bnc#542545 +# 32-bit versus 64-bit specific provides: +%ifarch %ix86 ppc s390 +%define bits 32 +%endif +%ifarch x86_64 ia64 s390x +%define bits 64 +%endif +Provides: jre-%{javamajver}-%{origin}-%{bits} = %{version}-%{release} +Provides: jre-%{origin}-%{bits} = %{version}-%{release} +Provides: jre-%{javamajver}-%{bits}, java-%{javamajver}-%{bits} +Provides: jre-%{bits} = %{javaver} +Provides: java-%{origin}-%{bits} = %{version}-%{release} +Provides: java-%{bits} = %{javaver} %description This Java 6 compatible Java Runtime Environment is based on OpenJDK 6 @@ -426,9 +443,11 @@ %setup -q -n icedtea6-%{icedteaver} -T -D -a 2 %patch0 -b .optflags %patch2 -b .makefile +%patch6 -p1 %if %{suse_version} >= 1120 %patch113 -p1 -b .xulrunner191 %endif +%patch115 -p1 -b .no-return-in-nonvoid %patch1000 -p1 cp %{SOURCE7} . cp %{SOURCE8} . @@ -445,8 +464,7 @@ --enable-systemtap \ --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \ %endif - --with-openjdk \ - --with-openjdk-home=%{_jvmdir}/%{sdkdir} \ + --with-openjdk=%{_jvmdir}/%{sdkdir} \ --with-openjdk-src-zip=%{SOURCE1} \ --with-pkgversion=suse-%{release}-%{_arch} \ --enable-pulse-java \ @@ -461,8 +479,7 @@ # Those patches are from Fedora package patch -l -p0 < %{PATCH4} patch -l -p0 < %{PATCH5} -patch -l -p0 < %{PATCH8} -patch -l -p0 < %{PATCH9} +patch -l -p0 < %{PATCH7} patch -l -p0 < %{PATCH104} patch -l -p0 < %{PATCH107} %ifarch %ix86 ++++++ hotspot.tar.gz ++++++ java-1_6_0-openjdk/hotspot.tar.gz java-1_6_0-openjdk/hotspot.tar.gz differ: char 5, line 1 ++++++ icedtea6-1.6-no-return-in-nonvoid-function.patch ++++++ Index: icedtea6-1.6/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc =================================================================== --- icedtea6-1.6.orig/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2009-09-08 16:19:48.000000000 +0200 +++ icedtea6-1.6/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2009-09-14 10:07:55.835802751 +0200 @@ -683,6 +683,7 @@ result->result_ready = true; + return result; } void* ++++++ icedtead6-1.5-nppplugin-xulrunner191.patch -> icedtea6-1.6-nppplugin-xulrunner191.patch ++++++ --- java-1_6_0-openjdk/icedtead6-1.5-nppplugin-xulrunner191.patch 2009-07-31 14:45:30.000000000 +0200 +++ java-1_6_0-openjdk/icedtea6-1.6-nppplugin-xulrunner191.patch 2009-09-10 15:38:21.000000000 +0200 @@ -1,17 +1,8 @@ -Index: icedtea6-1.5/IcedTeaNPPlugin.cc +Index: icedtea6-1.6/plugin/icedteanp/IcedTeaNPPlugin.cc =================================================================== ---- icedtea6-1.5.orig/IcedTeaNPPlugin.cc 2009-07-28 15:06:34.000000000 +0200 -+++ icedtea6-1.5/IcedTeaNPPlugin.cc 2009-07-30 17:35:24.374746375 +0200 -@@ -47,7 +47,7 @@ - - // Netscape plugin API includes. - #include <npapi.h> --#include <npupp.h> -+#include <npfunctions.h> - - // GLib includes. - #include <glib.h> -@@ -1772,17 +1772,17 @@ +--- icedtea6-1.6.orig/plugin/icedteanp/IcedTeaNPPlugin.cc 2009-09-08 16:19:48.000000000 +0200 ++++ icedtea6-1.6/plugin/icedteanp/IcedTeaNPPlugin.cc 2009-09-10 12:50:43.927840173 +0200 +@@ -1824,17 +1824,17 @@ // Return to the browser the plugin functions that we implement. pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR; pluginTable->size = sizeof (NPPluginFuncs); @@ -40,3 +31,42 @@ // Make sure the plugin data directory exists, creating it if // necessary. +Index: icedtea6-1.6/plugin/icedteanp/IcedTeaScriptablePluginObject.h +=================================================================== +--- icedtea6-1.6.orig/plugin/icedteanp/IcedTeaScriptablePluginObject.h 2009-09-08 16:19:48.000000000 +0200 ++++ icedtea6-1.6/plugin/icedteanp/IcedTeaScriptablePluginObject.h 2009-09-10 12:49:44.027841169 +0200 +@@ -39,7 +39,7 @@ + #ifndef __ICEDTEASCRIPTABLEPLUGINOBJECT_H_ + #define __ICEDTEASCRIPTABLEPLUGINOBJECT_H_ + +-#include "npupp.h" ++#include <npfunctions.h> + + #include "IcedTeaJavaRequestProcessor.h" + #include "IcedTeaNPPlugin.h" +Index: icedtea6-1.6/plugin/icedteanp/IcedTeaNPPlugin.h +=================================================================== +--- icedtea6-1.6.orig/plugin/icedteanp/IcedTeaNPPlugin.h 2009-09-08 16:19:48.000000000 +0200 ++++ icedtea6-1.6/plugin/icedteanp/IcedTeaNPPlugin.h 2009-09-10 13:47:50.816340579 +0200 +@@ -41,7 +41,7 @@ + + // Netscape plugin API includes. + #include <npapi.h> +-#include <npupp.h> ++#include <npfunctions.h> + #include <nsThreadUtils.h> + + // GLib includes. +Index: icedtea6-1.6/plugin/icedteanp/IcedTeaPluginRequestProcessor.h +=================================================================== +--- icedtea6-1.6.orig/plugin/icedteanp/IcedTeaPluginRequestProcessor.h 2009-09-08 16:19:48.000000000 +0200 ++++ icedtea6-1.6/plugin/icedteanp/IcedTeaPluginRequestProcessor.h 2009-09-10 13:48:46.500338879 +0200 +@@ -46,7 +46,7 @@ + #include <time.h> + + #include <npapi.h> +-#include <npupp.h> ++#include <npfunctions.h> + + #include "IcedTeaRunnable.h" + #include "IcedTeaPluginUtils.h" ++++++ icedtea6-1.5.1.tar.bz2 -> icedtea6-1.6.tar.bz2 ++++++ java-1_6_0-openjdk/icedtea6-1.5.1.tar.bz2 java-1_6_0-openjdk/icedtea6-1.6.tar.bz2 differ: char 11, line 1 ++++++ java-1.6.0-openjdk-java-access-bridge-security.patch ++++++ --- /var/tmp/diff_new_pack.xuGfpG/_old 2009-10-03 00:03:50.000000000 +0200 +++ /var/tmp/diff_new_pack.xuGfpG/_new 2009-10-03 00:03:50.000000000 +0200 @@ -1,11 +1,11 @@ ---- jsorig 2008-12-05 11:43:39.000000000 -0500 -+++ openjdk/jdk/src/share/lib/security/java.security 2008-12-05 11:43:45.000000000 -0500 +--- openjdk/jdk/src/share/lib/security/java.security.prev 2009-09-09 10:50:09.813179147 +0100 ++++ openjdk/jdk/src/share/lib/security/java.security 2009-09-09 10:50:55.458176705 +0100 @@ -127,7 +127,7 @@ # passed to checkPackageAccess unless the # corresponding RuntimePermission ("accessClassInPackage."+package) has # been granted. -package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio. -+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,org.GNOME.Accessibility,org.GNOME.Bonobo ++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,org.GNOME.Accessibility.,org.GNOME.Bonobo. # # List of comma-separated packages that start with or equal this string ++++++ java-1.6.0-openjdk-makefile.patch ++++++ --- /var/tmp/diff_new_pack.xuGfpG/_old 2009-10-03 00:03:50.000000000 +0200 +++ /var/tmp/diff_new_pack.xuGfpG/_new 2009-10-03 00:03:50.000000000 +0200 @@ -1,19 +1,19 @@ ---- icedtea6-1.4/Makefile.am 2009-01-20 11:33:30.000000000 -0500 -+++ Makefile.am 2009-01-22 10:56:55.000000000 -0500 -@@ -623,7 +623,6 @@ - if test "x${HSBUILD}" != "xoriginal"; then \ - rm -rf openjdk/hotspot ; \ - fi ; \ +--- Makefile.am.prev 2009-09-09 09:48:09.772178256 +0100 ++++ Makefile.am 2009-09-09 09:48:33.988177077 +0100 +@@ -715,7 +715,6 @@ + mkdir openjdk ; \ + $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ + chmod -R ug+w openjdk ; \ - sh $(abs_top_srcdir)/fsg.sh ; \ fi - if WITH_ALT_HSBUILD - if test -e ${HOTSPOT_SRC_ZIP} ; \ -@@ -660,7 +659,7 @@ - clean-extract: - rm -f stamps/extract.stamp + endif + if BUILD_CACAO +@@ -770,7 +769,7 @@ + clean-replace-hotspot: + rm -rf stamps/replace-hotspot.stamp -stamps/patch.stamp: stamps/patch-fsg.stamp -+stamps/patch.stamp: stamps/extract.stamp ++stamps/patch.stamp: stamps/extract.stamp stamps/replace-hotspot.stamp mkdir -p stamps ; \ rm -f stamps/patch.stamp.tmp ; \ touch stamps/patch.stamp.tmp ; \ ++++++ java-1.6.0-openjdk-sparc-fixes.patch ++++++ diff -Nur icedtea6-1.4-orig/HACKING icedtea6-1.4/HACKING --- icedtea6-1.4-orig/HACKING 2009-01-20 10:35:02.000000000 -0600 +++ icedtea6-1.4/HACKING 2009-02-11 12:17:09.000000000 -0600 @@ -45,7 +45,6 @@ * icedtea-rmi_amd64.patch: Build RMI binaries on all platforms not just 32-bit ones. * icedtea-sparc64-linux.patch: Fixes needed to build the SPARC port on 32-bit SPARC as used by Fedora. * icedtea-sparc-ptracefix.patch: Avoid importing asm-sparc/ptrace.h by including pt_regs directly. -* icedtea-sparc-trapsfix.patch: Include traps.h from correct directory. * icedtea-ssl.patch: Add casts to AlgorithmParameterSpec in sun.security.ssl package. * icedtea-static-libstdc++.patch: Don't use static C++ on PPC64. * icedtea-sunsrc.patch: Remove service property files from TOOLS list. diff -Nur icedtea6-1.4-orig/Makefile.am icedtea6-1.4/Makefile.am --- icedtea6-1.4-orig/Makefile.am 2009-01-20 10:33:30.000000000 -0600 +++ icedtea6-1.4/Makefile.am 2009-02-11 12:16:07.000000000 -0600 @@ -580,8 +580,7 @@ ICEDTEA_PATCHES += \ patches/hotspot/$(HSBUILD)/icedtea-sparc64-linux.patch \ - patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch + patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -Nur icedtea6-1.4-orig/patches/hotspot/default/icedtea-sparc-trapsfix.patch icedtea6-1.4/patches/hotspot/default/icedtea-sparc-trapsfix.patch --- icedtea6-1.4-orig/patches/hotspot/default/icedtea-sparc-trapsfix.patch 2008-12-15 11:16:15.000000000 -0600 +++ icedtea6-1.4/patches/hotspot/default/icedtea-sparc-trapsfix.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,21 +0,0 @@ -diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp ---- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2008-08-04 08:40:18.000000000 +0100 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2008-08-09 01:29:51.000000000 +0100 -@@ -25,7 +25,16 @@ - #include "incls/_precompiled.incl" - #include "incls/_assembler_linux_sparc.cpp.incl" - --#include <asm-sparc/traps.h> -+/* Headers for 32bit sparc with a 32bit userland end up in asm/ -+ * Headers for 32bit sparc with a 64bit userland end up in asm-sparc/ -+ * There is no traps.h in asm-sparc64/ -+ */ -+ -+#if defined(__sparc__) && defined(__arch64__) -+# include <asm-sparc/traps.h> -+#else -+# include <asm/traps.h> -+#endif - - void MacroAssembler::read_ccr_trap(Register ccr_save) { - // No implementation diff -Nur icedtea6-1.4-orig/patches/hotspot/original/icedtea-sparc-trapsfix.patch icedtea6-1.4/patches/hotspot/original/icedtea-sparc-trapsfix.patch --- icedtea6-1.4-orig/patches/hotspot/original/icedtea-sparc-trapsfix.patch 2008-12-15 11:16:15.000000000 -0600 +++ icedtea6-1.4/patches/hotspot/original/icedtea-sparc-trapsfix.patch 1969-12-31 18:00:00.000000000 -0600 @@ -1,21 +0,0 @@ -diff -up openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp ---- openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.BAD 2008-05-28 11:49:06.000000000 -0500 -+++ openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2008-05-28 11:51:56.000000000 -0500 -@@ -25,7 +25,16 @@ - #include "incls/_precompiled.incl" - #include "incls/_assembler_linux_sparc.cpp.incl" - --#include <asm-sparc/traps.h> -+/* Headers for 32bit sparc with a 32bit userland end up in asm/ -+ * Headers for 32bit sparc with a 64bit userland end up in asm-sparc/ -+ * There is no traps.h in asm-sparc64/ -+ */ -+ -+#if defined(__sparc__) && defined(__arch64__) -+# include <asm-sparc/traps.h> -+#else -+# include <asm/traps.h> -+#endif - - bool MacroAssembler::needs_explicit_null_check(intptr_t offset) { - // Since the linux kernel resides at the low end of diff -Nur icedtea6-1.4-orig/patches/icedtea-sparc.patch icedtea6-1.4/patches/icedtea-sparc.patch --- icedtea6-1.4-orig/patches/icedtea-sparc.patch 2008-12-15 11:16:15.000000000 -0600 +++ icedtea6-1.4/patches/icedtea-sparc.patch 2009-02-11 11:21:05.000000000 -0600 @@ -67,7 +67,7 @@ +#include "incls/_precompiled.incl" +#include "incls/_assembler_linux_sparc.cpp.incl" + -+#include <asm-sparc/traps.h> ++#include <asm/traps.h> + +bool MacroAssembler::needs_explicit_null_check(intptr_t offset) { + // Since the linux kernel resides at the low end of ++++++ java-1.6.0-openjdk-sparc-hotspot.patch ++++++ --- ./openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.orig 2009-02-11 19:26:14.000000000 -0500 +++ ./openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2009-02-11 19:26:27.000000000 -0500 @@ -25,7 +25,7 @@ #include "incls/_precompiled.incl" #include "incls/_assembler_linux_sparc.cpp.incl" -#include <asm-sparc/traps.h> +#include <asm/traps.h> void MacroAssembler::read_ccr_trap(Register ccr_save) { // No implementation ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de