From 208520912c2adb261b6442d1a29705f55a4b1ff7 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Jun 26 2015 19:22:18 +0000
Subject: Fix for bug 1235945.


- Move Docker launcher plug-ins to own package: eclipse-cdt-docker.

---

diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index b44723e..4848c39 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -31,7 +31,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           %{?scl_prefix}eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -88,9 +88,6 @@ BuildRequires: eclipse-linuxtools-docker
 Requires:      gdb make gcc-c++ autoconf automake libtool
 Requires:      %{?scl_prefix}eclipse-remote
 Requires:      nekohtml >= 1.9.21-3
-%if %{_enable_container_support}
-Requires:      eclipse-linuxtools-docker
-%endif
 Recommends:    eclipse-linuxtools-libhover
 
 %description
@@ -120,6 +117,19 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 %description arduino
 Extensions to support Arduino C++ projects in Eclipse.
 
+%if %{_enable_container_support} == 1
+
+%package docker
+Summary:	C/C++ Docker Launcher
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:	eclipse-linuxtools-docker
+
+%description docker
+Special launcher for CDT to allow launching and debugging C/C++ applications
+in Docker Containers.
+
+%endif
+
 %package tests
 Summary:	Eclipse C/C++ Development Tools (CDT) Tests
 Requires:       %{name} = %{epoch}:%{version}-%{release}
@@ -236,6 +246,9 @@ xmvn -o -Dtycho.local.keepTarget -Dskip-ppc64le -Dmaven.test.skip=true -Dmaven.r
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
 testInstallDir=${RPM_BUILD_ROOT}/%{_javadir}/eclipse-cdt-tests/plugins
 parsersInstallDir=${installDir}-parsers
+%if %{_enable_container_support} == 1
+dockerInstallDir=${installDir}-docker
+%endif
 arduinoInstallDir=${installDir}-arduino
 llvmInstallDir=${installDir}-llvm
 sdkInstallDir=${installDir}-sdk
@@ -249,6 +262,9 @@ install -d -m755 $sdkInstallDir
 install -d -m755 $testInstallDir
 install -d -m755 $binInstallDir
 install -d -m755 $manInstallDir
+%if %{_enable_container_support} == 1
+install -d -m755 $dockerInstallDir
+%endif
 
 # Unzip contents of the cdt repo, removing all but plugins and features
 unzip -q -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip \
@@ -374,6 +390,13 @@ mkdir -p $arduinoInstallDir/eclipse/features $arduinoInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*arduino* $arduinoInstallDir/eclipse/features
 mv $installDir/eclipse/plugins/*arduino* $arduinoInstallDir/eclipse/plugins
 
+%if %{_enable_container_support} == 1
+# Move docker launcher plugins/features to docker install area.
+mkdir -p $dockerInstallDir/eclipse/features $dockerInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*docker* $dockerInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*docker* $dockerInstallDir/eclipse/plugins
+%endif
+
 mkdir -p $sdkInstallDir/eclipse/features $sdkInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*source* $sdkInstallDir/eclipse/features
 mv $installDir/eclipse/plugins/*source* $sdkInstallDir/eclipse/plugins
@@ -423,7 +446,18 @@ rm -rf $installDir/eclipse/binary
 %doc releng/org.eclipse.cdt.releng/epl-v10.html
 %doc releng/org.eclipse.cdt.releng/notice.html
 
+%if %{_enable_container_support} == 1
+%files docker
+%{eclipse_base}/dropins/cdt-docker
+%doc releng/org.eclipse.cdt.releng/epl-v10.html
+%doc releng/org.eclipse.cdt.releng/notice.html
+%endif
+
 %changelog
+* Fri Jun 26 2015 Jeff Johnston <jjohnstn@redhat.com> 1:8.7.0-3
+- Fix for bug 1235945.
+- Move Docker launcher plug-ins to own package: eclipse-cdt-docker.
+
 * Thu Jun 25 2015 Jeff Johnston <jjohnstn@redhat.com> 1:8.7.0-2
 - Use simpler macro to control container support and fix macro tests.