[eclipse-pydev/f17] Use system jython
swagiaal
swagiaal at fedoraproject.org
Mon Jan 7 18:43:07 UTC 2013
commit 3bd147e20816a3311bfc8372f3f6a90a3b9a6b59
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date: Mon Jan 7 13:04:59 2013 -0500
Use system jython
eclipse-pydev.spec | 29 +++++++++++++++++++++--
pydev-bump-jython-bundle-qualifier.patch | 13 ++++++++++
pydev-remove-jython.patch | 37 ++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+), 3 deletions(-)
---
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index d3abdb5..a364968 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -2,6 +2,10 @@
%global qualifier 2012100913
%global _python_bytecompile_errors_terminate_build 0
+# jython_qualifier should be removed the next time the sources
+# are update and qualifier used instead.
+%global jython_qualifier 2012100914
+
Epoch: 1
%global install_loc %{_datadir}/eclipse/dropins
@@ -9,7 +13,7 @@ Epoch: 1
Summary: Eclipse Python development plug-in
Name: eclipse-pydev
Version: 2.7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: EPL
URL: http://pydev.org
Group: Development/Tools
@@ -19,6 +23,9 @@ Source0: PyDev-%{version}-sources.zip
Patch0: pydev-removeruntimeerror.patch
Patch1: remove-red-core.patch
Patch2: remove-winregistry.patch
+Patch3: pydev-remove-jython.patch
+# Patch4 should be dropped the next time newer sources are imported.
+Patch4: pydev-bump-jython-bundle-qualifier.patch
BuildRequires: java-devel >= 1.5.0
BuildArch: noarch
@@ -70,6 +77,9 @@ Mylyn Task-Focused UI extensions for Pydev.
%patch0 -p1
%patch1 -b .sav
%patch2 -b .sav
+%patch3 -p1
+%patch4 -p1
+
#fix mylyn plugin version
sed --in-place 's:version="0.4.0":version="%{version}.%{qualifier}":' features/org.python.pydev.mylyn.feature/feature.xml
@@ -81,6 +91,9 @@ find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
rm -fr plugins/org.python.pydev.jython/Lib
+# Remove inlined jython sources.
+rm -rf plugins/org.python.pydev.jython/src_jython
+
# link to system jars
ln -sf %{_javadir}/commons-codec.jar \
plugins/org.python.pydev.core/commons-codec.jar
@@ -94,6 +107,10 @@ ln -sf %{_javadir}/junit.jar \
ln -sf %{_eclipse_base}/../java/jpathwatch.jar \
plugins/org.python.pydev.core/lib/jpathwatch-0-94.jar
+mkdir plugins/org.python.pydev.jython/lib/
+ln -sf %{_javadir}/jython.jar \
+ plugins/org.python.pydev.jython/lib/jython.jar
+
ln -sf %{_datadir}/jython/Lib \
plugins/org.python.pydev.jython/Lib
@@ -176,9 +193,12 @@ 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}/Lib
+rm -rf org.python.pydev.jython_%{version}.%{jython_qualifier}/Lib
ln -sf %{_datadir}/jython/Lib \
- org.python.pydev.jython_%{version}.%{qualifier}/Lib
+ org.python.pydev.jython_%{version}.%{jython_qualifier}/Lib
+
+ln -sf %{_javadir}/jython.jar \
+ org.python.pydev.jython_%{version}.%{jython_qualifier}/lib
popd
# convert .py$ files from mode 0644 to mode 0755
@@ -194,6 +214,9 @@ fi
%{install_loc}/pydev-mylyn
%changelog
+* Mon Jan 7 2013 Sami Wagiaalla <swagiaal at redhat.com> 1:2.7.1-4
+- Remove jython sources and use system jython jar instead.
+
* Tue Dec 14 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:2.7.1-3
- Use built pydev-jython because it contains JythonPlugin.
diff --git a/pydev-bump-jython-bundle-qualifier.patch b/pydev-bump-jython-bundle-qualifier.patch
new file mode 100644
index 0000000..1ce532c
--- /dev/null
+++ b/pydev-bump-jython-bundle-qualifier.patch
@@ -0,0 +1,13 @@
+diff --git a/features/org.python.pydev.feature/feature.xml b/features/org.python.pydev.feature/feature.xml
+index fd6da0f..d12d244 100644
+--- a/features/org.python.pydev.feature/feature.xml
++++ b/features/org.python.pydev.feature/feature.xml
+@@ -149,7 +149,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
+ id="org.python.pydev.jython"
+ download-size="4280"
+ install-size="4280"
+- version="2.7.1.2012100913"/>
++ version="2.7.1.2012100914"/>
+
+ <plugin
+ id="org.python.pydev.help"
diff --git a/pydev-remove-jython.patch b/pydev-remove-jython.patch
new file mode 100644
index 0000000..866a4d8
--- /dev/null
+++ b/pydev-remove-jython.patch
@@ -0,0 +1,37 @@
+diff --git a/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF b/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
+index db95403..7b59cfa 100644
+--- a/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
++++ b/plugins/org.python.pydev.jython/META-INF/MANIFEST.MF
+@@ -2,8 +2,9 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Jython Plug-in
+ Bundle-SymbolicName: org.python.pydev.jython; singleton:=true
+-Bundle-Version: 2.7.1.2012100913
+-Bundle-ClassPath: pydev-jython.jar
++Bundle-Version: 2.7.1.2012100914
++Bundle-ClassPath: pydev-jython.jar,
++ lib/jython.jar
+ Bundle-Activator: org.python.pydev.jython.JythonPlugin
+ Bundle-Vendor: Aptana
+ Bundle-Localization: plugin
+diff --git a/plugins/org.python.pydev.jython/build.properties b/plugins/org.python.pydev.jython/build.properties
+index 168f7a2..92a8b9b 100644
+--- a/plugins/org.python.pydev.jython/build.properties
++++ b/plugins/org.python.pydev.jython/build.properties
+@@ -1,5 +1,6 @@
+ bin.includes = META-INF/,\
+ pydev-jython.jar,\
++ lib/jython.jar,\
+ jysrc/,\
+ plugin.xml,\
+ Lib/,\
+@@ -9,7 +10,6 @@ bin.includes = META-INF/,\
+ icons/,\
+ LICENSE_PYHON.txt
+ jars.compile.order = pydev-jython.jar
+-source.pydev-jython.jar = src/,\
+- src_jython/
++source.pydev-jython.jar = src/
+ output.pydev-jython.jar = bin/
+-jars.extra.classpath = jython.jar
++jars.extra.classpath = lib/jython.jar
More information about the scm-commits
mailing list