[eclipse-eclemma] Patch to explicitly depend on hamcrest core in tests

[Mat Booth]

commit ac0adb85b67c4ed102242f50d0dbd2e98bd89c16
Author: Mat Booth <mat.booth at redhat.com>
Date:   Fri Jan 23 13:20:13 2015 +0000

    Patch to explicitly depend on hamcrest core in tests
    
    - Fix files listed twice warning

 eclipse-eclemma.spec        |   15 +++++++++------
 explicit-hamcrest-use.patch |   10 ++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/eclipse-eclemma.spec b/eclipse-eclemma.spec
index a24c92e..a8f0c51 100644
--- a/eclipse-eclemma.spec
+++ b/eclipse-eclemma.spec
@@ -1,8 +1,6 @@
-%global install_loc  %{_datadir}/eclipse/dropins/eclemma
-
 Name:      eclipse-eclemma
 Version:   2.3.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Java code coverage tool plugin for Eclipse
 Group:     Development/Tools
 License:   EPL and ASL 2.0
@@ -11,9 +9,10 @@ Source0:   https://github.com/jacoco/eclemma/archive/v%{version}.tar.gz
 
 Patch0:    eclipse-eclemma-build-luna.patch
 
+# This patch has been submitted upstream: https://github.com/jacoco/eclemma/pull/97
+Patch1:    explicit-hamcrest-use.patch
+
 BuildArch:        noarch
-BuildRequires:    java-devel
-BuildRequires:    javapackages-tools
 BuildRequires:    eclipse-pde >= 1:4.2.0
 BuildRequires:    jacoco >= 0.7.1
 BuildRequires:    maven-local
@@ -33,6 +32,7 @@ editors.
 %prep
 %setup -q -n eclemma-%{version}
 %patch0
+%patch1
 
 #git does not handle empty folders - but this one is necessary
 mkdir -p com.mountainminds.eclemma.asm/src
@@ -56,9 +56,12 @@ sed -i /jacoco/s/0.7.3/0.8.0/ `find -name *.MF`
 %doc com.mountainminds.eclemma.doc/pages/faq.html
 %doc com.mountainminds.eclemma.doc/pages/license.html
 %doc com.mountainminds.eclemma.core/about.html
-%{install_loc}
 
 %changelog
+* Fri Jan 23 2015 Mat Booth <mat.booth at redhat.com> - 2.3.2-3
+- Patch to explicitly depend on hamcrest core in tests
+- Fix files listed twice warning
+
 * Thu Dec 4 2014 Alexander Kurtakov <akurtako at redhat.com> 2.3.2-2
 - Drop useless BR on feclipse-maven-plugin.
 
diff --git a/explicit-hamcrest-use.patch b/explicit-hamcrest-use.patch
new file mode 100644
index 0000000..ca7e624
--- /dev/null
+++ b/explicit-hamcrest-use.patch
@@ -0,0 +1,10 @@
+--- com.mountainminds.eclemma.core.test/META-INF/MANIFEST.MF.orig	2015-01-23 12:44:01.450252199 +0000
++++ com.mountainminds.eclemma.core.test/META-INF/MANIFEST.MF	2015-01-23 12:44:26.683896961 +0000
+@@ -5,5 +5,6 @@
+ Bundle-Version: 2.3.2.qualifier
+ Bundle-Vendor: Mountainminds GmbH & Co. KG
+ Fragment-Host: com.mountainminds.eclemma.core;bundle-version="[2.3.2,3.0.0)"
+-Require-Bundle: org.junit;bundle-version="4.0.0"
++Require-Bundle: org.junit;bundle-version="4.0.0",
++ org.hamcrest.core
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5