From 24fcc5a066305320467f647785aed8e221661c84 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Nov 18 2020 21:41:29 +0000 Subject: Drop contributor-tools sub-package Remove workaround for old ASM version --- diff --git a/eclipse.spec b/eclipse.spec index cb158f2..a26dc19 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -3,9 +3,6 @@ # this is a way to bootstrap Eclipse on secondary archs. %bcond_with bootstrap -# Set this to avoid building contributor tools -%bcond_without contrib_tools - Epoch: 1 %global eb_commit e3e8e3f486014f5683f9200a981f313800b8c964 @@ -57,7 +54,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: 4.17 -Release: 3%{?dist} +Release: 4%{?dist} License: EPL-2.0 URL: https://www.eclipse.org/ @@ -214,11 +211,6 @@ BuildRequires: jna-contrib %if %{without bootstrap} # For building docs and apitooling BuildRequires: eclipse-pde -%if %{with contrib_tools} -# For contributor tools -BuildRequires: eclipse-egit -BuildRequires: eclipse-emf-runtime >= %{_emf_version} -%endif %endif %description @@ -291,6 +283,10 @@ Requires: httpcomponents-client Obsoletes: eclipse-epp-logging <= 2.0.8-4 Obsoletes: eclipse-abrt <= 0.0.3-10 +# No longer shipping tests and contrib tools since F33 +Obsoletes: %{name}-tests < 1:4.17-4 +Obsoletes: %{name}-contributor-tools < 1:4.17-4 + %description platform The Eclipse Platform is the base of all IDE plugins. This does not include the Java Development Tools or the Plugin Development Environment. @@ -335,17 +331,6 @@ p2 provisioning platform. Discovery can be used as a tool to display and install from existing P2 repositories or as a framework to build branded installer UIs. -%if %{without bootstrap} && %{with contrib_tools} -%package contributor-tools -Summary: Tools for Eclipse Contributors -# No longer shipping tests -Obsoletes: %{name}-tests < 1:4.14-2 - -%description contributor-tools -This package contains tools specifically for Eclipse contributors. It includes -SWT tools, E4 tools, Rel-Eng tools and Eclipse Test frameworks. -%endif - %prep %setup -T -c @@ -567,8 +552,7 @@ done # Fix javadoc generation relying on Windows version of SWT sed -i -e '/swt/s/swt.win32.win32.x86_64/swt.gtk.linux.%{eclipse_arch}/' eclipse.platform.common/bundles/org.eclipse*/*Options.txt -%if %{with bootstrap} || %{without contrib_tools} -# Disable contributor tools that have external dependencies during bootstrap +# Disable contributor tools %pom_disable_module eclipse.platform.ui.tools %pom_disable_module features/org.eclipse.swt.tools.feature eclipse.platform.swt %pom_disable_module bundles/org.eclipse.swt.tools.base eclipse.platform.swt @@ -576,7 +560,6 @@ sed -i -e '/swt/s/swt.win32.win32.x86_64/swt.gtk.linux.%{eclipse_arch}/' eclipse %pom_disable_module bundles/org.eclipse.swt.tools eclipse.platform.swt %pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng %pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng -%endif # Include some extra features with the product that some other projects may need at # build time as part of their target platform definitions @@ -620,10 +603,6 @@ sed -i -e '/org.apache.felix.service.command/s/;status=provisional//' rt.equinox # Make maven output less noisy due to lack of intenet connection sed -i -e '/baselineMode/s/warn/disable/' eclipse-platform-parent/pom.xml -# Remove release parameter not needed when using BREE libs -sed -i -e '/maven.compiler.release/d' \ - eclipse.jdt.debug/org.eclipse.jdt.debug/pom.xml eclipse.jdt.debug/org.eclipse.jdt.launching/pom.xml rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml - # Use system osgi.annotation lib ln -s $(build-classpath osgi-annotation) rt.equinox.framework/bundles/org.eclipse.osgi/osgi/ ln -s $(build-classpath osgi-annotation) rt.equinox.framework/bundles/org.eclipse.osgi.services/lib/ @@ -634,7 +613,6 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse. # The order of these mvn_package calls is important %mvn_package "::pom::" __noinstall -%mvn_package ":org.eclipse.pde.tools.versioning" contributor-tools %mvn_package "::jar:sources{,-feature}:" sdk %mvn_package ":org.eclipse.jdt.doc.isv" sdk %mvn_package ":org.eclipse.platform.doc.isv" sdk @@ -643,9 +621,6 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse. %mvn_package ":org.eclipse.ant.{launching,ui}" jdt %mvn_package ":org.eclipse.equinox.p2.discovery.{feature,compatibility}" p2-discovery %mvn_package ":org.eclipse.equinox.p2{,.ui}.discovery" p2-discovery -%mvn_package ":org.eclipse.e4{,.core}.tools*" contributor-tools -%mvn_package ":org.eclipse.releng.tools" contributor-tools -%mvn_package ":org.eclipse.swt.tools*" contributor-tools %mvn_package "org.eclipse.cvs{,.feature}:" cvs %mvn_package "org.eclipse.team:org.eclipse.team.cvs*" cvs %mvn_package "org.eclipse.pde{,.ui,.feature}:" pde @@ -668,9 +643,6 @@ export MAVEN_OPTS="-Dfile.encoding=UTF-8 -Xmx1024m -XX:CompileCommand=exclude,or xmvn -o install:install-file -Dtycho.mode=maven -Dfile=%{_javadir}/tycho/tycho-lib-detector.jar -DpomFile=%{_mavenpomdir}/tycho/tycho-lib-detector.pom # Pre-build agent jar needed for AdvancedSourceLookupSupport -sed -i -e '/createSourcesJar/d' -e 's/8\.0\.1/7.0/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml -sed -i -e 's/V15/V11/' -e 's/ASM8/ASM7/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java \ - eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/util/Util.java (cd eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent && xmvn -e -o -B clean verify) mv eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/target/javaagent-shaded.jar \ eclipse.jdt.debug/org.eclipse.jdt.launching/lib @@ -1049,10 +1021,6 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %files p2-discovery -f .mfiles-p2-discovery -%if %{without bootstrap} && %{with contrib_tools} -%files contributor-tools -f .mfiles-contributor-tools -%endif - %files equinox-osgi -f .mfiles-equinox-osgi %{_eclipsedir}/plugins/org.eclipse.osgi_* %{_eclipsedir}/plugins/org.eclipse.osgi.compatibility.state_* @@ -1060,6 +1028,10 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Wed Nov 18 2020 Mat Booth - 1:4.17-4 +- Drop contributor-tools sub-package +- Remove workaround for old ASM version + * Wed Nov 11 2020 Mat Booth - 1:4.17-3 - Obsolete usage plugin and ensure encoding in use is UTF-8 during the build