From 763428bc3b8f7d275b3608861ec3fe9af183fce1 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mar 29 2017 10:43:49 +0000
Subject: Update to latest upstream release

Conditionalise building of arduino support

---

diff --git a/.gitignore b/.gitignore
index 6690bf8..66dcf6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ ammacros-1.9.6.xml
 /org.eclipse.tools.templates-e87ce036ebc1ac86d1aaee807e4d9ff1759b61d9.tar.xz
 /org.eclipse.tools.templates-6f34dc60b008d8cdcd7848c76b13b0f2ef8c6134.tar.xz
 /org.eclipse.tools.templates-b6038873b1cd4d7f0a86a98deb2b6e3360e75f14.tar.xz
+/org.eclipse.tools.templates-0435f275891b23060faa5cc33664c6a2fefbf2ac.tar.xz
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 892c004..1fbb18f 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -6,13 +6,9 @@
 
 Epoch: 1
 
-%global major                   9
-%global minor                   2
-%global majmin                  %{major}.%{minor}
-%global micro                   0
 %global eclipse_base            %{_datadir}/eclipse
-%global cdt_snapshot            org.eclipse.cdt-CDT_9_2_0
-%global template_snapshot       org.eclipse.tools.templates-b6038873b1cd4d7f0a86a98deb2b6e3360e75f14
+%global cdt_snapshot            org.eclipse.cdt-CDT_9_2_1
+%global template_snapshot       org.eclipse.tools.templates-0435f275891b23060faa5cc33664c6a2fefbf2ac
 
 %ifarch %{ix86}
     %global eclipse_arch x86
@@ -33,8 +29,8 @@ Epoch: 1
 
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
-Version:        %{majmin}.%{micro}
-Release:        4%{?dist}
+Version:        9.2.1
+Release:        1%{?dist}
 License:        EPL and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -82,7 +78,7 @@ BuildRequires: freemarker
 BuildRequires: mockito
 %if %{_enable_container_and_remote_support}
 %if %{_enable_container_support}
-BuildRequires: eclipse-linuxtools-docker >= 5.1.0
+BuildRequires: eclipse-linuxtools-docker >= 5.3.0
 %endif
 BuildRequires: eclipse-remote >= 2.1.0
 BuildRequires: eclipse-launchbar >= 1:2.1.0
@@ -128,18 +124,20 @@ Optional llvm parsers for the CDT.
 
 %if %{_enable_container_and_remote_support}
 
+%if ! 0%{?rhel}
 %package arduino
 Summary:        Arduino C++ Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description arduino
 Extensions to support Arduino C++ projects in Eclipse.
+%endif
 
 %if %{_enable_container_support}
 %package docker
 Summary:        C/C++ Docker Launcher
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       eclipse-linuxtools-docker
+Requires:       eclipse-linuxtools-docker >= 5.3.0
 
 %description docker
 Special launcher for CDT to allow launching and debugging C/C++ applications
@@ -169,7 +167,9 @@ Requires:       %{name}-llvm = %{epoch}:%{version}-%{release}
 Requires:       %{name}-parsers = %{epoch}:%{version}-%{release}
 %if %{_enable_container_and_remote_support}
 Requires:       %{name}-docker = %{epoch}:%{version}-%{release}
+%if ! 0%{?rhel}
 Requires:       %{name}-arduino = %{epoch}:%{version}-%{release}
+%endif
 Requires:       %{name}-qt = %{epoch}:%{version}-%{release}
 %endif
 Requires:       eclipse-tests
@@ -196,7 +196,7 @@ cp %{SOURCE3} desktop
 mkdir man
 cp %{SOURCE4} man
 
-%patch1 -p0 -b.orig
+%patch1 -p0
 %patch2 -p1
 %patch3 -p1
 
@@ -297,6 +297,13 @@ mkdir -p native/org.eclipse.cdt.native.serial/os/linux/%{eclipse_arch} \
 %endif
 %endif
 
+# Always disable arduino support on rhel
+%if 0%{?rhel}
+%pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.core
+%pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.ui
+%pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino-feature
+%endif
+
 # Disable all bundles not relavent to the platform we currently building
 %pom_xpath_inject "pom:modules" "<module>core/org.eclipse.cdt.core.linux.ppc64le</module>" 
 for b in `ls core/ | grep -P -e 'org.eclipse.cdt.core\.(?!linux\.%{eclipse_arch}$|tests$|linux$|native$)'` ; do
@@ -509,9 +516,11 @@ fi
 %doc releng/org.eclipse.cdt.sdk/epl-v10.html
 %doc releng/org.eclipse.cdt.sdk/notice.html
 
+%if ! 0%{?rhel}
 %files arduino -f .mfiles-arduino
 %doc releng/org.eclipse.cdt.sdk/epl-v10.html
 %doc releng/org.eclipse.cdt.sdk/notice.html
+%endif
 
 %if %{_enable_container_support}
 
@@ -523,6 +532,10 @@ fi
 %endif
 
 %changelog
+* Tue Mar 28 2017 Mat Booth <mat.booth@redhat.com> - 1:9.2.1-1
+- Update to latest upstream release
+- Conditionalise building of arduino support
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:9.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 16db867..c98e19e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (eclipse-cdt.desktop) = 8b4b8613c6ca174b91d48cac5823fe304886cfd63473e8c0814d08d7923b40b488db27232ae4a81248f2f200c0e8211ba6b60797cfc1b7f61b4309a97c2aaeec
-SHA512 (org.eclipse.cdt-CDT_9_2_0.tar.xz) = d2965f50c6800396d7c1458b1b7ccdcd8d0f7c23156caca2c5bc784ada76e99df85c29c88686a34a5a907e9fa679189665d9aaeb70adf592f39b374dc68c2cf2
-SHA512 (org.eclipse.tools.templates-b6038873b1cd4d7f0a86a98deb2b6e3360e75f14.tar.xz) = 89887b13b584ec3d4e24bac7465050562f3cd6410e363530c89179c45ba03b965049e0c6f0b871885941adbd2d5d05a85f2403f12fe44fd4313f2972e7681e82
+SHA512 (org.eclipse.cdt-CDT_9_2_1.tar.xz) = 8367b738ec37bf822e69a778d9d752dad90f1b53c64db4a04a89bae471e42ba6ce059be5ef6060245c20f6bb7f2c6cbd9be27f0076998e2ebaee6c7fe09f82e3
+SHA512 (org.eclipse.tools.templates-0435f275891b23060faa5cc33664c6a2fefbf2ac.tar.xz) = 02e05bbbf0f2d8bff8809a9d317b1710ba5a21e52fe4b63990a731e918c81605ddf10c42f59070c054a996798af37ea40d041db94f62be2e30df21e7dfa39343