From 339b014b699afaedb9203775a06cd2e3a2170555 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jun 30 2016 21:18:07 +0000
Subject: Update to Neon release


---

diff --git a/.gitignore b/.gitignore
index 6baa8e3..365896b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ ammacros-1.9.6.xml
 /org.eclipse.cdt-0b93e8116ed81f0e5b366262b0af903b0fb3d580.tar.xz
 /org.eclipse.tools.templates-476b60a0ca06cba838c98cd7ec5913f6cbeda4c8.tar.xz
 /org.eclipse.cdt-dff6b3bae3ddb27df5433ce7ff3ebb2f4c90de6d.tar.xz
+/org.eclipse.tools.templates-e87ce036ebc1ac86d1aaee807e4d9ff1759b61d9.tar.xz
diff --git a/eclipse-cdt-bug-459567.patch b/eclipse-cdt-bug-459567.patch
deleted file mode 100644
index 68300e6..0000000
--- a/eclipse-cdt-bug-459567.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a0885f57d9a82883b4490a896500c09be6db7752 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-Date: Sat, 21 May 2016 16:40:50 +0100
-Subject: [PATCH] Bug 459567 - Help missing for LLVM Managed Build
-
-Include 'help' directory in build.properties
-
-Change-Id: I6c86a5325a323c67a50166b70372c8a918aa8553
-Signed-off-by: Mat Booth <mat.booth@redhat.com>
----
- llvm/org.eclipse.cdt.managedbuilder.llvm.ui/build.properties | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/build.properties b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/build.properties
-index f47d322..ac0ebbc 100755
---- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/build.properties
-+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/build.properties
-@@ -8,6 +8,7 @@ bin.includes = plugin.xml,\
-                about.ini,\
-                about.mappings,\
-                about.properties,\
--               cdt_logo_icon32.png
-+               cdt_logo_icon32.png,\
-+               help/
- src.includes = patches/,\
-                help/,\
--- 
-2.5.5
-
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index b039c6f..60e2a2b 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -20,8 +20,8 @@ Epoch: 1
 %global majmin                  %{major}.%{minor}
 %global micro                   0
 %global eclipse_base            %{_libdir}/eclipse
-%global cdt_snapshot            org.eclipse.cdt-dff6b3bae3ddb27df5433ce7ff3ebb2f4c90de6d
-%global template_snapshot       org.eclipse.tools.templates-476b60a0ca06cba838c98cd7ec5913f6cbeda4c8
+%global cdt_snapshot            org.eclipse.cdt-CDT_9_0_0
+%global template_snapshot       org.eclipse.tools.templates-e87ce036ebc1ac86d1aaee807e4d9ff1759b61d9
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -37,7 +37,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.9.gitdff6b3b%{?dist}
+Release:        1%{?dist}
 License:        EPL and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -69,9 +69,6 @@ Patch4: remove-docker.patch
 # Following removes autotools and remote plugins from repo
 Patch5: remove-remote.patch
 
-# Fix LLVM documentation
-Patch6: eclipse-cdt-bug-459567.patch
-
 BuildRequires: tycho
 BuildRequires: tycho-extras
 BuildRequires: eclipse-license
@@ -89,13 +86,13 @@ BuildRequires: freemarker
 BuildRequires: mockito
 %if %{_enable_container_and_remote_support}
 BuildRequires: eclipse-linuxtools-docker
-BuildRequires: eclipse-remote >= 2.0.0-1
+BuildRequires: eclipse-remote >= 2.1.0
 %endif
 
 Requires:      gdb make gcc-c++
 %if %{_enable_container_and_remote_support}
 Requires:      autoconf automake libtool
-Requires:      eclipse-remote >= 2.0.0-1
+Requires:      eclipse-remote >= 2.1.0
 Requires:      eclipse-launchbar
 Requires:      eclipse-pde
 %endif
@@ -189,7 +186,6 @@ cp %{SOURCE4} man
 %patch4 -p0
 %patch5 -p0
 %endif
-%patch6 -p1
 
 TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{eclipse_arch}</arch></environment>"
 %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV"
@@ -449,6 +445,9 @@ cp man/cdtdebug.man $manInstallDir/cdtdebug.1
 %endif
 
 %changelog
+* Wed Jun 22 2016 Mat Booth <mat.booth@redhat.com> - 1:9.0.0-1
+- Update to Neon release
+
 * Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:9.0.0-0.9.gitdff6b3b
 - Add missing build-requires
 
diff --git a/sources b/sources
index 9eee3ef..ba350b9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 da9186b8edfc5f4efaa189ad7c0eb26f  eclipse-cdt.desktop
-42d08b0a49ebd7b144b98781096eb0a1  org.eclipse.tools.templates-476b60a0ca06cba838c98cd7ec5913f6cbeda4c8.tar.xz
-6e1a97dc9c189695e78d9753875d6d61  org.eclipse.cdt-dff6b3bae3ddb27df5433ce7ff3ebb2f4c90de6d.tar.xz
+71fd4a35fccce68de55f75d440e3b349  org.eclipse.cdt-CDT_9_0_0.tar.xz
+e4a675800473e650e239fd8d20904a46  org.eclipse.tools.templates-e87ce036ebc1ac86d1aaee807e4d9ff1759b61d9.tar.xz