Hello community, here is the log from the commit of package icedtea-web for openSUSE:Factory checked in at Fri Jul 8 12:55:57 CEST 2011. -------- --- icedtea-web/icedtea-web.changes 2011-06-30 13:39:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/icedtea-web/icedtea-web.changes 2011-07-08 10:33:00.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jul 8 08:03:40 UTC 2011 - mvyskocil@suse.cz + +- fix bnc#704419 - Use correct path in IcedteaPlugin.so + * allow plugin usage without -devel package installed + * fix lanchers location from JAVA to JRE + * icedtea-1.1-use-jre-in-launchers.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- icedtea-1.1-use-jre-in-launchers.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ --- /var/tmp/diff_new_pack.rGlVRU/_old 2011-07-08 12:55:31.000000000 +0200 +++ /var/tmp/diff_new_pack.rGlVRU/_new 2011-07-08 12:55:31.000000000 +0200 @@ -44,28 +44,27 @@ %define pluginsdir %{_libdir}/browser-plugins %define jredir jre-%{javaver}-openjdk -%define sdkdir java-%{javaver}-openjdk +%define sdkdir java-%{javaver}-openjdk-%{javaver} %define pluginpath %{_libdir} %define pluginname IcedTeaPlugin.so -%define suse_insert_debug_package ERROR %{suse_insert_debug_package} - Name: icedtea-web Version: 1.1 -Release: 1 +Release: 2 Summary: Java Web Start and plugin implementation Group: Development/Languages/Java License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception Url: http://icedtea.classpath.org -# hg clone http://icedtea.classpath.org/hg/release/icedtea-web-1.1/ -# (cd icedtea-web-1.1; ./autogen.sh) -# tar --exclude-vcs -czf icedtea-web-1.1.tar.gz icedtea-web-1.1/ Source0: http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz Patch0: icedtea-web-1.0.2-no-return-in-nonvoid-function.patch #PATCH-FIX-UPSTREAM: # https://bugzilla.mozilla.org/show_bug.cgi?id=582130 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=622 Patch1: icedtea-web-1.1-moonlight-symbol-clash.patch +#PATCH-FIX-OPENSUSE: +#https://bugzilla.novell.com/show_bug.cgi?id=704419#c1 +#sent to icedtea mailinglist +Patch2: icedtea-1.1-use-jre-in-launchers.patch Patch1000: icedtea-web-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: java-1_6_0-openjdk-devel @@ -117,10 +116,12 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch1000 -p1 %build +#XXX: This disallows usage of openjdk 7 %{configure} \ --with-jdk-home=%{_jvmdir}/%{sdkdir} \ --docdir=%{_javadocdir}/%{name} \ ++++++ icedtea-1.1-use-jre-in-launchers.patch ++++++ Index: icedtea-web-1.1/launcher/itweb-settings.in =================================================================== --- icedtea-web-1.1.orig/launcher/itweb-settings.in 2011-06-08 21:42:40.000000000 +0200 +++ icedtea-web-1.1/launcher/itweb-settings.in 2011-07-08 08:58:36.598485802 +0200 @@ -1,6 +1,6 @@ #!/bin/sh -JAVA=@JAVA@ +JAVA=@JRE@/bin/java LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ LAUNCHER_FLAGS=-Xms8m CLASSNAME=net.sourceforge.jnlp.controlpanel.CommandLine Index: icedtea-web-1.1/launcher/javaws.in =================================================================== --- icedtea-web-1.1.orig/launcher/javaws.in 2011-06-08 21:42:40.000000000 +0200 +++ icedtea-web-1.1/launcher/javaws.in 2011-07-08 08:58:18.315845331 +0200 @@ -1,6 +1,6 @@ #!/bin/sh -JAVA=@JAVA@ +JAVA=@JRE@/bin/java LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ LAUNCHER_FLAGS=-Xms8m CLASSNAME=net.sourceforge.jnlp.runtime.Boot ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org