From ddfd8aeaff46c4450f7335527a83bba33ee55e48 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jun 13 2018 01:25:08 +0000
Subject: Update to Photon release


---

diff --git a/.gitignore b/.gitignore
index a6700ef..f028d85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ ammacros-1.9.6.xml
 /org.eclipse.cdt-cdt_9_4.tar.gz
 /CDT_9_4_2.tar.gz
 /CDT_9_4_3.tar.gz
+/025742ca9153703cbbe803bfa667706c6b7d3543.tar.gz
diff --git a/eclipse-cdt-config-ini.patch b/eclipse-cdt-config-ini.patch
index 08c2a6f..a75d61b 100644
--- a/eclipse-cdt-config-ini.patch
+++ b/eclipse-cdt-config-ini.patch
@@ -13,7 +13,7 @@
 +      <plugin id="javax.servlet-api"/>
        <plugin id="javax.servlet.jsp"/>
        <plugin id="javax.xml"/>
-       <plugin id="org.apache.batik.css"/>
+       <plugin id="org.apache.batik.constants"/>
 @@ -191,20 +191,15 @@
        <plugin id="org.apache.felix.scr"/>
        <plugin id="org.apache.httpcomponents.httpclient"/>
@@ -23,7 +23,7 @@
        <plugin id="org.apache.lucene.analyzers-common"/>
        <plugin id="org.apache.lucene.analyzers-smartcn"/>
        <plugin id="org.apache.lucene.core"/>
-       <plugin id="org.apache.lucene.misc"/>
+       <plugin id="org.apache.xmlgraphics"/>
        <plugin id="org.eclipse.cdt.core"/>
        <plugin id="org.eclipse.cdt.core.linux" fragment="true"/>
 -      <plugin id="org.eclipse.cdt.core.linux.x86" fragment="true"/>
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index b5e6b1f..cdd3f87 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -13,7 +13,7 @@
 Epoch: 1
 
 %global eclipse_base            %{_datadir}/eclipse
-%global cdt_snapshot            CDT_9_4_3
+%global cdt_snapshot            025742ca9153703cbbe803bfa667706c6b7d3543
 %global template_snapshot       org.eclipse.tools.templates-b7cecf0b4a70eb74346d3de33096d16b2bbcd880
 
 %ifarch %{ix86}
@@ -35,8 +35,8 @@ Epoch: 1
 
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
-Version:        9.4.3
-Release:        2%{?dist}
+Version:        9.5.0
+Release:        1%{?dist}
 License:        EPL and CPL
 URL:            http://www.eclipse.org/cdt
 
@@ -322,6 +322,14 @@ for b in `ls core/ | grep -P -e 'org.eclipse.cdt.core\.(?!linux\.%{eclipse_arch}
   fi
 done
 
+# Disable meson (missing dep tm4e)
+%pom_disable_module build/org.eclipse.cdt.meson.core
+%pom_disable_module build/org.eclipse.cdt.meson.docs
+%pom_disable_module build/org.eclipse.cdt.meson.ui
+%pom_disable_module build/org.eclipse.cdt.meson.ui.editor
+%pom_disable_module build/org.eclipse.cdt.meson-feature
+%pom_disable_module build/org.eclipse.cdt.meson.ui.tests
+
 # Disable examples
 %pom_disable_module visualizer/org.eclipse.cdt.visualizer.examples
 %pom_disable_module dsf/org.eclipse.cdt.examples.dsf
@@ -335,12 +343,10 @@ sed -i -e 's/org.mockito/org.mockito.mockito-core/' -e 's/org.hamcrest/org.hamcr
   dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF \
   codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF \
   core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
-# Relax swtbot version
-sed -i -e '/org.eclipse.swtbot.go/s/2.7.0/2.5.0/' build/org.eclipse.cdt.cmake.ui.tests/META-INF/MANIFEST.MF
 
 # Add template tools to the build
 tar xf %{SOURCE1} --strip-components=1 --exclude=%{template_snapshot}/pom.xml
-%pom_set_parent "org.eclipse.cdt:cdt-parent:9.4.3-SNAPSHOT" bundles
+%pom_set_parent "org.eclipse.cdt:cdt-parent:9.5.0-SNAPSHOT" bundles
 for b in org.eclipse.tools.templates.{core,freemarker,ui} ; do
   %pom_xpath_inject "pom:modules" "<module>bundles/$b</module>"
 done
@@ -553,6 +559,9 @@ fi
 %endif
 
 %changelog
+* Wed Jun 13 2018 Mat Booth <mat.booth@redhat.com> - 1:9.5.0-1
+- Update to Photon release
+
 * Fri May 4 2018 Alexander Kurtakov <akurtako@redhat.com> 1:9.4.3-2
 - Adjust to remove useless extra eclipse dir in droplets.
 
diff --git a/sources b/sources
index 42d5580..f86b6d7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (org.eclipse.tools.templates-b7cecf0b4a70eb74346d3de33096d16b2bbcd880.tar.xz) = 99037d35b4d91d9fdb8dc22b5e2816ac1df9e4e1b192c430fd02aa1630e27c0573ed9d82b2c0d27573cc27aca75be72237ef7a4648edd7234523896b62b14490
-SHA512 (CDT_9_4_3.tar.gz) = d694d46e0d48924c535b7e120100ef38fd9a77c90e0d8cb23cf299400d3d06daee7d6db8d611110d06899b32085e3b17b0a4b201945b9e8a857d362c8d98dda0
+SHA512 (025742ca9153703cbbe803bfa667706c6b7d3543.tar.gz) = 0422d20a35d528a8341ec60e09b9e96895958aa40c2de1a10aacf97064466669b02131caf40087b572a65365e19cfdbb0d64ed6af015a70f81c586436961c16d