[eclipse-pydev] Update to 2.6.0 release.

[swagiaal]

commit 949e3884a946dd96ee412db8f14c267bbf430181
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date:   Wed Jul 18 11:47:39 2012 -0400

    Update to 2.6.0 release.

 eclipse-pydev.spec    |   18 ++++++++++++------
 remove-red-core.patch |   18 ++++++++++++++++--
 sources               |    2 +-
 3 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index 7972215..d71d794 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -1,5 +1,5 @@
 # psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
-%global qualifier 2012040618
+%global qualifier 2012062818
 %global _python_bytecompile_errors_terminate_build 0
 
 Epoch: 1
@@ -8,14 +8,14 @@ Epoch: 1
 
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          2.5.0
+Version:          2.6.0
 Release:          1%{?dist}
 License:          EPL
 URL:              http://pydev.org
 Group:            Development/Tools
 
-#Source0:         http://downloads.sourceforge.net/project/pydev/pydev/PyDev%202.5.0/PyDev%202.5.0-sources.zip
-Source0:          PyDev-2.5.0-sources.zip
+#Source0:         http://downloads.sourceforge.net/project/pydev/pydev/PyDev%202.6.0/PyDev%202.6.0-sources.zip
+Source0:          PyDev-%{version}-sources.zip
 Patch1:           remove-red-core.patch
 Patch2:           remove-winregistry.patch
 Patch3:           remove-org.eclipse.mylyn-requirement.patch
@@ -88,13 +88,16 @@ ln -sf %{_javadir}/commons-codec.jar \
 ln -sf %{_javadir}/junit.jar \
        plugins/org.python.pydev.core/lib/junit.jar
 
-ln -sf %{_jnidir}/jpathwatch.jar \
+#FIXME: %{_libdir} seems to be evaluating to /usr/lib
+#       on x8664 machines on rawhide. Use _libdir when
+#       that is fixed.
+ln -sf %{_eclipse_base}/../java/jpathwatch.jar \
        plugins/org.python.pydev.core/lib/jpathwatch-0-94.jar
 
 ln -sf %{_javadir}/jython.jar \
        plugins/org.python.pydev.jython/pydev-jython.jar
 
-ln -sf %{_datadi}/jython/Lib \
+ln -sf %{_datadir}/jython/Lib \
        plugins/org.python.pydev.jython/Lib
 
 ln -sf %{_javadir}/commons-logging.jar \
@@ -198,6 +201,9 @@ fi
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Wed Jul 18 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:2.6.0-1
+- Update to 2.6.0 release.
+
 * Thu Apr 26 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:2.5.0-1
 - Update to 2.5.0 release.
 - Use eclipse-pdebuild.
diff --git a/remove-red-core.patch b/remove-red-core.patch
index c4d5e38..5d48648 100644
--- a/remove-red-core.patch
+++ b/remove-red-core.patch
@@ -1,13 +1,27 @@
+From 3a23294205ddcad309af1a240cfd4aac51d25f71 Mon Sep 17 00:00:00 2001
+From: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Tue, 10 Jul 2012 11:11:20 -0400
+Subject: [PATCH 1/3] remove-red-core.patch
+
+---
+ features/org.python.pydev.feature/feature.xml |    5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git features/org.python.pydev.feature/feature.xml features/org.python.pydev.feature/feature.xml
+index 206b885..12e5305 100644
 --- features/org.python.pydev.feature/feature.xml
 +++ features/org.python.pydev.feature/feature.xml
 @@ -223,10 +223,5 @@ This Agreement is governed by the laws of the State of New York and the intellec
           download-size="160"
           install-size="160"
-          version="2.5.0.2012040618"/>
+          version="2.6.0.2012062818"/>
 -   <plugin
 -         id="org.python.pydev.red_core"
 -         download-size="160"
 -         install-size="160"
--         version="2.5.0.2012040618"/>
+-         version="2.6.0.2012062818"/>
  
  </feature>
+-- 
+1.7.10.4
+
diff --git a/sources b/sources
index 1f0e66f..a7015b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff2da759c11a419d3385af2412e375fe  PyDev-2.5.0-sources.zip
+f1082c3d6937174c2c5fa2a6e3fa1b4b  PyDev-2.6.0-sources.zip