diff --git a/.eclipse-emf.metadata b/.eclipse-emf.metadata index 3201f4e..cd76d87 100644 --- a/.eclipse-emf.metadata +++ b/.eclipse-emf.metadata @@ -1,2 +1,2 @@ -389d3e34568d5481823c38cb3734930df53fc053 SOURCES/org.eclipse.emf-R2_22_0.tar.xz -d765f25648d275cf9fb28b617f6cf39ae5e97a19 SOURCES/org.eclipse.xsd-R2_22_0.tar.xz +f94c410143899c9fce71eb109bddc6216dfe6a93 SOURCES/org.eclipse.emf-063937d66a94e688eaa530b0ee8a8c751f2bb362.tar.xz +912e82f919eceace2793e4dd30affd23548c7aac SOURCES/org.eclipse.xsd-8b09198c9d654e41049b7fc9654a1b62b9638b8b.tar.xz diff --git a/.gitignore b/.gitignore index a575913..4925ddd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/org.eclipse.emf-R2_22_0.tar.xz -SOURCES/org.eclipse.xsd-R2_22_0.tar.xz +SOURCES/org.eclipse.emf-063937d66a94e688eaa530b0ee8a8c751f2bb362.tar.xz +SOURCES/org.eclipse.xsd-8b09198c9d654e41049b7fc9654a1b62b9638b8b.tar.xz diff --git a/SOURCES/0001-Remove-dependency-on-nebula.patch b/SOURCES/0001-Remove-dependency-on-nebula.patch deleted file mode 100644 index 496731f..0000000 --- a/SOURCES/0001-Remove-dependency-on-nebula.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 079a94e149165b30af36d13cfc8f37b5f854881f Mon Sep 17 00:00:00 2001 -From: Mat Booth -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 - diff --git a/SOURCES/0002-Remove-test-that-requires-talking-to-the-internet.patch b/SOURCES/0002-Remove-test-that-requires-talking-to-the-internet.patch deleted file mode 100644 index ccb96eb..0000000 --- a/SOURCES/0002-Remove-test-that-requires-talking-to-the-internet.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 25b039d588bc77b8f70d74ddacb6b7ad570c95e6 Mon Sep 17 00:00:00 2001 -From: Mat Booth -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 - diff --git a/SOURCES/remove-nebula-dep.patch b/SOURCES/remove-nebula-dep.patch new file mode 100644 index 0000000..b7f528d --- /dev/null +++ b/SOURCES/remove-nebula-dep.patch @@ -0,0 +1,12 @@ +--- org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF.orig 2018-05-09 19:41:37.559144126 +0100 ++++ org.eclipse.emf/plugins/org.eclipse.emf.edit.ui/META-INF/MANIFEST.MF 2018-05-09 19:41:44.098112719 +0100 +@@ -22,8 +22,7 @@ + org.eclipse.emf.common.ui;bundle-version="[2.15.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 diff --git a/SOURCES/remove-network-tests.patch b/SOURCES/remove-network-tests.patch new file mode 100644 index 0000000..ebd9609 --- /dev/null +++ b/SOURCES/remove-network-tests.patch @@ -0,0 +1,14 @@ +--- org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java.orig 2018-05-10 14:41:06.000058437 +0100 ++++ org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/ecore/URIConverterTest.java 2018-05-10 14:41:11.426036461 +0100 +@@ -77,11 +77,6 @@ + assertEquals(contentsFromUncompressedFile, contents); + new File(URI.createURI(uri.authority().replaceAll("!", "")).toFileString()).delete(); + +- // Reads the data.zip file from our git repository using http +- // +- uri = URI.createURI("archive:http://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 diff --git a/SPECS/eclipse-emf.spec b/SPECS/eclipse-emf.spec index 24fe689..bba0fe9 100644 --- a/SPECS/eclipse-emf.spec +++ b/SPECS/eclipse-emf.spec @@ -1,15 +1,14 @@ %global _eclipsedir %{_prefix}/lib/eclipse -%global emf_tag R2_22_0 -%global xsd_tag R2_22_0 +%global emf_tag 063937d66a94e688eaa530b0ee8a8c751f2bb362 +%global xsd_tag 8b09198c9d654e41049b7fc9654a1b62b9638b8b # 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 -Epoch: 1 Name: eclipse-emf -Version: 2.22.0 +Version: 2.18.0 Release: 1%{?dist} Summary: EMF and XSD Eclipse plug-ins @@ -19,9 +18,9 @@ Source0: https://git.eclipse.org/c/emf/org.eclipse.emf.git/snapshot/org.eclips 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 (not in Fedora) -Patch0: 0001-Remove-dependency-on-nebula.patch +Patch0: remove-nebula-dep.patch # Remove test that requires internet connection -Patch1: 0002-Remove-test-that-requires-talking-to-the-internet.patch +Patch1: remove-network-tests.patch BuildRequires: tycho BuildRequires: tycho-extras @@ -31,20 +30,19 @@ BuildRequires: eclipse-pde BuildArch: noarch -# Upstream Eclipse no longer supports non-64bit arches -ExclusiveArch: x86_64 +ExclusiveArch: x86_64 %description The Eclipse Modeling Framework (EMF) and XML Schema Definition (XSD) plug-ins. %package core +Epoch: 1 Summary: Eclipse EMF Core Bundles %description core Core EMF bundles required by the Eclipse platform. %if %{without bootstrap} - %package runtime Summary: Eclipse Modeling Framework (EMF) Eclipse plug-in @@ -87,8 +85,8 @@ Documentation and developer resources for the Eclipse Modeling Framework mv org.eclipse.emf-%{emf_tag}/ org.eclipse.emf/ mv org.eclipse.xsd-%{xsd_tag}/ org.eclipse.xsd/ -%patch0 -p1 -%patch1 -p1 +%patch0 +%patch1 pushd org.eclipse.emf @@ -108,6 +106,7 @@ sed -i -e '/.*examples/d' releng/org.eclipse.emf.parent/plugins/pom.xml %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 @@ -142,7 +141,6 @@ popd # 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 @@ -190,7 +188,6 @@ done %license org.eclipse.emf/features/org.eclipse.emf.license-feature/*.html %if %{without bootstrap} - %files runtime -f .mfiles-runtime %files xsd -f .mfiles-xsd @@ -199,31 +196,6 @@ done %endif %changelog -* Thu Jun 18 2020 Mat Booth - 1:2.22.0-1 -- Update to latest upstream release - -* Fri Mar 20 2020 Mat Booth - 1:2.21.0-1 -- Update to latest upstream release - -* Tue Jan 28 2020 Fedora Release Engineering - 1:2.20.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 14 2020 Mat Booth - 1:2.20.0-4 -- Use Epoch for all subpackages to avoid repo sanity check failures - -* Thu Dec 19 2019 Mat Booth - 2.20.0-3 -- Full build - -* Wed Dec 18 2019 Mat Booth - 2.20.0-2 -- Enable bootstrap mode - -* Wed Dec 18 2019 Mat Booth - 2.20.0-1 -- Update to latest upstream release - -* Fri Sep 13 2019 Mat Booth - 2.19.0-1 -- Update to latest upstream release -- Don't ship base feature - * Sat Jun 15 2019 Mat Booth - 2.18.0-1 - Update to latest upstream release @@ -527,4 +499,4 @@ done * Fri Dec 12 2008 Mat Booth 2.4.1-1 - Initial release, based on eclipse-gef spec file, but with disabled AOT - compiled bits because of RHBZ #477707. \ No newline at end of file + compiled bits because of RHBZ #477707.