From e84a3bffb5ded3ca84079562d85e0420183ef730 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Aug 12 2016 15:26:04 +0000
Subject: Split out remote connecter, which requires CDT via PTP Remote


---

diff --git a/eclipse-tm-terminal.spec b/eclipse-tm-terminal.spec
index 0685a7e..005e90a 100644
--- a/eclipse-tm-terminal.spec
+++ b/eclipse-tm-terminal.spec
@@ -6,8 +6,8 @@
 
 Name:           eclipse-tm-terminal
 Version:        4.1.0
-Release:        2%{?dist}
-Summary:        Remote Terminal plug-in for Eclipse
+Release:        3%{?dist}
+Summary:        Terminal plug-in for Eclipse
 
 License:        EPL
 URL:            https://www.eclipse.org/tm/
@@ -17,9 +17,10 @@ BuildArch:      noarch
 BuildRequires:  maven-local
 BuildRequires:  tycho-extras
 BuildRequires:  eclipse-license
-BuildRequires:  eclipse-cdt
 BuildRequires: 	eclipse-egit
 %if ! %{_bootstrap}
+# Needed for additional terminal connectors
+BuildRequires:  eclipse-cdt
 BuildRequires:  eclipse-rse
 BuildRequires:  eclipse-remote
 %endif
@@ -28,17 +29,21 @@ BuildRequires:  eclipse-remote
 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
+%if ! %{_bootstrap}
+%package connectors
+Summary:        Additional connectors for Terminal plug-in for Eclipse
 
-%description local
+%description connectors
 An integrated Eclipse View for the local command prompt (console) or
 remote hosts (SSH, Telnet, Serial).
+%endif
 
 %package sdk
 Summary:        Terminal SDK plug-in for Eclipse
 Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-local = %{version}-%{release}
+%if ! %{_bootstrap}
+Requires:       %{name}-connectors = %{version}-%{release}
+%endif
 
 %description sdk
 Sources and developer resources for the Terminal plug-in for Eclipse.
@@ -46,46 +51,48 @@ Sources and developer resources for the Terminal plug-in for Eclipse.
 %prep
 %setup -q -n org.eclipse.tm.terminal-%{git_tag}
 
-# When bootstrapping, disable the remote plugins and features
-# which create cyclical dependencies
+# Don't need to build repo
+%pom_disable_module repos/org.eclipse.tm.terminal.repo
+
+# When bootstrapping, disable the plugins and features that
+# create cyclical dependencies
 %if %{_bootstrap}
+%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
+%pom_disable_module features/org.eclipse.tm.terminal.connector.local.sdk.feature
 %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
+%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.local.feature']" \
+  features/org.eclipse.tm.terminal.feature/feature.xml
+%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.local.sdk.feature']" \
+  features/org.eclipse.tm.terminal.sdk.feature/feature.xml
 %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
 %pom_disable_module features/org.eclipse.tm.terminal.connector.serial.sdk.feature
-sed -i -e 's|<import feature="org.eclipse.tm.terminal.connector.serial.feature" version="4.1.0" match="greaterOrEqual"/>||g' features/org.eclipse.tm.terminal.feature/feature.xml
-sed -i -e 's|<import feature="org.eclipse.tm.terminal.connector.serial.sdk.feature" version="4.1.0" match="greaterOrEqual"/>||g' features/org.eclipse.tm.terminal.sdk.feature/feature.xml
-%pom_disable_module repos/org.eclipse.tm.terminal.repo
+%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.serial.feature']" \
+  features/org.eclipse.tm.terminal.feature/feature.xml
+%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.serial.sdk.feature']" \
+  features/org.eclipse.tm.terminal.sdk.feature/feature.xml
 
 %pom_xpath_remove "pom:plugin[pom:artifactId[text()='tycho-packaging-plugin']]/pom:configuration" admin/pom-config.xml
 
 sed -i -e "s|feature.properties,\\\|feature.properties|g" features/org.eclipse.tm.terminal.view.feature/build.properties
 sed -i -e "s|p2.inf||g" features/org.eclipse.tm.terminal.view.feature/build.properties
-timestamp=`date +%Y%m%d%H%M`
-for b in `find -name MANIFEST.MF`; do
-	sed -i -e "s|qualifier|$timestamp|g" $b
-done
-for b in `find -name feature.xml`; do
-	sed -i -e "s|4.1.0.qualifier|4.1.0.$timestamp|g" $b
-done
-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
 %mvn_package "::jar:sources:" sdk
 %mvn_package ":*.sdk.feature" sdk
-%mvn_package ":org.eclipse.tm.terminal.connector.{local,process}*" local
+%mvn_package ":org.eclipse.tm.terminal.connector.{local,process,remote}*" connectors
+%mvn_package ":org.eclipse.tm.terminal.view.{rse,ui.rse}*" connectors
 %mvn_package ":"
 
 %build
@@ -96,11 +103,16 @@ done
 
 %files -f .mfiles
 
-%files local -f .mfiles-local
+%if ! %{_bootstrap}
+%files connectors -f .mfiles-connectors
+%endif
 
 %files sdk -f .mfiles-sdk
 
 %changelog
+* Fri Aug 12 2016 Mat Booth <mat.booth@redhat.com> - 4.1.0-3
+- Split out remote connecter, which requires CDT via PTP Remote
+
 * Fri Aug 12 2016 Mat Booth <mat.booth@redhat.com> - 4.1.0-2
 - Improve bootstrapping mode
 - Split out local connecter, which requires CDT