Hello community,
here is the log from the commit of package icedtea-web for openSUSE:Factory
checked in at 2019-02-06 14:06:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icedtea-web (Old)
and /work/SRC/openSUSE:Factory/.icedtea-web.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icedtea-web"
Wed Feb 6 14:06:38 2019 rev:29 rq:671829 version:1.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/icedtea-web/icedtea-web.changes 2018-10-04
19:01:23.075210278 +0200
+++ /work/SRC/openSUSE:Factory/.icedtea-web.new.28833/icedtea-web.changes
2019-02-06 14:06:40.658657354 +0100
@@ -1,0 +2,5 @@
+Tue Feb 5 12:00:41 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Make the plugin opt-in for all distributions and architectures
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icedtea-web.spec ++++++
--- /var/tmp/diff_new_pack.DQvm7k/_old 2019-02-06 14:06:41.194657256 +0100
+++ /var/tmp/diff_new_pack.DQvm7k/_new 2019-02-06 14:06:41.198657256 +0100
@@ -1,7 +1,7 @@
#
# spec file for package icedtea-web
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,8 @@
#
-%global build_docs 1
+%bcond_without docs
+%bcond_with plugin
%define javadir %{_jvmdir}/java
%define jredir %{_jvmdir}/jre
%define javaplugin libjavaplugin.so.%{_arch}
@@ -27,11 +28,6 @@
%define gurlhandler /desktop/gnome/url-handlers
%define jnlphandler %{gurlhandler}/jnlp
%define jnlpshandler %{gurlhandler}/jnlps
-%if !0%{?is_opensuse} && 0%{?sle_version} >= 150000
-%global build_native_plugin 0
-%else
-%global build_native_plugin 1
-%endif
Name: icedtea-web
Version: 1.7.1
Release: 0
@@ -78,7 +74,7 @@
Provides: java-1_8_0-openjdk-plugin = %{version}-%{release}
Provides: java-1_9_0-openjdk-plugin = %{version}-%{release}
Provides: java-plugin = 1.8.0
-%if %{build_native_plugin}
+%if %{with plugin}
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: npapi-sdk
@@ -89,7 +85,7 @@
applets written in the Java programming language and an implementation of Java
Web Start, originally based on the NetX project.
-%if %{build_docs}
+%if %{with docs}
%package javadoc
Summary: Java Web Start and plugin implementation (API documentation)
Group: Documentation/Other
@@ -115,13 +111,13 @@
--with-jdk-home=%{javadir} \
--with-jre-home=%{jredir} \
--docdir=%{_javadocdir}/%{name} \
-%if %{build_native_plugin}
+%if %{with plugin}
--enable-native-plugin \
--libdir=%{_libdir}/%{name} \
%else
--disable-native-plugin \
%endif
-%if %{build_docs}
+%if %{with docs}
--enable-docs \
%else
--disable-docs \
@@ -153,7 +149,7 @@
rm -rf %{buildroot}%{_mandir}/*/man1
%post
-%if %{build_native_plugin}
+%if %{with plugin}
update-alternatives \
--install %{_libdir}/browser-plugins/libjavaplugin.so %{javaplugin} \
%{_libdir}/%{name}/IcedTeaPlugin.so %{priority} \
@@ -174,7 +170,7 @@
update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ]
then
-%if %{build_native_plugin}
+%if %{with plugin}
update-alternatives --remove %{javaplugin} \
%{_libdir}/IcedTeaPlugin.so
%endif
@@ -199,12 +195,12 @@
%{_sysconfdir}/bash_completion.d/itweb-settings.bash
%{_sysconfdir}/bash_completion.d/javaws.bash
%{_sysconfdir}/bash_completion.d/policyeditor.bash
-%if %{build_native_plugin}
+%if %{with plugin}
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/IcedTeaPlugin.so
%endif
-%if %{build_docs}
+%if %{with docs}
%files javadoc
%license COPYING
%doc NEWS README
