From 1f1d8a51a316e48b89d1fb9d4edb1ec5684352a6 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Aug 27 2015 08:23:52 +0000
Subject: Add bootstrap mode to allow breaking of cyclic dependencies


---

diff --git a/eclipse-tm-terminal.spec b/eclipse-tm-terminal.spec
index 94ccd1f..65bf854 100644
--- a/eclipse-tm-terminal.spec
+++ b/eclipse-tm-terminal.spec
@@ -1,6 +1,10 @@
+# Set to 1 to build for the first time.  There is a cyclical
+# dependency between eclipse-remote and eclipse-tm-terminal.
+%global _bootstrap 0
+
 Name:           eclipse-tm-terminal
 Version:        4.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Terminal plugin for Eclipse
 
 License:        EPL
@@ -12,7 +16,10 @@ BuildRequires:  maven-local
 BuildRequires:  tycho-extras
 BuildRequires:  eclipse-license
 BuildRequires:  eclipse-cdt
-
+BuildRequires:  eclipse-rse
+%if ! %{_bootstrap}
+BuildRequires:  eclipse-remote
+%endif
 
 %description
 An integrated Eclipse View for the local command prompt (console) or 
@@ -21,6 +28,14 @@ remote hosts (SSH, Telnet, Serial).
 %prep
 %setup -q -n org.eclipse.tm.terminal-%{version}
 
+# When bootstrapping, remote terminal.connector.remote plugins and features
+# which require eclipse-remote and create cyclical dependency
+%if %{_bootstrap}
+%pom_disable_module plugins/org.eclipse.tm.terminal.connector.remote
+%pom_disable_module features/org.eclipse.tm.terminal.connector.remote.feature
+%pom_disable_module features/org.eclipse.tm.terminal.connector.remote.sdk.feature
+%endif
+
 #drop due to gnu.io dep not available
 %pom_disable_module plugins/org.eclipse.tm.terminal.connector.serial
 %pom_disable_module features/org.eclipse.tm.terminal.connector.serial.feature
@@ -40,11 +55,14 @@ done
 for b in `find -name feature.xml`; do
 	sed -i -e "s|4.0.0.qualifier|4.0.0.$timestamp|g" $b
 done
-for b in `find -name pom.xml`; do
+for b in `find -name pom.xml` admin/pom-build.xml admin/pom-config.xml; do
 	sed -i -e "s|qualifier|$timestamp|g" $b
     sed -i -e "s|-SNAPSHOT|.$timestamp|g" $b
 done
 
+# No need to install poms
+%mvn_package "::pom::" __noinstall
+
 %build
 %mvn_build -j
 
@@ -54,6 +72,9 @@ done
 %files -f .mfiles
 
 %changelog
+* Thu Aug 27 2015 Mat Booth <mat.booth@redhat.com> - 4.0.0-3
+- Add bootstrap mode to allow breaking of cyclic dependencies
+
 * Thu Jun 25 2015 Roland Grunberg <rgrunber@redhat.com> - 4.0.0-2
 - Rebuild to correct auto-generated requires.