[eclipse-dltk] Make direct hamcrest use explicit in manifest

Mat Booth mbooth at fedoraproject.org
Tue Jan 20 16:56:32 UTC 2015


commit a7f96c93e8f2fb8dfc640c1487a052fdcbef6146
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Jan 20 16:56:48 2015 +0000

    Make direct hamcrest use explicit in manifest

 eclipse-dltk.spec           |    9 ++++++++-
 explicit-hamcrest-use.patch |   10 ++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-dltk.spec b/eclipse-dltk.spec
index 16040da..f4533e2 100644
--- a/eclipse-dltk.spec
+++ b/eclipse-dltk.spec
@@ -2,7 +2,7 @@
 
 Name:      eclipse-dltk
 Version:   5.1.0
-Release:   5%{?dist}
+Release:   6%{?dist}
 Summary:   Dynamic Languages Toolkit (DLTK) Eclipse plug-in
 License:   EPL
 URL:       http://www.eclipse.org/dltk/
@@ -13,6 +13,9 @@ URL:       http://www.eclipse.org/dltk/
 Source0:   %{name}-%{version}.tar.xz
 Source1:   get-dltk.sh
 
+# This patch submitted upstream https://bugs.eclipse.org/bugs/show_bug.cgi?id=457960
+Patch0:    explicit-hamcrest-use.patch
+
 BuildArch:        noarch
 
 BuildRequires:    eclipse-license >= 1.0.1
@@ -99,6 +102,7 @@ Tests for Eclipse Dynamic Languages Toolkit (DLTK).
 
 %prep
 %setup -q -n eclipse-dltk-%{version}
+%patch0
 
 # We are not shipping the python and javascript editors
 # For python we have eclipse-pydev, which should be used instead
@@ -171,6 +175,9 @@ done
 %files tests -f .mfiles-tests
 
 %changelog
+* Tue Jan 20 2015 Mat Booth <mat.booth at redhat.com> - 5.1.0-6
+- Make direct hamcrest use explicit in manifest
+
 * Fri Dec 5 2014 Alexander Kurtakov <akurtako at redhat.com> 5.1.0-5
 - Fix build due to unresolvable targetplatform - just skip it.
 
diff --git a/explicit-hamcrest-use.patch b/explicit-hamcrest-use.patch
new file mode 100644
index 0000000..5717d55
--- /dev/null
+++ b/explicit-hamcrest-use.patch
@@ -0,0 +1,10 @@
+--- org.eclipse.dltk.core/core/tests/org.eclipse.dltk.core.tests/META-INF/MANIFEST.MF.orig	2015-01-20 15:54:22.911591028 +0000
++++ org.eclipse.dltk.core/core/tests/org.eclipse.dltk.core.tests/META-INF/MANIFEST.MF	2015-01-20 15:54:40.604341896 +0000
+@@ -7,6 +7,7 @@
+ Bundle-Vendor: %pluginProvider
+ Bundle-Localization: plugin
+ Require-Bundle: org.junit;bundle-version="4.8",
++ org.hamcrest.core,
+  org.eclipse.dltk.annotations,
+  org.eclipse.core.runtime,
+  org.eclipse.core.resources,


More information about the scm-commits mailing list