From e2f933574c3e8aec8337829c27213132851e4074 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Jun 25 2015 16:12:05 +0000
Subject: Switch to use CDT_8_7 tag.


- Add with conditional to remove container support or add it in.

---

diff --git a/.gitignore b/.gitignore
index ce52199..b1676f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ ammacros-1.9.6.xml
 /136c03435ae0cab39fcd5246b7b1d3c0063d165c.tar.xz
 /6c36f7ff864090663713c0f868b72f9be42ab94a.tar.xz
 /d13a53c46144740cf751e1d92b4d2af37871b196.tar.xz
+/org.eclipse.cdt-CDT_8_7_0.tar.xz
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 790db1c..4532466 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -4,6 +4,9 @@
 %global debug_package %{nil}
 %global _enable_debug_packages 0
 
+# Change this to bcond_without to default to no container support when building for first time in release
+%bcond_with container_support
+
 Epoch: 1
 
 %define major                   8
@@ -11,7 +14,7 @@ Epoch: 1
 %define majmin                  %{major}.%{minor}
 %define micro                   0
 %define eclipse_base            %{_libdir}/eclipse
-%define cdt_snapshot		d13a53c46144740cf751e1d92b4d2af37871b196
+%define cdt_snapshot		org.eclipse.cdt-CDT_8_7_0
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -27,7 +30,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           %{?scl_prefix}eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.6.gitd13a53c%{?dist}
+Release:        1%{?dist}
 License:        EPL and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -58,6 +61,7 @@ Patch4: %{pkg_name}-cdtdebug-readme.patch
 # Following fixes jetty reqs in CDT target
 Patch5: %{pkg_name}-target.patch
 
+# Following removes docker launcher plugins from repo
 Patch6: remove-docker.patch
 
 BuildRequires: tycho
@@ -76,10 +80,16 @@ BuildRequires: %{?scl_prefix}eclipse-swtbot
 BuildRequires: eclipse-launchbar
 BuildRequires: nekohtml >= 1.9.21-3
 BuildRequires: exec-maven-plugin
+%if %{with container_support}
+BuildRequires: eclipse-linuxtools-docker
+%endif
 
 Requires:      gdb make gcc-c++ autoconf automake libtool
 Requires:      %{?scl_prefix}eclipse-remote
 Requires:      nekohtml >= 1.9.21-3
+%if %{with container_support}
+Requires:      eclipse-linuxtools-docker
+%endif
 Recommends:    eclipse-linuxtools-libhover
 
 %description
@@ -142,7 +152,10 @@ cp %{SOURCE4} man
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6
+%if %{with container_support}
+%patch6 -p1
+%endif
+
 sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
 # Add secondary arch support if we are building there
 %ifarch %{arm} s390 s390x aarch64
@@ -182,9 +195,12 @@ popd
 %pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin
 %pom_remove_plugin org.jacoco:jacoco-maven-plugin
 
+%if %{with container_support}
+%else
 %pom_disable_module launch/org.eclipse.cdt.docker.launcher
 %pom_disable_module launch/org.eclipse.cdt.docker.launcher-feature
 %pom_disable_module launch/org.eclipse.cdt.docker.launcher.source-feature
+%endif
 
 for b in `ls core/ | grep -P -e 'org.eclipse.cdt.core\.(?!linux\.%{eclipse_arch}$|tests$|linux$|native$)'` ; do
   module=$(grep ">core/$b<" pom.xml || :)
@@ -408,6 +424,10 @@ rm -rf $installDir/eclipse/binary
 %doc releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Tue Jun 23 2015 Jeff Johnston <jjohnstn@redhat.com> 1:8.7.0-1
+- Switch to use CDT_8_7 tag.
+- Add with conditional to remove container support or add it in.
+
 * Mon Jun 15 2015 Alexander Kurtakov <akurtako@redhat.com> 1:8.7.0-0.6.gitd13a53c
 - Fix build with Tycho 0.23.
 - Update to newer snapshot.
diff --git a/sources b/sources
index 84773ab..f6c2408 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 da9186b8edfc5f4efaa189ad7c0eb26f  eclipse-cdt.desktop
-6f0b9876c3b8aa04390b95ebe125a43c  d13a53c46144740cf751e1d92b4d2af37871b196.tar.xz
+dcdebd4ca23d429b28d42246c7a97aa6  org.eclipse.cdt-CDT_8_7_0.tar.xz