[eclipse-pydev] update to 1.6.1, fix broken symlinks, update requires names

[Nathaniel McCallum]

commit e907651324a020c97c3e540c57a993c0bf0b4bba
Author: Nathaniel McCallum <nathaniel at natemccallum.com>
Date:   Sat Aug 28 11:43:43 2010 -0400

    update to 1.6.1, fix broken symlinks, update requires names

 eclipse-pydev.spec    |   27 +++++++++++++++++----------
 remove-red-core.patch |   13 ++++++-------
 2 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index c1986a0..5ed2d66 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -1,6 +1,6 @@
 # psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
 %global debug_package %{nil}
-%global qualifier 2010063001
+%global qualifier 2010080312
 %global _python_bytecompile_errors_terminate_build 0
 
 Epoch: 1
@@ -10,13 +10,13 @@ Epoch: 1
 
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
-Version:          1.5.9
-Release:          2%{?dist}
+Version:          1.6.1
+Release:          1%{?dist}
 License:          EPL
 URL:              http://pydev.org
 Group:            Development/Tools
 
-Source0:          https://downloads.sourceforge.net/project/pydev/pydev/Pydev%201.5.9/org.python.pydev.feature-%{version}.%{qualifier}-sources.zip
+Source0:          https://downloads.sourceforge.net/project/pydev/pydev/Pydev%20%{version}/org.python.pydev.feature-%{version}.%{qualifier}-sources.zip
 Patch0:           use-piccolo2d-bundle.patch
 Patch1:           piccolo-swtimage-dispose.patch
 Patch2:           pydev-removeruntimeerror.patch
@@ -32,8 +32,8 @@ Requires:         python
 #ifarch %{ix86}
 #Requires:         python-psyco
 #endif
-Requires:         jakarta-commons-codec >= 1.3
-Requires:         jakarta-commons-logging
+Requires:         apache-commons-codec >= 1.3
+Requires:         apache-commons-logging
 Requires:         xmlrpc3-common
 Requires:         xmlrpc3-client
 Requires:         xmlrpc3-server
@@ -46,8 +46,8 @@ BuildRequires:    eclipse-pde
 BuildRequires:    eclipse-mylyn
 BuildRequires:    jpackage-utils >= 0:1.5
 BuildRequires:    junit >= 3.8.1
-BuildRequires:    jakarta-commons-codec >= 1.3
-BuildRequires:    jakarta-commons-logging
+BuildRequires:    apache-commons-codec >= 1.3
+BuildRequires:    apache-commons-logging
 BuildRequires:    ws-commons-util
 BuildRequires:    xmlrpc3-common
 BuildRequires:    xmlrpc3-client
@@ -163,7 +163,7 @@ ln -s %{_javadir}/piccolo2d/piccolo2d-core.jar piccolo2d-core.jar
 ln -s %{_javadir}/piccolo2d/piccolo2d-extras.jar piccolo2d-extras.jar
 ln -s %{_javadir}/piccolo2d/piccolo2d-swt.jar piccolo2d-swt.jar
 rm -rf org.python.pydev.core_%{version}.%{qualifier}/commons-codec.jar
-ln -sf %{_javadir}/jakarta-commons-codec.jar \
+ln -sf %{_javadir}/commons-codec.jar \
        org.python.pydev.core_%{version}.%{qualifier}/commons-codec.jar
 
 mkdir org.python.pydev.core_%{version}.%{qualifier}/lib
@@ -171,7 +171,7 @@ ln -sf %{_javadir}/junit.jar \
        org.python.pydev.core_%{version}.%{qualifier}/lib/junit.jar
 
 rm -rf org.python.pydev.debug_%{version}.%{qualifier}/commons-logging-1.1.jar
-ln -sf %{_javadir}/jakarta-commons-logging.jar \
+ln -sf %{_javadir}/commons-logging.jar \
        org.python.pydev.debug_%{version}.%{qualifier}/commons-logging-1.1.jar
 
 rm -rf org.python.pydev.debug_%{version}.%{qualifier}/ws-commons-util-1.0.2.jar
@@ -216,6 +216,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Fri Aug 27 2010 Nathaniel McCallum <nathaniel at natemccallum.com> - 1:1.6.1-1
+- Update to 1.6.1
+- rework remove-red-core.patch to apply on 1.6.1
+- jakarta-commons-codec -> apache-commons-codec
+- jakarta-commons-logging -> apache-commons-logging
+- fix symlinks related to the jakarta->apache package changes
+
 * Fri Aug 06 2010 Adam Williamson <awilliam at redhat.com> 1:1.5.9-2
 - Temporarily drop the dependency on psyco as it is not ported to
   Python 2.7 yet
diff --git a/remove-red-core.patch b/remove-red-core.patch
index 4d57d9a..ef0f8c0 100644
--- a/remove-red-core.patch
+++ b/remove-red-core.patch
@@ -1,14 +1,13 @@
---- features/org.python.pydev.feature/feature.xml.sav	2010-06-30 01:07:38.000000000 +0300
-+++ features/org.python.pydev.feature/feature.xml	2010-07-13 19:26:29.725806002 +0300
-@@ -223,10 +223,4 @@ This Agreement is governed by the laws o
+--- features/org.python.pydev.feature/feature.xml.orig	2010-08-27 15:44:51.426490882 -0400
++++ features/org.python.pydev.feature/feature.xml	2010-08-27 15:45:01.867115136 -0400
+@@ -223,10 +223,4 @@
           download-size="160"
           install-size="160"
-          version="1.5.9.2010063001"/>
+          version="1.6.1.2010080312"/>
 -   <plugin
 -         id="org.python.pydev.red_core"
 -         download-size="160"
 -         install-size="160"
--         version="1.5.9.2010063001"/>
+-         version="1.6.1.2010080312"/>
 -
--</feature>
-+  </feature>
+ </feature>