From 9499a4403b9395eee2739171c849288ddb96ebd8 Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 23 Feb 2023 13:21:19 -0500 Subject: [PATCH] Import rpm: 7fec2c24b40c859f4e7997a77d12987a1f3b416e --- .gitignore | 4 +- 0001-Remove-dependency-on-nebula.patch | 26 ++++++++++ ...hat-requires-talking-to-the-internet.patch | 28 +++++++++++ eclipse-emf.spec | 50 +++++++++++++++---- sources | 4 +- 5 files changed, 97 insertions(+), 15 deletions(-) create mode 100644 0001-Remove-dependency-on-nebula.patch create mode 100644 0002-Remove-test-that-requires-talking-to-the-internet.patch diff --git a/.gitignore b/.gitignore index 4925ddd..a575913 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/org.eclipse.emf-063937d66a94e688eaa530b0ee8a8c751f2bb362.tar.xz -SOURCES/org.eclipse.xsd-8b09198c9d654e41049b7fc9654a1b62b9638b8b.tar.xz +SOURCES/org.eclipse.emf-R2_22_0.tar.xz +SOURCES/org.eclipse.xsd-R2_22_0.tar.xz diff --git a/0001-Remove-dependency-on-nebula.patch b/0001-Remove-dependency-on-nebula.patch new file mode 100644 index 0000000..496731f --- /dev/null +++ b/0001-Remove-dependency-on-nebula.patch @@ -0,0 +1,26 @@ +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/0002-Remove-test-that-requires-talking-to-the-internet.patch b/0002-Remove-test-that-requires-talking-to-the-internet.patch new file mode 100644 index 0000000..ccb96eb --- /dev/null +++ b/0002-Remove-test-that-requires-talking-to-the-internet.patch @@ -0,0 +1,28 @@ +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/eclipse-emf.spec b/eclipse-emf.spec index bba0fe9..24fe689 100644 --- a/eclipse-emf.spec +++ b/eclipse-emf.spec @@ -1,14 +1,15 @@ %global _eclipsedir %{_prefix}/lib/eclipse -%global emf_tag 063937d66a94e688eaa530b0ee8a8c751f2bb362 -%global xsd_tag 8b09198c9d654e41049b7fc9654a1b62b9638b8b +%global emf_tag R2_22_0 +%global xsd_tag R2_22_0 # 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.18.0 +Version: 2.22.0 Release: 1%{?dist} Summary: EMF and XSD Eclipse plug-ins @@ -18,9 +19,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: remove-nebula-dep.patch +Patch0: 0001-Remove-dependency-on-nebula.patch # Remove test that requires internet connection -Patch1: remove-network-tests.patch +Patch1: 0002-Remove-test-that-requires-talking-to-the-internet.patch BuildRequires: tycho BuildRequires: tycho-extras @@ -30,19 +31,20 @@ BuildRequires: eclipse-pde BuildArch: noarch -ExclusiveArch: x86_64 +# Upstream Eclipse no longer supports non-64bit arches +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 @@ -85,8 +87,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 -%patch1 +%patch0 -p1 +%patch1 -p1 pushd org.eclipse.emf @@ -106,7 +108,6 @@ 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 @@ -141,6 +142,7 @@ 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 @@ -188,6 +190,7 @@ 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 @@ -196,6 +199,31 @@ 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 @@ -499,4 +527,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. + compiled bits because of RHBZ #477707. \ No newline at end of file diff --git a/sources b/sources index 5390be9..cfb7a32 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (org.eclipse.emf-063937d66a94e688eaa530b0ee8a8c751f2bb362.tar.xz) = f83d2ec2574812cffab89a670b65636c3dfcb391f74833911d32e9623096a79f94cef7d592e9bb5e210aee9ea4bae35228e191df2d8349a27a73381c9323a45c -SHA512 (org.eclipse.xsd-8b09198c9d654e41049b7fc9654a1b62b9638b8b.tar.xz) = 738602ee65e2b08662beca63f2c11410a66e6020d661a59fb8710087383ee837332784ee7981dc0e1a932140aa5f4935d9d7f47eb2f5f51798b6ad5a0b424274 +SHA1 (org.eclipse.emf-R2_22_0.tar.xz) = 389d3e34568d5481823c38cb3734930df53fc053 +SHA1 (org.eclipse.xsd-R2_22_0.tar.xz) = d765f25648d275cf9fb28b617f6cf39ae5e97a19