Hello community, here is the log from the commit of package icedtea-web for openSUSE:Factory checked in at 2013-01-20 12:17:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icedtea-web (Old) and /work/SRC/openSUSE:Factory/.icedtea-web.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icedtea-web", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/icedtea-web/icedtea-web.changes 2012-11-14 16:38:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icedtea-web.new/icedtea-web.changes 2013-01-20 12:17:13.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Jan 16 15:03:43 UTC 2013 - [email protected] + +- limit the provides/obsoletes to architectures, where -plugin package + existed and don't pollute shiny new arm with an old garbage + +------------------------------------------------------------------- +Tue Jan 15 21:17:00 UTC 2013 - [email protected] + +- handle the package renaming on arm properly + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icedtea-web.spec ++++++ --- /var/tmp/diff_new_pack.pw6i6d/_old 2013-01-20 12:17:14.000000000 +0100 +++ /var/tmp/diff_new_pack.pw6i6d/_new 2013-01-20 12:17:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icedtea-web # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,6 +19,12 @@ # this is the right version openjdk for us! %define openjdk_ver 1.6.0.0_b22.1.10.1 +%ifarch %arm +%define origin icedtea +%else +%define origin openjdk +%endif + # for openSUSE 11.1 we need use update repo as it were not # released with this version %define xulrunner_ver 191 @@ -48,7 +54,7 @@ %define javaplugin javaplugin %define pluginsdir %{_libdir}/browser-plugins -%define sdkdir java-%{javaver}-openjdk-%{javaver} +%define sdkdir java-%{javaver}-%{origin}-%{javaver} %define pluginpath %{_libdir} %define pluginname IcedTeaPlugin.so @@ -67,7 +73,7 @@ Patch1: icedtea-web-1.1-moonlight-symbol-clash.patch Patch1000: icedtea-web-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: java-1_7_0-openjdk-devel +BuildRequires: java-1_7_0-%{origin}-devel BuildRequires: pkgconfig >= 0.9.0 # IcedTeaPlugin build requirements. @@ -91,20 +97,21 @@ %endif # to make sure the new package is installed in time of post -Requires(post): java-1_7_0-openjdk +Requires(post): java-1_7_0-%{origin} # Post requires alternatives to install tool alternatives. Requires(post): update-alternatives # Postun requires alternatives to uninstall tool alternatives. Requires(postun): update-alternatives +Provides: java-plugin = %{javaver} -# there were nothing like 1.9.8 in openSUSE +%ifarch %{ix86} x86_64 +# limit the provides/obsoleted only on arches when old package have existed Provides: java-1_6_0-openjdk-plugin = %{openjdk_ver} Obsoletes: java-1_6_0-openjdk-plugin < %{openjdk_ver} -Provides: java-1.6.0-openjdk-plugin = %{openjdk_ver} -Provides: java-plugin = %{javaver} +%endif # bnc#737105/FATE#313084 -Supplements: packageand(browser(npapi):java-openjdk) +Supplements: packageand(browser(npapi):java-%{origin}) %description The IcedTea-Web project provides a Free Software web browser plugin running -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
