[eclipse-pydev/f17] Use built jython. Fixes 880767

swagiaal swagiaal at fedoraproject.org
Mon Dec 17 18:05:46 UTC 2012


commit 782df4c26e9944141891e8a060c5f2874e2a0c0c
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date:   Mon Dec 17 11:39:14 2012 -0500

    Use built jython. Fixes 880767

 eclipse-pydev.spec |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index 5a0d9ba..d3abdb5 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -9,7 +9,7 @@ Epoch: 1
 Summary:          Eclipse Python development plug-in
 Name:             eclipse-pydev
 Version:          2.7.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          EPL
 URL:              http://pydev.org
 Group:            Development/Tools
@@ -94,9 +94,6 @@ ln -sf %{_javadir}/junit.jar \
 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 %{_datadir}/jython/Lib \
        plugins/org.python.pydev.jython/Lib
 
@@ -179,10 +176,6 @@ 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}/pydev-jython.jar
-ln -sf %{_javadir}/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
@@ -201,6 +194,9 @@ fi
 %{install_loc}/pydev-mylyn
 
 %changelog
+* Tue Dec 14 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:2.7.1-3
+- Use built pydev-jython because it contains JythonPlugin.
+
 * Tue Dec 4 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:2.7.1-2
 - Re-add pydev-removeruntimeerror.patch.
 


More information about the scm-commits mailing list