Hello community,
here is the log from the commit of package eclipse-ecf for openSUSE:Factory
checked in at 2020-03-18 12:31:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eclipse-ecf (Old)
and /work/SRC/openSUSE:Factory/.eclipse-ecf.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse-ecf"
Wed Mar 18 12:31:03 2020 rev:3 rq:785880 version:3.14.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/eclipse-ecf/eclipse-ecf.changes 2019-11-28
13:50:38.334700120 +0100
+++ /work/SRC/openSUSE:Factory/.eclipse-ecf.new.3160/eclipse-ecf.changes
2020-03-18 12:41:31.812808104 +0100
@@ -1,0 +2,6 @@
+Thu Mar 12 12:19:57 UTC 2020 - Fridrich Strba <fst...@suse.com>
+
+- Change the way the bootstrap/non-bootstrap packages are built in
+ order to have a working eclipse as a final product (bsc#1166426)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eclipse-ecf.spec ++++++
--- /var/tmp/diff_new_pack.qYh3X3/_old 2020-03-18 12:41:32.768808708 +0100
+++ /var/tmp/diff_new_pack.qYh3X3/_new 2020-03-18 12:41:32.772808710 +0100
@@ -1,7 +1,7 @@
#
# spec file for package eclipse-ecf
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -58,7 +58,7 @@
Name: eclipse-ecf
%endif
%if %{without bootstrap}
-BuildRequires: eclipse-ecf-core
+BuildRequires: eclipse-ecf-core-bootstrap
BuildRequires: eclipse-emf-core
BuildRequires: eclipse-emf-runtime
BuildRequires: eclipse-pde-bootstrap
@@ -86,18 +86,24 @@
compliant implementation of the OSGi Remote Services standard.
%if %{with bootstrap}
-
-%package -n eclipse-ecf-core
+%package -n eclipse-ecf-core-bootstrap
+%else
+%package core
+Obsoletes: eclipse-ecf-core-bootstrap
+%endif
Summary: Eclipse ECF Core
Group: Development/Libraries/Java
Requires: httpcomponents-client
Requires: httpcomponents-core
-%description -n eclipse-ecf-core
-ECF bundles required by eclipse-platform.
-
+%if %{with bootstrap}
+%description -n eclipse-ecf-core-bootstrap
%else
+%description core
+%endif
+ECF bundles required by eclipse-platform.
+%if %{without bootstrap}
%package runtime
Summary: Eclipse Communication Framework (ECF) Eclipse plug-in
Group: Development/Libraries/Java
@@ -116,7 +122,6 @@
%description sdk
Documentation and developer resources for the Eclipse Communication Framework
(ECF) plug-in.
-
%endif
%prep
@@ -210,21 +215,6 @@
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl</module>
<module>providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl</module>
</modules>"
-%else
-%pom_disable_module releng/features/org.eclipse.ecf.core.feature
-%pom_disable_module releng/features/org.eclipse.ecf.core.ssl.feature
-%pom_disable_module releng/features/org.eclipse.ecf.filetransfer.feature
-%pom_disable_module
releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature
-%pom_disable_module
releng/features/org.eclipse.ecf.filetransfer.httpclient4.ssl.feature
-%pom_disable_module releng/features/org.eclipse.ecf.filetransfer.ssl.feature
-%pom_disable_module framework/bundles/org.eclipse.ecf
-%pom_disable_module framework/bundles/org.eclipse.ecf.identity
-%pom_disable_module framework/bundles/org.eclipse.ecf.filetransfer
-%pom_disable_module framework/bundles/org.eclipse.ecf.ssl
-%pom_disable_module providers/bundles/org.eclipse.ecf.provider.filetransfer
-%pom_disable_module
providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4
-%pom_disable_module
providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl
-%pom_disable_module providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl
%endif
# TODO: Figure out why this is necessary....
@@ -260,7 +250,6 @@
%install
%mvn_install
-%if %{with bootstap}
# Move to libdir due to being part of core platform
install -d -m 755 %{buildroot}%{_eclipsedir}
mv %{buildroot}%{_datadir}/eclipse/droplets/ecf/{plugins,features}
%{buildroot}%{_eclipsedir}
@@ -271,7 +260,6 @@
sed -i -e
's|%{_datadir}/eclipse/droplets/ecf/features/|%{_eclipsedir}/features/|' \
-e
's|%{_datadir}/eclipse/droplets/ecf/plugins/|%{_eclipsedir}/plugins/|' .mfiles
sed -i -e '/droplets/d' .mfiles
-%endif
# Remove any symlinks that might be created during bootstrapping due to
missing platform bundles
for del in $( (cd %{buildroot}%{_eclipsedir}/plugins && ls | grep -v -e
'^org\.eclipse\.ecf' ) ) ; do
@@ -308,16 +296,16 @@
%fdupes -s %{buildroot}
%if %{with bootstrap}
-
-%files -n eclipse-ecf-core -f .mfiles
-%{_javadir}/eclipse
-
+%files -n eclipse-ecf-core-bootstrap -f .mfiles
%else
+%files core -f .mfiles
+%endif
+%{_javadir}/eclipse
+%if %{without bootstrap}
%files runtime -f .mfiles-runtime
%files sdk -f .mfiles-sdk
-
%endif
%changelog
