From 700b88505326717e8bfb3e69fdcdc2abdda0a1a1 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jun 19 2017 11:13:02 +0000
Subject: Allow conditionally building against cdt and remote


---

diff --git a/eclipse-tm-terminal.spec b/eclipse-tm-terminal.spec
index f3874df..06ce3f2 100644
--- a/eclipse-tm-terminal.spec
+++ b/eclipse-tm-terminal.spec
@@ -1,12 +1,12 @@
-# Set to 1 to build for the first time.  There is a cyclical
-# dependency between eclipse-remote and eclipse-tm-terminal.
-%global _bootstrap 0
-
 %global git_tag fa298da8b7e03c83acba40fc539b0dd6c654c16e
 
+# Set this to avoid building CDT and remotes bundles to eliminate
+# a circular dep on CDT->tm-terminal->remote->CDT
+%bcond_without remote
+
 Name:           eclipse-tm-terminal
 Version:        4.3.0
-Release:        0.1.gitfa298da%{?dist}
+Release:        0.2.gitfa298da%{?dist}
 Summary:        Terminal plug-in for Eclipse
 
 License:        EPL
@@ -18,7 +18,7 @@ BuildRequires:  maven-local
 BuildRequires:  tycho-extras
 BuildRequires:  eclipse-license
 BuildRequires: 	eclipse-egit
-%if ! %{_bootstrap}
+%if %{with remote}
 # Needed for additional terminal connectors
 BuildRequires:  eclipse-cdt
 BuildRequires:  eclipse-rse
@@ -30,7 +30,7 @@ BuildRequires:  rxtx >= 2.2-0.15
 An integrated Eclipse View for the local command prompt (console) or
 remote hosts (SSH, Telnet, Serial).
 
-%if ! %{_bootstrap}
+%if %{with remote}
 %package connectors
 Summary:        Additional connectors for Terminal plug-in for Eclipse
 
@@ -42,7 +42,7 @@ remote hosts (SSH, Telnet, Serial).
 %package sdk
 Summary:        Terminal SDK plug-in for Eclipse
 Requires:       %{name} = %{version}-%{release}
-%if ! %{_bootstrap}
+%if %{with remote}
 Requires:       %{name}-connectors = %{version}-%{release}
 %endif
 
@@ -57,7 +57,7 @@ Sources and developer resources for the Terminal plug-in for Eclipse.
 
 # When bootstrapping, disable the plugins and features that
 # create cyclical dependencies
-%if %{_bootstrap}
+%if %{without remote}
 %pom_disable_module plugins/org.eclipse.tm.terminal.connector.process
 %pom_disable_module plugins/org.eclipse.tm.terminal.connector.local
 %pom_disable_module features/org.eclipse.tm.terminal.connector.local.feature
@@ -103,13 +103,16 @@ sed -i -e "s|p2.inf||g" features/org.eclipse.tm.terminal.view.feature/build.prop
 
 %files -f .mfiles
 
-%if ! %{_bootstrap}
+%if %{with remote}
 %files connectors -f .mfiles-connectors
 %endif
 
 %files sdk -f .mfiles-sdk
 
 %changelog
+* Mon Jun 19 2017 Mat Booth <mat.booth@redhat.com> - 4.3.0-0.2.gitfa298da
+- Allow conditionally building against cdt and remote
+
 * Sun Jun 18 2017 Mat Booth <mat.booth@redhat.com> - 4.3.0-0.1.gitfa298da
 - Update to Oxygen snapshot