[eclipse-pydev/f17] Install/link to missing required python libraries.
swagiaal
swagiaal at fedoraproject.org
Fri Feb 8 14:51:33 UTC 2013
commit e5c7a6d63a86ae685442ac14914d63309bf72b33
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date: Thu Feb 7 17:05:17 2013 -0500
Install/link to missing required python libraries.
Conflicts:
eclipse-pydev.spec
eclipse-pydev.spec | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index a364968..1592b8b 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -13,7 +13,7 @@ Epoch: 1
Summary: Eclipse Python development plug-in
Name: eclipse-pydev
Version: 2.7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: EPL
URL: http://pydev.org
Group: Development/Tools
@@ -43,6 +43,7 @@ Requires: jpathwatch
Requires: Django
Requires: ws-commons-util
Requires: ipython
+Requires: python-libs
BuildRequires: eclipse-pde
BuildRequires: eclipse-mylyn-commons >= 3.5.0
BuildRequires: eclipse-mylyn-context >= 3.5.0
@@ -89,7 +90,6 @@ 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
# Remove inlined jython sources.
rm -rf plugins/org.python.pydev.jython/src_jython
@@ -193,6 +193,10 @@ 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
+# Symlink and copy required python libs before deleting Lib dir.
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/jython/Lib
+cp org.python.pydev.jython_%{version}.%{jython_qualifier}/Lib/textwrap.py ${RPM_BUILD_ROOT}%{_datadir}/jython/Lib
+
rm -rf org.python.pydev.jython_%{version}.%{jython_qualifier}/Lib
ln -sf %{_datadir}/jython/Lib \
org.python.pydev.jython_%{version}.%{jython_qualifier}/Lib
@@ -207,23 +211,33 @@ if [ ${sixFourFourfiles:-0} -ne 0 ]; then
chmod 0755 ${sixFourFourfiles}
fi
+%post
+ln -sf %{_libdir}/python2.7/optparse.py %{_datadir}/jython/Lib/optparse.py
+
+%postun
+rm -f %{_datadir}/jython/Lib/optparse.py
+
%files
%{install_loc}/pydev
+%{_datadir}/jython/Lib/*
%files mylyn
%{install_loc}/pydev-mylyn
%changelog
+* Thu Feb 7 2013 Sami Wagiaalla <swagiaal at redhat.com> 1:2.7.1-5
+- Install/link to missing required python libraries.
+
* 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
+* Fri 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.
-* Fri Nov 6 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:2.7.1-1
+* Tue Nov 6 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:2.7.1-1
- Update to 2.7.1 release.
* Fri Oct 5 2012 Jeff Johnston <jjohnstn at redhat.com> 1:2.7.0-1
More information about the scm-commits
mailing list