[eclipse-color-theme] Make direct hamcrest use explicit in manifest

[Mat Booth]

commit cb26ad30de0258fbf4e4703e3e7f779e422aecf9
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Jan 20 19:03:38 2015 +0000

    Make direct hamcrest use explicit in manifest

 eclipse-color-theme.spec    |    9 ++++++++-
 explicit-hamcrest-use.patch |   25 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-color-theme.spec b/eclipse-color-theme.spec
index 9645e8a..795ae54 100644
--- a/eclipse-color-theme.spec
+++ b/eclipse-color-theme.spec
@@ -4,13 +4,16 @@
 Summary:        An Eclipse plugin which permits color theme switching
 Name:           eclipse-color-theme
 Version:        1.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipsecolorthemes.org/
 # http://github.com/eclipse-color-theme/eclipse-color-theme/tarball/v%{version}
 Source0:        %{name}-%{name}-v%{version}-0-g%{git_tag}.tar.gz
 
+# Patch submitted upstream https://github.com/eclipse-color-theme/eclipse-color-theme/pull/218
+Patch0:         explicit-hamcrest-use.patch
+
 BuildRequires: eclipse-pde >= 1:3.4.0
 BuildRequires: tycho
 
@@ -26,6 +29,7 @@ by exporting it as XML.
 
 %prep
 %setup -q -n %{name}-%{name}-%{git_tag}
+%patch0 -p1
 
 %mvn_package ":*.test" __noinstall
 
@@ -39,6 +43,9 @@ by exporting it as XML.
 %doc README.md CHANGES.md COPYING
 
 %changelog
+* Tue Jan 20 2015 Mat Booth <mat.booth at redhat.com> - 1.0.0-2
+- Make direct hamcrest use explicit in manifest
+
 * Wed Dec 10 2014 Alexander Kurtakov <akurtako at redhat.com> 1.0.0-1
 - Update to version 1.0.0.
 - Build with xmvn.
diff --git a/explicit-hamcrest-use.patch b/explicit-hamcrest-use.patch
new file mode 100644
index 0000000..d74c018
--- /dev/null
+++ b/explicit-hamcrest-use.patch
@@ -0,0 +1,25 @@
+From 606f0f151931d076f9f564ef563e9275b4a025b5 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth at redhat.com>
+Date: Tue, 20 Jan 2015 17:34:58 +0000
+Subject: [PATCH] Tests use the hamcrest core API directly, it should be
+ explicitly called out in the manifest so we don't rely on other bundles
+ re-exporting API.
+
+Signed-off-by: Mat Booth <mat.booth at redhat.com>
+---
+ com.github.eclipsecolortheme.test/META-INF/MANIFEST.MF | 1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/com.github.eclipsecolortheme.test/META-INF/MANIFEST.MF b/com.github.eclipsecolortheme.test/META-INF/MANIFEST.MF
+index f51489a..ddb308a 100644
+--- a/com.github.eclipsecolortheme.test/META-INF/MANIFEST.MF
++++ b/com.github.eclipsecolortheme.test/META-INF/MANIFEST.MF
+@@ -7,4 +7,5 @@ Bundle-Vendor: GitHub
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Require-Bundle: com.github.eclipsecolortheme;bundle-version="0.9.0",
+  org.junit,
++ org.hamcrest.core,
+  org.eclipse.core.runtime;bundle-version="3.6.0"
+-- 
+2.1.0
+