From 5e208489eb738728ffd9c2780469ce5646117524 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: May 27 2015 15:37:35 +0000
Subject: Update to upstream 4.1.0 release.


---

diff --git a/.gitignore b/.gitignore
index 1e65aff..3c4cd14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /pydev_3_6_0.tar.gz
 /pydev_3_7_1.tar.gz
 /pydev_4_0_0.tar.gz
+/pydev_4_1_0.tar.gz
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index 549f92c..aa1163a 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -7,12 +7,12 @@
 Epoch: 1
 Summary: Eclipse Python development plug-in
 Name:    eclipse-pydev
-Version:          4.0.0
-Release:          2%{?dist}
+Version:          4.1.0
+Release:          1%{?dist}
 License:          EPL
 URL:              http://pydev.org
 
-Source0:          https://github.com/fabioz/Pydev/archive/pydev_4_0_0.tar.gz
+Source0:          https://github.com/fabioz/Pydev/archive/pydev_4_1_0.tar.gz
 
 # Remove windows specific code that manipulates the windows registry
 Patch0:           remove-winregistry.patch
@@ -21,11 +21,8 @@ Patch1:           remove-iInfo-error.patch
 # Allow system jython interpreter to be configured in preferences
 Patch2:           system-jython-interpreter.patch
 
-# Allow building against both luna and mars
-Patch3:           luna-mars-compat.patch
-
 # Fix native name
-Patch4:           native-name.patch
+Patch3:           native-name.patch
 
 Requires: eclipse-platform
 Requires: python
@@ -66,12 +63,11 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
 Mylyn Task-Focused UI extensions for Pydev.
 
 %prep
-%setup -q -n Pydev-pydev_4_0_0
+%setup -q -n Pydev-pydev_4_1_0
 %patch0
 %patch1 -p1
 %patch2 -p1
 %patch3
-%patch4
 
 %mvn_package "::pom:" __noinstall
 %mvn_package ":*.mylyn" mylyn
@@ -183,6 +179,9 @@ fi
 %doc LICENSE.txt
 
 %changelog
+* Wed May 27 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.1.0-1
+- Update to upstream 4.1.0 release.
+
 * Wed May 13 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.0.0-2
 - Make mylyn subpackage archful as timestamps make diff and fail builds.
 
diff --git a/luna-mars-compat.patch b/luna-mars-compat.patch
deleted file mode 100644
index dcf1bd4..0000000
--- a/luna-mars-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/org.python.pydev/src_navigator/org/python/pydev/navigator/actions/copied/WorkspaceAction.java.orig	2015-04-15 15:04:09.913223406 +0100
-+++ plugins/org.python.pydev/src_navigator/org/python/pydev/navigator/actions/copied/WorkspaceAction.java	2015-04-15 15:04:32.558911335 +0100
-@@ -337,8 +337,8 @@
-         if (!super.updateSelection(selection) || selection.isEmpty()) {
-             return false;
-         }
--        for (Iterator<IResource> i = getSelectedResources().iterator(); i.hasNext();) {
--            IResource r = i.next();
-+        for (Iterator i = getSelectedResources().iterator(); i.hasNext();) {
-+            IResource r = (IResource)i.next();
-             if (!r.isAccessible()) {
-                 return false;
-             }
diff --git a/remove-winregistry.patch b/remove-winregistry.patch
index 0bc2aad..4a17515 100644
--- a/remove-winregistry.patch
+++ b/remove-winregistry.patch
@@ -96,14 +96,16 @@
                 icons/,\
 --- plugins/org.python.pydev/build.properties.orig	2014-07-31 14:13:39.439344020 +0100
 +++ plugins/org.python.pydev/build.properties	2014-07-31 14:13:57.866059652 +0100
-@@ -8,9 +8,7 @@
+@@ -8,10 +8,8 @@
                 about.mappings,\
                 pydev.png,\
                 plugin.properties,\
 -               LICENSE.txt,\
 -               libs/,\
--               libs/WinRegistry-4.5.jar
-+               LICENSE.txt
+-               libs/WinRegistry-4.5.jar,\
+-               css/
++               LICENSE.txt,\
++               css/
  jars.compile.order = pydev.jar
  source.pydev.jar = src/,\
                     src_navigator/,\
diff --git a/sources b/sources
index a4b8588..1f57918 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65d591c926bcb99f70fb5fa6d68c431c  pydev_4_0_0.tar.gz
+eae9be3950a824a01b18a03cd2059650  pydev_4_1_0.tar.gz