From 1d9d8edeba7ffe153179d9aa5635ec45f5eed7eb Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Aug 12 2016 12:16:45 +0000
Subject: Improve bootstrapping mode


- Split out local connecter, which requires CDT
- Add a SDK package for source bundles

---

diff --git a/eclipse-tm-terminal.spec b/eclipse-tm-terminal.spec
index 3e1dff4..0685a7e 100644
--- a/eclipse-tm-terminal.spec
+++ b/eclipse-tm-terminal.spec
@@ -1,12 +1,13 @@
 # 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 4.1_neon
 
 Name:           eclipse-tm-terminal
 Version:        4.1.0
-Release:        1%{?dist}
-Summary:        Terminal plugin for Eclipse
+Release:        2%{?dist}
+Summary:        Remote Terminal plug-in for Eclipse
 
 License:        EPL
 URL:            https://www.eclipse.org/tm/
@@ -17,25 +18,43 @@ BuildRequires:  maven-local
 BuildRequires:  tycho-extras
 BuildRequires:  eclipse-license
 BuildRequires:  eclipse-cdt
-BuildRequires:  eclipse-rse
 BuildRequires: 	eclipse-egit
 %if ! %{_bootstrap}
+BuildRequires:  eclipse-rse
 BuildRequires:  eclipse-remote
 %endif
 
 %description
-An integrated Eclipse View for the local command prompt (console) or 
+An integrated Eclipse View for the local command prompt (console) or
+remote hosts (SSH, Telnet, Serial).
+
+%package local
+Summary:        Local Terminal plug-in for Eclipse
+
+%description local
+An integrated Eclipse View for the local command prompt (console) or
 remote hosts (SSH, Telnet, Serial).
 
+%package sdk
+Summary:        Terminal SDK plug-in for Eclipse
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-local = %{version}-%{release}
+
+%description sdk
+Sources and developer resources for the Terminal plug-in for Eclipse.
+
 %prep
 %setup -q -n org.eclipse.tm.terminal-%{git_tag}
 
-# When bootstrapping, remote terminal.connector.remote plugins and features
-# which require eclipse-remote and create cyclical dependency
+# When bootstrapping, disable the remote plugins and features
+# which create cyclical dependencies
 %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
+%pom_disable_module plugins/org.eclipse.tm.terminal.view.ui.rse
+%pom_disable_module features/org.eclipse.tm.terminal.view.rse.feature
+%pom_disable_module features/org.eclipse.tm.terminal.view.rse.sdk.feature
 %endif
 
 #drop due to gnu.io dep not available
@@ -64,6 +83,10 @@ done
 
 # No need to install poms
 %mvn_package "::pom::" __noinstall
+%mvn_package "::jar:sources:" sdk
+%mvn_package ":*.sdk.feature" sdk
+%mvn_package ":org.eclipse.tm.terminal.connector.{local,process}*" local
+%mvn_package ":"
 
 %build
 %mvn_build -j
@@ -73,7 +96,16 @@ done
 
 %files -f .mfiles
 
+%files local -f .mfiles-local
+
+%files sdk -f .mfiles-sdk
+
 %changelog
+* Fri Aug 12 2016 Mat Booth <mat.booth@redhat.com> - 4.1.0-2
+- Improve bootstrapping mode
+- Split out local connecter, which requires CDT
+- Add a SDK package for source bundles
+
 * Fri Jul 01 2016 Mat Booth <mat.booth@redhat.com> - 4.1.0-1
 - Update to Neon release