From d41b3432beb79460925634c1d6b97470b4b6f3c1 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mar 26 2020 16:30:49 +0000 Subject: Fix bootstrap mode --- diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 63de5e9..40d1524 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -39,7 +39,7 @@ Epoch: 2 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: 9.11.0 -Release: 4%{?dist} +Release: 5%{?dist} License: EPL-2.0 and CPL URL: https://www.eclipse.org/cdt @@ -71,6 +71,7 @@ BuildRequires: desktop-file-utils BuildRequires: google-gson BuildRequires: glassfish-jaxb-api BuildRequires: glassfish-jaxb-runtime >= 2.2.11-14 +BuildRequires: eclipse-egit BuildRequires: eclipse-license2 BuildRequires: eclipse-platform BuildRequires: eclipse-pde @@ -299,6 +300,11 @@ sed -i -e '/xlc\//d' pom.xml # Disable docker, autotools, and remote features if we are building a boot-strap build %if ! %{_enable_container_and_remote_support} +%pom_disable_module org.eclipse.tm.terminal.connector.remote.feature terminal/features +%pom_disable_module org.eclipse.tm.terminal.connector.remote terminal/plugins +%pom_disable_module launchbar/org.eclipse.launchbar.remote +%pom_disable_module launchbar/org.eclipse.launchbar.remote.core +%pom_disable_module launchbar/org.eclipse.launchbar.remote.ui %pom_disable_module launch/org.eclipse.cdt.docker.launcher %pom_disable_module launch/org.eclipse.cdt.docker.launcher-feature %pom_disable_module build/org.eclipse.cdt.autotools.core @@ -542,6 +548,9 @@ rm -f %{buildroot}/%{_datadir}/eclipse/droplets/*/plugins/*mail* %endif %changelog +* Thu Mar 26 2020 Mat Booth - 2:9.11.0-5 +- Fix bootstrap mode + * Tue Mar 24 2020 Mat Booth - 2:9.11.0-4 - Add epoch to obsoletes for launchbar package