akurtakov pushed to eclipse-dltk (master). "Update to upstream 5.1.1."

[notifications at fedoraproject.org]

From 2f294a1fe0ca80e885851a73f54d580b86c1a1e1 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri, 8 May 2015 08:50:48 +0300
Subject: Update to upstream 5.1.1.


diff --git a/eclipse-dltk.spec b/eclipse-dltk.spec
index f4533e2..795f47c 100644
--- a/eclipse-dltk.spec
+++ b/eclipse-dltk.spec
@@ -1,8 +1,8 @@
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
 
 Name:      eclipse-dltk
-Version:   5.1.0
-Release:   6%{?dist}
+Version:   5.1.1
+Release:   1%{?dist}
 Summary:   Dynamic Languages Toolkit (DLTK) Eclipse plug-in
 License:   EPL
 URL:       http://www.eclipse.org/dltk/
@@ -13,14 +13,11 @@ 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
 BuildRequires:    eclipse-pde >= 1:4.4.0
-BuildRequires:    eclipse-emf
+BuildRequires:    eclipse-emf-runtime
 BuildRequires:    eclipse-mylyn
 BuildRequires:    eclipse-mylyn-ide
 BuildRequires:    eclipse-rse
@@ -102,7 +99,6 @@ 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
@@ -175,6 +171,9 @@ done
 %files tests -f .mfiles-tests
 
 %changelog
+* Fri May 8 2015 Alexander Kurtakov <akurtako at redhat.com> 5.1.1-1
+- Update to upstream 5.1.1.
+
 * Tue Jan 20 2015 Mat Booth <mat.booth at redhat.com> - 5.1.0-6
 - Make direct hamcrest use explicit in manifest
 
diff --git a/explicit-hamcrest-use.patch b/explicit-hamcrest-use.patch
deleted file mode 100644
index 5717d55..0000000
--- a/explicit-hamcrest-use.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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,
diff --git a/get-dltk.sh b/get-dltk.sh
index e36b142..01c981b 100644
--- a/get-dltk.sh
+++ b/get-dltk.sh
@@ -2,31 +2,28 @@
 set -e
 
 NAME="eclipse-dltk"
-VERSION=5.1.0
+VERSION=5.1.1
 
 rm -fr $NAME-$VERSION
 mkdir $NAME-$VERSION
 pushd $NAME-$VERSION
 
-TAG=Root_R5_1_maintenance
+TAG=R5_1_1
 wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.releng.git/snapshot/org.eclipse.dltk.releng-$TAG.tar.bz2
 tar xfs org.eclipse.dltk.releng-$TAG.tar.bz2
 rm org.eclipse.dltk.releng-$TAG.tar.bz2
 mv org.eclipse.dltk.releng-$TAG org.eclipse.dltk.releng
 
-TAG=Root_R5_1_maintenance
 wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.core.git/snapshot/org.eclipse.dltk.core-$TAG.tar.bz2
 tar xfs org.eclipse.dltk.core-$TAG.tar.bz2
 rm org.eclipse.dltk.core-$TAG.tar.bz2
 mv org.eclipse.dltk.core-$TAG org.eclipse.dltk.core
 
-TAG=Root_R5_1_maintenance
 wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.ruby.git/snapshot/org.eclipse.dltk.ruby-$TAG.tar.bz2
 tar xfs org.eclipse.dltk.ruby-$TAG.tar.bz2
 rm org.eclipse.dltk.ruby-$TAG.tar.bz2
 mv org.eclipse.dltk.ruby-$TAG org.eclipse.dltk.ruby
 
-TAG=Root_R5_1_maintenance
 wget http://git.eclipse.org/c/dltk/org.eclipse.dltk.tcl.git/snapshot/org.eclipse.dltk.tcl-$TAG.tar.bz2
 tar xfs org.eclipse.dltk.tcl-$TAG.tar.bz2
 rm org.eclipse.dltk.tcl-$TAG.tar.bz2
diff --git a/sources b/sources
index 43b7b8f..4078798 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb41150a6ea8e1a5cf8596f399777120  eclipse-dltk-5.1.0.tar.xz
+8e2844c0453b29cff798032acb2bd922  eclipse-dltk-5.1.1.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/eclipse-dltk.git/commit/?h=master&id=2f294a1fe0ca80e885851a73f54d580b86c1a1e1