Hello community, here is the log from the commit of package eclipse-emf for openSUSE:Factory checked in at 2020-07-16 12:11:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eclipse-emf (Old) and /work/SRC/openSUSE:Factory/.eclipse-emf.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse-emf" Thu Jul 16 12:11:46 2020 rev:4 rq:818529 version:2.22.0 Changes: -------- --- /work/SRC/openSUSE:Factory/eclipse-emf/eclipse-emf.changes 2020-04-11 23:46:09.435071382 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse-emf.new.3592/eclipse-emf.changes 2020-07-16 12:12:24.346597889 +0200 @@ -1,0 +2,13 @@ +Fri Jul 3 09:43:22 UTC 2020 - Fridrich Strba <[email protected]> + +- Upgrade to 2.22.0 +- Removed patches: + * remove-nebula-dep.patch + * remove-network-tests.patch + * remove-timezone-test.patch + * remove-unnecessary-imports.patch +- Added patches: + * 0001-Remove-dependency-on-nebula.patch + * 0002-Remove-test-that-requires-talking-to-the-internet.patch + +------------------------------------------------------------------- Old: ---- org.eclipse.emf-d1e5fddbdcb41db9a272c8aaaba7689442310efb.tar.xz org.eclipse.xsd-be9714f28ae9ccc05cee1ee49424f2f97810fe60.tar.xz remove-nebula-dep.patch remove-network-tests.patch remove-timezone-test.patch remove-unnecessary-imports.patch New: ---- 0001-Remove-dependency-on-nebula.patch 0002-Remove-test-that-requires-talking-to-the-internet.patch org.eclipse.emf-R2_22_0.tar.xz org.eclipse.xsd-R2_22_0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse-emf.spec ++++++ --- /var/tmp/diff_new_pack.LUGGP2/_old 2020-07-16 12:12:30.870604486 +0200 +++ /var/tmp/diff_new_pack.LUGGP2/_new 2020-07-16 12:12:30.870604486 +0200 @@ -23,34 +23,31 @@ %bcond_with bootstrap %endif %global _eclipsedir %{_libdir}/eclipse -%global emf_tag d1e5fddbdcb41db9a272c8aaaba7689442310efb -%global xsd_tag be9714f28ae9ccc05cee1ee49424f2f97810fe60 -Version: 2.15.0~gitd1e5fdd +%global emf_tag R2_22_0 +%global xsd_tag R2_22_0 +Version: 2.22.0 Release: 0 Summary: EMF and XSD Eclipse plug-ins License: EPL-2.0 Group: Development/Libraries/Java URL: https://www.eclipse.org/modeling/emf/ -Source0: http://git.eclipse.org/c/emf/org.eclipse.emf.git/snapshot/org.eclipse.emf-%{emf_tag}.tar.xz -Source1: http://git.eclipse.org/c/xsd/org.eclipse.xsd.git/snapshot/org.eclipse.xsd-%{xsd_tag}.tar.xz +Source0: https://git.eclipse.org/c/emf/org.eclipse.emf.git/snapshot/org.eclipse.emf-%{emf_tag}.tar.xz +Source1: https://git.eclipse.org/c/xsd/org.eclipse.xsd.git/snapshot/org.eclipse.xsd-%{xsd_tag}.tar.xz # Avoid hard build-time dep on nebula -Patch0: remove-nebula-dep.patch +Patch0: 0001-Remove-dependency-on-nebula.patch # Remove test that requires internet connection -Patch1: remove-network-tests.patch -# Remove test that seems to fail in some timezones, reported upstream: https://bugs.eclipse.org/bugs/show_bug.cgi?id=534542 -Patch2: remove-timezone-test.patch -# Remove unnecessary imports of JRE packages that are supplied by the system bundle -Patch3: remove-unnecessary-imports.patch +Patch1: 0002-Remove-test-that-requires-talking-to-the-internet.patch BuildRequires: fdupes -BuildRequires: tycho-extras +BuildRequires: maven-local BuildRequires: xz -BuildConflicts: java-devel >= 9 +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} %if %{with bootstrap} Name: eclipse-emf-bootstrap +BuildRequires: tycho-bootstrap +#!BuildIgnore: tycho %else Name: eclipse-emf -%endif -%if %{without bootstrap} BuildRequires: eclipse-ecf-core-bootstrap BuildRequires: eclipse-emf-core-bootstrap BuildRequires: eclipse-pde-bootstrap @@ -60,9 +57,6 @@ #!BuildIgnore: eclipse-platform #!BuildIgnore: tycho-bootstrap #!BuildRequires: log4j -%else -BuildRequires: tycho-bootstrap -#!BuildIgnore: tycho %endif %description @@ -125,10 +119,8 @@ mv org.eclipse.emf-%{emf_tag}/ org.eclipse.emf/ mv org.eclipse.xsd-%{xsd_tag}/ org.eclipse.xsd/ -%patch0 -%patch1 -%patch2 -%patch3 +%patch0 -p1 +%patch1 -p1 pushd org.eclipse.emf @@ -148,7 +140,6 @@ %pom_xpath_remove "plugin[@id='org.eclipse.emf.test.examples']" tests/org.eclipse.emf.tests-feature/feature.xml # Disable modules unneeded for tycho build - %pom_disable_module "tp" releng/org.eclipse.emf.parent %pom_disable_module "../org.eclipse.emf.site" releng/org.eclipse.emf.parent %pom_disable_module '../../../features/org.eclipse.emf.all-feature' releng/org.eclipse.emf.parent/features @@ -183,6 +174,7 @@ # Don't install poms or license features %{mvn_package} "::pom::" __noinstall %{mvn_package} ":org.eclipse.{emf,xsd}.license" __noinstall +%{mvn_package} ":org.eclipse.emf.base" __noinstall # No need to ship tests as they are run at buildtime %{mvn_package} ":org.eclipse.emf.tests" __noinstall ++++++ 0001-Remove-dependency-on-nebula.patch ++++++ >From 079a94e149165b30af36d13cfc8f37b5f854881f Mon Sep 17 00:00:00 2001 From: Mat Booth <[email protected]> Date: Fri, 20 Mar 2020 13:53:25 +0000 Subject: [PATCH 1/2] Remove dependency on nebula --- plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF b/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF index d3d62b9..d288949 100644 --- a/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF @@ -22,8 +22,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.common.ui;bundle-version="[2.18.0,3.0.0)";visibility:=reexport, org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)";resolution:=optional, org.eclipse.ui.ide;bundle-version="[3.6.0,4.0.0)";resolution:=optional, - org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)";resolution:=optional, - org.eclipse.nebula.widgets.cdatetime;bundle-version="[1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy + org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)";resolution:=optional Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.emf.edit.ui -- 2.21.1 ++++++ 0002-Remove-test-that-requires-talking-to-the-internet.patch ++++++ >From 25b039d588bc77b8f70d74ddacb6b7ad570c95e6 Mon Sep 17 00:00:00 2001 From: Mat Booth <[email protected]> Date: Fri, 20 Mar 2020 13:53:59 +0000 Subject: [PATCH 2/2] Remove test that requires talking to the internet --- .../org/eclipse/emf/test/core/ecore/URIConverterTest.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java b/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java index 400dfda..500bd93 100644 --- a/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java +++ b/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java @@ -77,11 +77,6 @@ public class URIConverterTest assertEquals(contentsFromUncompressedFile, contents); new File(URI.createURI(uri.authority().replaceAll("!", "")).toFileString()).delete(); - // Reads the data.zip file from our git repository using https - // - uri = URI.createURI("archive:https://git.eclipse.org/c/emf/org.eclipse.emf.git/plain/tests/org.eclipse.emf.test.core/data/data.zip!/%66ile.txt";); - contents = readFile(uriConverter.createInputStream(uri)); - assertEquals(contentsFromUncompressedFile, contents); } protected String readFile(InputStream inputStream) throws IOException -- 2.21.1
