commit eclipse-ecf for openSUSE:Factory
Hello community,
here is the log from the commit of package eclipse-ecf for openSUSE:Factory
checked in at 2020-07-16 12:12:23
Comparing /work/SRC/openSUSE:Factory/eclipse-ecf (Old)
and /work/SRC/openSUSE:Factory/.eclipse-ecf.new.3592 (New)
Package is "eclipse-ecf"
Thu Jul 16 12:12:23 2020 rev:6 rq:818542 version:3.14.8
Changes:
--- /work/SRC/openSUSE:Factory/eclipse-ecf/eclipse-ecf.changes 2020-06-04
17:53:52.152527897 +0200
+++ /work/SRC/openSUSE:Factory/.eclipse-ecf.new.3592/eclipse-ecf.changes
2020-07-16 12:14:06.846701522 +0200
@@ -1,0 +2,10 @@
+Fri Jul 3 09:46:57 UTC 2020 - Fridrich Strba
+
+- Update to 3.14.8
+- Remove patch:
+ * eclipse-ecf-feature-deps.patch
+- Added patches:
+ * 0001-Avoid-hard-coding-dependency-versions-by-using-featu.patch
+ * 0002-Remove-unneeded-dep-on-jdt-annotations.patch
+
+---
Old:
eclipse-ecf-feature-deps.patch
org.eclipse.ecf-10bfc24f030d889e7dfa36e3a77034ae2786c368.tar.xz
New:
0001-Avoid-hard-coding-dependency-versions-by-using-featu.patch
0002-Remove-unneeded-dep-on-jdt-annotations.patch
org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d.tar.xz
Other differences:
--
++ eclipse-ecf.spec ++
--- /var/tmp/diff_new_pack.LUwFyU/_old 2020-07-16 12:14:09.670704377 +0200
+++ /var/tmp/diff_new_pack.LUwFyU/_new 2020-07-16 12:14:09.670704377 +0200
@@ -26,38 +26,41 @@
# This exclude breaks the cyclic dependency on the platform to aide in
# bootstrapping
%global __requires_exclude .*org\.eclipse\.equinox.*
-%global git_tag 10bfc24f030d889e7dfa36e3a77034ae2786c368
+%global git_tag 1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d
# Set this flag to avoid building additional providers when their
# dependencies are not available
%bcond_with providers
-Version:3.14.7
+Version:3.14.8
Release:0
Summary:Eclipse Communication Framework (ECF) Eclipse plug-in
-# Note: The jive/smack provider is apache licensed
-License:EPL-1.0 AND Apache-2.0
+License:EPL-2.0 AND Apache-2.0 AND BSD-3-Clause
Group: Development/Libraries/Java
URL:https://www.eclipse.org/ecf/
Source0:
https://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.eclipse.ecf-%{git_tag}.tar.xz
# Change how feature deps are specified, to avoid embedding versions
-Patch0: eclipse-ecf-feature-deps.patch
+Patch0: 0001-Avoid-hard-coding-dependency-versions-by-using-featu.patch
+# Unneeded dep on JDT prevents bootstrap mode
+Patch1: 0002-Remove-unneeded-dep-on-jdt-annotations.patch
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-logging
-BuildRequires: eclipse-license
+BuildRequires: eclipse-license2
BuildRequires: fdupes
+BuildRequires: glassfish-annotation-api
BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core
+BuildRequires: java-devel >= 9
+BuildRequires: maven-local
BuildRequires: maven-plugin-build-helper
BuildRequires: osgi-annotation
-BuildRequires: tycho-extras
-BuildRequires: xpp3-minimal
-BuildConflicts: java-devel >= 9
+# Upstream Eclipse no longer supports non-64bit arches
+ExcludeArch:s390 %{arm} %{ix86}
%if %{with bootstrap}
Name: eclipse-ecf-bootstrap
+BuildRequires: tycho-bootstrap
+#!BuildIgnore: tycho
%else
Name: eclipse-ecf
-%endif
-%if %{without bootstrap}
-BuildRequires: eclipse-ecf-core-bootstrap
+BuildRequires: eclipse-ecf-core-bootstrap >= %{version}
BuildRequires: eclipse-emf-core
BuildRequires: eclipse-emf-runtime
BuildRequires: eclipse-pde-bootstrap
@@ -67,13 +70,6 @@
#!BuildIgnore: eclipse-platform
#!BuildIgnore: tycho-bootstrap
#!BuildRequires: log4j
-%if %{with providers}
-BuildRequires: dnsjava
-BuildRequires: irclib
-%endif
-%else
-BuildRequires: tycho-bootstrap
-#!BuildIgnore: tycho
%endif
%description
@@ -127,6 +123,7 @@
find . -type f -name "*.class" -exec rm {} \;
%patch0 -p1
+%patch1 -p1
# Correction for content of runtime package
%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.presence']"
releng/features/org.eclipse.ecf.core/feature.xml
@@ -134,6 +131,7 @@
# Don't build examples or tests
sed -i -e '/examples/d' -e '/tests/d' pom.xml
%pom_disable_module releng/features/org.eclipse.ecf.tests.feature
+%pom_disable_module releng/features/org.eclipse.ecf.tests.filetransfer.feature
%pom_disable_module releng/features/org.eclipse.ecf.eventadmin.examples.feature
%pom_disable_module
releng/features/org.eclipse.ecf.remoteservice.examples.feature
%pom_disable_module
releng/features/org.eclipse.ecf.remoteservice.sdk.examples.feature
@@ -155,21 +153,24 @@
%pom_disable_module
commit eclipse-ecf for openSUSE:Factory
Hello community,
here is the log from the commit of package eclipse-ecf for openSUSE:Factory
checked in at 2020-06-04 17:53:44
Comparing /work/SRC/openSUSE:Factory/eclipse-ecf (Old)
and /work/SRC/openSUSE:Factory/.eclipse-ecf.new.3606 (New)
Package is "eclipse-ecf"
Thu Jun 4 17:53:44 2020 rev:5 rq:811275 version:3.14.7
Changes:
--- /work/SRC/openSUSE:Factory/eclipse-ecf/eclipse-ecf.changes 2020-04-11
23:45:58.347062931 +0200
+++ /work/SRC/openSUSE:Factory/.eclipse-ecf.new.3606/eclipse-ecf.changes
2020-06-04 17:53:52.152527897 +0200
@@ -1,0 +2,7 @@
+Tue Jun 2 10:24:46 UTC 2020 - Pedro Monreal Gonzalez
+
+- Update to 3.14.7
+- Refresh eclipse-ecf-feature-deps.patch
+- Remove eclipse-ecf-asm7.patch fixed upstream
+
+---
Old:
eclipse-ecf-asm7.patch
org.eclipse.ecf-62a51c1a2635c5e17a17c0d8fc46c1f006e24184.tar.xz
New:
org.eclipse.ecf-10bfc24f030d889e7dfa36e3a77034ae2786c368.tar.xz
Other differences:
--
++ eclipse-ecf.spec ++
--- /var/tmp/diff_new_pack.ThObQE/_old 2020-06-04 17:53:54.364534696 +0200
+++ /var/tmp/diff_new_pack.ThObQE/_new 2020-06-04 17:53:54.368534709 +0200
@@ -26,21 +26,20 @@
# This exclude breaks the cyclic dependency on the platform to aide in
# bootstrapping
%global __requires_exclude .*org\.eclipse\.equinox.*
-%global git_tag 62a51c1a2635c5e17a17c0d8fc46c1f006e24184
+%global git_tag 10bfc24f030d889e7dfa36e3a77034ae2786c368
# Set this flag to avoid building additional providers when their
# dependencies are not available
%bcond_with providers
-Version:3.14.1
+Version:3.14.7
Release:0
Summary:Eclipse Communication Framework (ECF) Eclipse plug-in
# Note: The jive/smack provider is apache licensed
License:EPL-1.0 AND Apache-2.0
Group: Development/Libraries/Java
URL:https://www.eclipse.org/ecf/
-Source0:
http://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.eclipse.ecf-%{git_tag}.tar.xz
+Source0:
https://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.eclipse.ecf-%{git_tag}.tar.xz
# Change how feature deps are specified, to avoid embedding versions
Patch0: eclipse-ecf-feature-deps.patch
-Patch1: eclipse-ecf-asm7.patch
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-logging
BuildRequires: eclipse-license
@@ -127,8 +126,7 @@
find . -type f -name "*.jar" -exec rm {} \;
find . -type f -name "*.class" -exec rm {} \;
-%patch0
-%patch1 -p1
+%patch0 -p1
# Correction for content of runtime package
%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.presence']"
releng/features/org.eclipse.ecf.core/feature.xml
@@ -185,6 +183,10 @@
%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.provider.irc.ui']"
releng/features/org.eclipse.ecf.core/feature.xml
%endif
+# Don't build bundles that are not relevant to our platform
+%pom_disable_module
providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32
+%pom_xpath_remove "feature/plugin[@os='win32']"
releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/feature.xml
+
# Use system libs
ln -s $(build-classpath osgi-annotation)
osgi/bundles/org.eclipse.osgi.services.remoteserviceadmin/osgi/osgi.annotation.jar
%if %{with providers}
++ eclipse-ecf-feature-deps.patch ++
--- /var/tmp/diff_new_pack.ThObQE/_old 2020-06-04 17:53:54.412534844 +0200
+++ /var/tmp/diff_new_pack.ThObQE/_new 2020-06-04 17:53:54.416534856 +0200
@@ -1,6 +1,47 @@
releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml.orig
2018-05-15 10:08:53.167669287 +0100
-+++
releng/features/org.eclipse.ecf.filetransfer.httpclient4.feature/feature.xml
2018-05-15 10:10:29.460140752 +0100
-@@ -27,6 +27,10 @@
+From 51b88b0a6e59107f393d497cf94db07c0865e577 Mon Sep 17 00:00:00 2001
+From: Mat Booth
+Date: Sun, 16 Jun 2019 12:22:32 +0100
+Subject: [PATCH 1/2] Avoid hard-coding dependency versions by using feature
+ imports instead of feature plugins for third party bundles
+
+---
+ .../feature.xml | 8 +--
+ .../feature.xml | 32 ++-
+ .../feature.xml | 56 ++-
+ .../feature.xml | 8 +--
+ .../feature.xml | 7 ---
+ .../org.eclipse.ecf.xmpp.feature/feature.xml | 8 +--
+ 6 files changed, 11 insertions(+), 108 deletions(-)
+
+diff --git
a/releng/features/org.eclipse.ecf.discovery.dnssd.feature/feature.xml
b/releng/features/org.eclipse.ecf.discovery.dnssd.feature/feature.xml
+index 0c7810a..d4b0e67 100644
+---
commit eclipse-ecf for openSUSE:Factory
Hello community,
here is the log from the commit of package eclipse-ecf for openSUSE:Factory
checked in at 2020-04-11 23:45:48
Comparing /work/SRC/openSUSE:Factory/eclipse-ecf (Old)
and /work/SRC/openSUSE:Factory/.eclipse-ecf.new.3248 (New)
Package is "eclipse-ecf"
Sat Apr 11 23:45:48 2020 rev:4 rq:792666 version:3.14.1
Changes:
--- /work/SRC/openSUSE:Factory/eclipse-ecf/eclipse-ecf.changes 2020-03-18
12:41:31.812808104 +0100
+++ /work/SRC/openSUSE:Factory/.eclipse-ecf.new.3248/eclipse-ecf.changes
2020-04-11 23:45:58.347062931 +0200
@@ -1,0 +2,5 @@
+Thu Apr 9 09:09:25 UTC 2020 - Fridrich Strba
+
+- Build against jgit, since jgit-bootstrap does not exist
+
+---
Other differences:
--
++ eclipse-ecf.spec ++
--- /var/tmp/diff_new_pack.9tXXzG/_old 2020-04-11 23:45:59.395063730 +0200
+++ /var/tmp/diff_new_pack.9tXXzG/_new 2020-04-11 23:45:59.399063733 +0200
@@ -63,10 +63,9 @@
BuildRequires: eclipse-emf-runtime
BuildRequires: eclipse-pde-bootstrap
BuildRequires: eclipse-platform-bootstrap
-BuildRequires: jgit-bootstrap
+BuildRequires: jgit
BuildRequires: tycho
#!BuildIgnore: eclipse-platform
-#!BuildIgnore: jgit
#!BuildIgnore: tycho-bootstrap
#!BuildRequires: log4j
%if %{with providers}
@@ -75,8 +74,6 @@
%endif
%else
BuildRequires: tycho-bootstrap
-#!BuildIgnore: jgit
-#!BuildIgnore: jgit-bootstrap
#!BuildIgnore: tycho
%endif
@@ -244,7 +241,7 @@
%build
# Qualifier generated from last modification time of source tarball
-QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M)
+QUALIFIER=$(date -u -d"$(stat --format=%%y %{SOURCE0})" +v%%Y%%m%%d-%%H%%M)
%{mvn_build} -j -f -- -DforceContextQualifier=$QUALIFIER
%install
commit eclipse-ecf for openSUSE:Factory
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
+
+- 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 @@
providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient4.ssl
providers/bundles/org.eclipse.ecf.provider.filetransfer.ssl
"
-%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
commit eclipse-ecf for openSUSE:Factory
Hello community,
here is the log from the commit of package eclipse-ecf for openSUSE:Factory
checked in at 2019-11-28 13:50:31
Comparing /work/SRC/openSUSE:Factory/eclipse-ecf (Old)
and /work/SRC/openSUSE:Factory/.eclipse-ecf.new.26869 (New)
Package is "eclipse-ecf"
Thu Nov 28 13:50:31 2019 rev:2 rq:751515 version:3.14.1
Changes:
--- /work/SRC/openSUSE:Factory/eclipse-ecf/eclipse-ecf.changes 2019-11-19
13:44:04.552423292 +0100
+++ /work/SRC/openSUSE:Factory/.eclipse-ecf.new.26869/eclipse-ecf.changes
2019-11-28 13:50:38.334700120 +0100
@@ -1,0 +2,7 @@
+Thu Nov 28 08:35:20 UTC 2019 - Fridrich Strba
+
+- Added patch:
+ * eclipse-ecf-asm7.patch
++ Allow building with objectweb-asm >= 7
+
+---
New:
eclipse-ecf-asm7.patch
Other differences:
--
++ eclipse-ecf.spec ++
--- /var/tmp/diff_new_pack.4o6tHg/_old 2019-11-28 13:50:39.718699594 +0100
+++ /var/tmp/diff_new_pack.4o6tHg/_new 2019-11-28 13:50:39.726699591 +0100
@@ -1,7 +1,7 @@
#
# spec file for package eclipse-ecf
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -40,6 +40,7 @@
Source0:
http://git.eclipse.org/c/ecf/org.eclipse.ecf.git/snapshot/org.eclipse.ecf-%{git_tag}.tar.xz
# Change how feature deps are specified, to avoid embedding versions
Patch0: eclipse-ecf-feature-deps.patch
+Patch1: eclipse-ecf-asm7.patch
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-logging
BuildRequires: eclipse-license
@@ -125,6 +126,7 @@
find . -type f -name "*.class" -exec rm {} \;
%patch0
+%patch1 -p1
# Correction for content of runtime package
%pom_xpath_remove "feature/plugin[@id='org.eclipse.ecf.presence']"
releng/features/org.eclipse.ecf.core/feature.xml
++ eclipse-ecf-asm7.patch ++
---
org.eclipse.ecf-62a51c1a2635c5e17a17c0d8fc46c1f006e24184/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
2018-07-30 22:51:30.0 +0200
+++
org.eclipse.ecf-62a51c1a2635c5e17a17c0d8fc46c1f006e24184/protocols/bundles/ch.ethz.iks.r_osgi.remote/META-INF/MANIFEST.MF
2019-11-26 20:21:36.722413163 +0100
@@ -7,7 +7,7 @@
Bundle-Vendor: %plugin.provider
Import-Package: org.eclipse.ecf.remoteservice;version="7.3.0",
org.eclipse.ecf.remoteservice.asyncproxy;version="[1.0.0,3.0.0)",
- org.objectweb.asm;version="[5.0.1,7.0.0)",
+ org.objectweb.asm;version="[5.0.1,8.0.0)",
org.osgi.framework;version="[1.0.0,2.0.0)",
org.osgi.service.event;version="[1.0.0,2.0.0)",
org.osgi.service.log;version="[1.0.0,2.0.0)",
