From 04112a75a430dae816b69bce3ac26c4354bf7be7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 12 Nov 2020 04:24:53 -0500 Subject: [PATCH] import eclipse-ecf-3.14.8-1.module+el8.3.0+8451+e8177ea0 --- .eclipse-ecf.metadata | 2 +- .gitignore | 2 +- SPECS/eclipse-ecf.spec | 17 +++++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.eclipse-ecf.metadata b/.eclipse-ecf.metadata index 043d3db..db859a7 100644 --- a/.eclipse-ecf.metadata +++ b/.eclipse-ecf.metadata @@ -1 +1 @@ -bdb985e9fb681f71c145a0574b5a55e36fb5fd16 SOURCES/org.eclipse.ecf-10bfc24f030d889e7dfa36e3a77034ae2786c368.tar.xz +531f765f2af4e8f04b98714f53d7323b562eb89f SOURCES/org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d.tar.xz diff --git a/.gitignore b/.gitignore index e5b72ba..0fc9031 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/org.eclipse.ecf-10bfc24f030d889e7dfa36e3a77034ae2786c368.tar.xz +SOURCES/org.eclipse.ecf-1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d.tar.xz diff --git a/SPECS/eclipse-ecf.spec b/SPECS/eclipse-ecf.spec index 9ebbbbd..b874460 100644 --- a/SPECS/eclipse-ecf.spec +++ b/SPECS/eclipse-ecf.spec @@ -4,20 +4,20 @@ # bootstrapping %global __requires_exclude .*org\.eclipse\.equinox.* -%global git_tag 10bfc24f030d889e7dfa36e3a77034ae2786c368 +%global git_tag 1e6e8e72cbb77a0e359e409cd4d2a58d03a6428d # Set this flag to avoid building everything except for the core bundles # Allows building into a brand new buildroot before Eclipse is even built %bcond_with bootstrap Name: eclipse-ecf -Version: 3.14.7 +Version: 3.14.8 Release: 1%{?dist} Summary: Eclipse Communication Framework (ECF) Eclipse plug-in # Note: The org.jivesoftware.smack bundle is Apache licensed # Note: The ch.ethz.iks.r_osgi.remote bundle is BSD licensed -License: EPL-1.0 and ASL 2.0 and BSD +License: EPL-2.0 and ASL 2.0 and BSD 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 @@ -30,7 +30,7 @@ Patch1: 0002-Remove-unneeded-dep-on-jdt-annotations.patch BuildRequires: tycho BuildRequires: tycho-extras BuildRequires: maven-plugin-build-helper -BuildRequires: eclipse-license +BuildRequires: eclipse-license2 BuildRequires: osgi-annotation BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core @@ -92,6 +92,7 @@ find . -type f -name "*.class" -exec rm {} \; # 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 @@ -113,20 +114,24 @@ sed -i -e '/examples/d' -e '/tests/d' pom.xml %pom_disable_module releng/features/org.eclipse.ecf.discovery.zookeeper.feature %pom_disable_module providers/bundles/org.eclipse.ecf.provider.zookeeper %pom_xpath_remove "feature/includes[@id='org.eclipse.ecf.discovery.zookeeper.feature']" releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml +sed -i -e '/provider.zookeeper/d' doc/bundles/org.eclipse.ecf.doc/build.properties # Using latest rome requires non-trivial port %pom_disable_module releng/features/org.eclipse.ecf.remoteservice.rest.synd.feature %pom_disable_module framework/bundles/org.eclipse.ecf.remoteservice.rest.synd +sed -i -e '/remoteservice.rest.synd/d' doc/bundles/org.eclipse.ecf.doc/build.properties # Disable SLP provider, rhbz#1416706 %pom_disable_module releng/features/org.eclipse.ecf.discovery.slp.feature %pom_disable_module providers/bundles/org.eclipse.ecf.provider.jslp %pom_disable_module protocols/bundles/ch.ethz.iks.slp %pom_xpath_remove "feature/includes[@id='org.eclipse.ecf.discovery.slp.feature']" releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml +sed -i -e '/provider.jslp/d' doc/bundles/org.eclipse.ecf.doc/build.properties # Misc other providers that we don't need %pom_disable_module releng/features/org.eclipse.ecf.discovery.dnssd.feature %pom_disable_module providers/bundles/org.eclipse.ecf.provider.dnssd +sed -i -e '/provider.dnssd/d' doc/bundles/org.eclipse.ecf.doc/build.properties %pom_disable_module protocols/bundles/org.jivesoftware.smack %pom_disable_module providers/bundles/org.eclipse.ecf.provider.xmpp.datashare %pom_disable_module providers/bundles/org.eclipse.ecf.provider.xmpp @@ -244,6 +249,10 @@ popd %endif %changelog +* Thu Jun 18 2020 Mat Booth - 3.14.8-1 +- Update to latest upstream release +- License switch to EPL 2 + * Fri Mar 20 2020 Mat Booth - 3.14.7-1 - Update to latest upstream release