diff --git a/.gitignore b/.gitignore
index a18f639..5acf066 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ PyDev-2.2.2-sources.zip
/PyDev-2.7.0-sources.zip
/PyDev-2.7.1-sources.zip
/PyDev-2.7.3-sources.zip
+/PyDev-2.7.4-sources.zip
diff --git a/.project b/.project
new file mode 100644
index 0000000..03092ea
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+
+
+ eclipse-pydev
+
+
+
+
+
+
+
+
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index c13290b..525cbf2 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -1,5 +1,5 @@
# psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
-%global qualifier 2013031601
+%global qualifier 2013051601
%global _python_bytecompile_errors_terminate_build 0
Epoch: 1
@@ -8,21 +8,17 @@ Epoch: 1
Summary: Eclipse Python development plug-in
Name: eclipse-pydev
-Version: 2.7.3
-Release: 2%{?dist}
+Version: 2.7.4
+Release: 1%{?dist}
License: EPL
URL: http://pydev.org
Group: Development/Tools
-#Source0: http://downloads.sourceforge.net/project/pydev/pydev/PyDev%202.7.3/PyDev%202.7.3-sources.zip
+#Source0: http://downloads.sourceforge.net/project/pydev/pydev/PyDev%202.7.4/PyDev%202.7.4-sources.zip
Source0: PyDev-%{version}-sources.zip
-Patch0: pydev-removeruntimeerror.patch
-Patch1: remove-red-core.patch
-Patch2: remove-winregistry.patch
-Patch3: pydev-remove-jython.patch
-Patch4: pydev-add-shared_core-to-feature.patch
-Patch5: pydev-remove-junit-version-limit.patch
-Patch6: pydev-make-junit-optional.patch
+Patch0: remove-winregistry.patch
+Patch1: pydev-remove-jython.patch
+Patch2: pydev-remove-junit-version-limit.patch
BuildRequires: java-devel >= 1.5.0
BuildArch: noarch
@@ -72,13 +68,9 @@ Mylyn Task-Focused UI extensions for Pydev.
%prep
%setup -q -c
-%patch0 -p1
-%patch1 -p1 -b .sav
-%patch2 -p1 -b .sav
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch0
+%patch1 -p1
+%patch2 -p1
#fix mylyn plugin version
sed --in-place 's:version="0.4.0":version="%{version}.%{qualifier}":' features/org.python.pydev.mylyn.feature/feature.xml
@@ -221,6 +213,10 @@ rm -f %{_datadir}/jython/Lib/optparse.py
%{install_loc}/pydev-mylyn
%changelog
+* Thu May 16 2013 Alexander Kurtakov 1:2.7.4-1
+- Update to new upstream release.
+- Simplify and rediff patches.
+
* Wed Apr 24 2013 Sami Wagiaalla 1:2.7.3-2
- Make junit an optional requirement for org.eclipse.pydev.debug
- Use 'find' to find and link jars so that we don't have to specify
diff --git a/pydev-add-shared_core-to-feature.patch b/pydev-add-shared_core-to-feature.patch
deleted file mode 100644
index 4ad0e62..0000000
--- a/pydev-add-shared_core-to-feature.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/features/org.python.pydev.feature/feature.xml
-+++ b/features/org.python.pydev.feature/feature.xml
-@@ -234,4 +234,10 @@ This Agreement is governed by the laws of the State of New York and the intellec
- install-size="160"
- version="2.7.3.2013031601"/>
-
-+
-+
-
diff --git a/pydev-make-junit-optional.patch b/pydev-make-junit-optional.patch
deleted file mode 100644
index b61bf89..0000000
--- a/pydev-make-junit-optional.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# The version bump should be removed next updated.
---- a/features/org.python.pydev.feature/feature.xml
-+++ b/features/org.python.pydev.feature/feature.xml
-@@ -167,7 +167,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
- id="org.python.pydev.debug"
- download-size="1350"
- install-size="1350"
-- version="2.7.3.2013031601"/>
-+ version="2.7.3.2013031602"/>
-
-
-
--
--
-
diff --git a/remove-winregistry.patch b/remove-winregistry.patch
index 8dd8e0b..edcd9f1 100644
--- a/remove-winregistry.patch
+++ b/remove-winregistry.patch
@@ -1,8 +1,8 @@
---- a/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java
-+++ b/plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java
-@@ -26,9 +26,6 @@ import org.python.pydev.shared_core.structure.Tuple;
- import org.python.pydev.shared_core.utils.PlatformUtils;
- import org.python.pydev.ui.UIConstants;
+--- plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java.sav 2013-05-16 04:01:28.000000000 +0300
++++ plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterEditor.java 2013-05-16 15:18:44.155064194 +0300
+@@ -26,9 +26,6 @@ import org.python.pydev.shared_core.util
+ import org.python.pydev.shared_ui.EditorUtils;
+ import org.python.pydev.shared_ui.UIConstants;
-import at.jta.Key;
-import at.jta.Regor;
@@ -10,7 +10,7 @@
public class PythonInterpreterEditor extends AbstractInterpreterEditor {
public PythonInterpreterEditor(String labelText, Composite parent, IInterpreterManager interpreterManager) {
-@@ -53,74 +50,6 @@ public class PythonInterpreterEditor extends AbstractInterpreterEditor {
+@@ -53,74 +50,6 @@ public class PythonInterpreterEditor ext
if (ret != null) {
return ret;
}
@@ -58,7 +58,7 @@
- }
- if (foundVersions.size() > 1) {
- //The user should select which one to use...
-- ListDialog listDialog = new ListDialog(PyAction.getShell());
+- ListDialog listDialog = new ListDialog(EditorUtils.getShell());
-
- listDialog.setContentProvider(new ArrayContentProvider());
- listDialog.setLabelProvider(new LabelProvider() {
diff --git a/sources b/sources
index 739e183..4473664 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b0f3202003efd295cc605f7aad7261b PyDev-2.7.3-sources.zip
+c98a99f8521d46808503311990ffcdca PyDev-2.7.4-sources.zip