[eclipse-pydev] Update to upstream 2.3.0 release.

[Alexander Kurtakov]

commit 4f08125cd70b8c19c4b39c6a9868d687eff74802
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Dec 16 16:22:56 2011 +0200

    Update to upstream 2.3.0 release.

 eclipse-pydev.spec    |   27 ++++++++++++++++++---------
 remove-red-core.patch |    4 ++--
 2 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index 152a690..944cdb8 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -1,5 +1,5 @@
 # psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
-%global qualifier 2011110216
+%global qualifier 2011121518
 %global _python_bytecompile_errors_terminate_build 0
 
 Epoch: 1
@@ -9,14 +9,14 @@ Epoch: 1
 
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          2.2.4
+Version:          2.3.0
 Release:          1%{?dist}
 License:          EPL
 URL:              http://pydev.org
 Group:            Development/Tools
 
-#Source0:          http://downloads.sourceforge.net/project/pydev/pydev/PyDev%202.2.4/PyDev%202.2.4-sources.zip
-Source0:          PyDev-2.2.4-sources.zip
+#Source0:          http://downloads.sourceforge.net/project/pydev/pydev/PyDev%202.3.0/PyDev%202.3.0-sources.zip
+Source0:          PyDev-2.3.0-sources.zip
 Patch0:           pydev-removeruntimeerror.patch
 Patch1:           remove-red-core.patch
 Patch2:           remove-winregistry.patch
@@ -89,6 +89,7 @@ find . -name build.xml | xargs rm
 # remove pre-built jars
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
+rm -fr plugins/org.python.pydev.jython/Lib
 
 # link to system jars
 ln -sf %{_javadir}/commons-codec.jar \
@@ -101,7 +102,10 @@ ln -sf %{_jnidir}/jpathwatch.jar \
        plugins/org.python.pydev.core/lib/jpathwatch-0-94.jar
 
 ln -sf %{_javadir}/jython.jar \
-       plugins/org.python.pydev.jython/jython.jar
+       plugins/org.python.pydev.jython/pydev-jython.jar
+
+ln -sf %{_datadi}/jython/Lib \
+       plugins/org.python.pydev.jython/Lib
 
 ln -sf %{_javadir}/commons-logging.jar \
        plugins/org.python.pydev.debug/commons-logging-1.1.jar
@@ -182,13 +186,15 @@ rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-server-3.1.jar
 ln -sf %{_javadir}/xmlrpc3-server.jar \
        org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-server-3.1.jar
 
-rm -rf org.python.pydev.jython_%{version}.%{qualifier}/jython.jar
+rm -rf org.python.pydev.jython_%{version}.%{qualifier}/pydev-jython.jar
 ln -sf %{_javadir}/jython.jar \
-       org.python.pydev.jython_%{version}.%{qualifier}/jython.jar
+       org.python.pydev.jython_%{version}.%{qualifier}/pydev-jython.jar
+
+rm -rf org.python.pydev.jython_%{version}.%{qualifier}/Lib
+ln -sf %{_datadir}/jython/Lib \
+       org.python.pydev.jython_%{version}.%{qualifier}/Lib
 popd
 
-# rename cgi.py's shebang from /usr/local/bin/python to /usr/bin/env python
-sed -i 's/\/usr\/local\/bin\/python/\/usr\/bin\/env python/' ${RPM_BUILD_ROOT}%{install_loc}/pydev/eclipse/plugins/org.python.pydev.jython_%{version}.%{qualifier}/Lib/cgi.py
 # convert .py$ files from mode 0644 to mode 0755
 sixFourFourfiles=$(find ${RPM_BUILD_ROOT} -name '*\.py' -perm 0644 | xargs)
 if [ ${sixFourFourfiles:-0} -ne 0 ]; then
@@ -202,6 +208,9 @@ fi
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Fri Dec 16 2011 Alexander Kurtakov <akurtako at redhat.com> 1:2.3.0-1
+- Update to upstream 2.3.0 release.
+
 * Thu Nov 3 2011 Alexander Kurtakov <akurtako at redhat.com> 1:2.2.4-1
 - Update to upstream 2.2.4 release.
 
diff --git a/remove-red-core.patch b/remove-red-core.patch
index f05a6bf..165ff1d 100644
--- a/remove-red-core.patch
+++ b/remove-red-core.patch
@@ -3,11 +3,11 @@
 @@ -223,10 +223,5 @@ This Agreement is governed by the laws o
           download-size="160"
           install-size="160"
-          version="2.2.4.2011110216"/>
+          version="2.3.0.2011121518"/>
 -   <plugin
 -         id="org.python.pydev.red_core"
 -         download-size="160"
 -         install-size="160"
--         version="2.2.4.2011110216"/>
+-         version="2.3.0.2011121518"/>
  
  </feature>