rpms/eclipse-pydev/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 eclipse-pydev.spec, 1.19, 1.20
Alexander Kurtakov
akurtakov at fedoraproject.org
Mon Jan 5 08:28:06 UTC 2009
Author: akurtakov
Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17447/devel
Modified Files:
.cvsignore sources eclipse-pydev.spec
Log Message:
- Update to 1.4.0 - adds support for Python 2.6/3.0.
- Use system jakarta-commons-logging and xmlrpc3.
- Drop arch checks for mylyn - it is noarch now.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 27 Oct 2008 20:47:50 -0000 1.12
+++ .cvsignore 5 Jan 2009 08:27:35 -0000 1.13
@@ -3,3 +3,4 @@
org.python.pydev.feature-src-1_3_22.zip
org.python.pydev.feature-src-1_3_23.zip
org.python.pydev.feature-src-1_3_24.zip
+org.python.pydev.feature-src-1_4_0.zip
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 27 Oct 2008 20:47:50 -0000 1.12
+++ sources 5 Jan 2009 08:27:35 -0000 1.13
@@ -1,2 +1,2 @@
3a42402df10a42af0a8d648711c36239 org.python.pydev.mylyn.feature-fetched-src-pydev_1_3_7.tar.bz2
-d1569c0e4264bbdfa34fe9339560baa5 org.python.pydev.feature-src-1_3_24.zip
+bbc66c7501ef55179c331121239fa289 org.python.pydev.feature-src-1_4_0.zip
Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- eclipse-pydev.spec 15 Dec 2008 10:06:52 -0000 1.19
+++ eclipse-pydev.spec 5 Jan 2009 08:27:35 -0000 1.20
@@ -1,15 +1,15 @@
Epoch: 1
%define eclipse_base %{_libdir}/eclipse
-%define install_loc %{_datadir}/eclipse/dropins
+%define install_loc %{_libdir}/eclipse/dropins
%define major 1
-%define minor 3
-%define maint 24
+%define minor 4
+%define maint 0
Summary: Eclipse Python development plug-in
Name: eclipse-pydev
Version: %{major}.%{minor}.%{maint}
-Release: 4%{?dist}
+Release: 1%{?dist}
License: EPL
URL: http://pydev.sourceforge.net
Group: Development/Tools
@@ -26,21 +26,26 @@
%ifarch %{ix86}
Requires: python-psyco
%endif
-Requires: commons-codec >= 1.3
+Requires: jakarta-commons-codec >= 1.3
+Requires: jakarta-commons-logging
+Requires: xmlrpc3-common
+Requires: xmlrpc3-client
+Requires: xmlrpc3-server
Requires: junit >= 3.8.1
Requires: jython >= 2.2
BuildRequires: eclipse-pde
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64
BuildRequires: eclipse-mylyn
-%endif
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: junit >= 3.8.1
-BuildRequires: commons-codec >= 1.3
+BuildRequires: jakarta-commons-codec >= 1.3
+BuildRequires: jakarta-commons-logging
+BuildRequires: ws-commons-util
+BuildRequires: xmlrpc3-common
+BuildRequires: xmlrpc3-client
+BuildRequires: xmlrpc3-server
BuildRequires: jython >= 2.2
-# This package can not be noarch due to mylyn and psyco issues on different platforms.
+# This package can not be noarch because psyco is a x86 package.
#BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,7 +53,6 @@
The eclipse-pydev package contains Eclipse plugins for
Python development.
-%ifnarch ppc64
%package mylyn
Summary: Pydev Mylyn Focused UI
Requires: eclipse-mylyn
@@ -57,7 +61,6 @@
%description mylyn
Mylyn Task-Focused UI extensions for Pydev.
-%endif
%prep
%setup -q -c
@@ -81,16 +84,36 @@
# link to system jars
rm -f plugins/org.python.pydev.core/commons-codec.jar
-ln -sf %{_datadir}/java/jakarta-commons-codec.jar \
+ln -sf %{_javadir}/jakarta-commons-codec.jar \
plugins/org.python.pydev.core/commons-codec.jar
rm -f plugins/org.python.pydev.core/lib/junit.jar
-ln -sf %{_datadir}/java/junit.jar \
+ln -sf %{_javadir}/junit.jar \
plugins/org.python.pydev.core/junit.jar
rm -f plugins/org.python.pydev.jython/jython.jar
-ln -sf %{_datadir}/java/jython.jar \
+ln -sf %{_javadir}/jython.jar \
plugins/org.python.pydev.jython/jython.jar
+
+rm -f plugins/org.python.pydev.debug/commons-logging-1.1.jar
+ln -sf %{_javadir}/jakarta-commons-logging.jar \
+ plugins/org.python.pydev.debug/commons-logging-1.1.jar
+
+rm -f plugins/org.python.pydev.debug/ws-commons-util-1.0.2.jar
+ln -sf %{_javadir}/ws-commons-util.jar \
+ plugins/org.python.pydev.debug/ws-commons-util-1.0.2.jar
+
+rm -f plugins/org.python.pydev.debug/xmlrpc-client-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-client.jar \
+ plugins/org.python.pydev.debug/xmlrpc-client-3.1.jar
+
+rm -f plugins/org.python.pydev.debug/xmlrpc-common-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-common.jar \
+ plugins/org.python.pydev.debug/xmlrpc-common-3.1.jar
+
+rm -f plugins/org.python.pydev.debug/xmlrpc-server-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-server.jar \
+ plugins/org.python.pydev.debug/xmlrpc-server-3.1.jar
rm -f plugins/org.python.pydev.refactoring/tests/lib/JFlex.jar
# enable when tests are used
@@ -114,14 +137,10 @@
-a "-DjavacSource=1.5 -DjavacTarget=1.5" \
-f org.python.pydev.feature
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64
%{eclipse_base}/buildscripts/pdebuild \
-a "-DjavacSource=1.5 -DjavacTarget=1.5" \
-d mylyn \
-f org.python.pydev.mylyn.feature
-%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -132,30 +151,46 @@
# pydev main feature
unzip -q -d $installDir build/rpmBuild/org.python.pydev.feature.zip
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64
# pydev mylyn feature
unzip -q -d ${installDir}-mylyn build/rpmBuild/org.python.pydev.mylyn.feature.zip
-%endif
# deal with linked deps
pushd $installDir/eclipse/plugins
rm -rf org.python.pydev.core_%{version}/commons-codec.jar
-ln -sf %{_datadir}/java/jakarta-commons-codec.jar \
+ln -sf %{_javadir}/jakarta-commons-codec.jar \
org.python.pydev.core_%{version}/commons-codec.jar
mkdir org.python.pydev.core_%{version}/lib
-ln -sf %{_datadir}/java/junit.jar \
+ln -sf %{_javadir}/junit.jar \
org.python.pydev.core_%{version}/lib/junit.jar
+rm -rf org.python.pydev.debug_%{version}/commons-logging-1.1.jar
+ln -sf %{_javadir}/jakarta-commons-logging.jar \
+ org.python.pydev.debug_%{version}/commons-logging-1.1.jar
+
+rm -rf org.python.pydev.debug_%{version}/ws-commons-util-1.0.2.jar
+ln -sf %{_javadir}/ws-commons-util.jar \
+ org.python.pydev.debug_%{version}/ws-commons-util-1.0.2.jar
+
+rm -f org.python.pydev.debug_%{version}/xmlrpc-client-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-client.jar \
+ org.python.pydev.debug_%{version}/xmlrpc-client-3.1.jar
+
+rm -f org.python.pydev.debug_%{version}/xmlrpc-common-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-common.jar \
+ org.python.pydev.debug_%{version}/xmlrpc-common-3.1.jar
+
+rm -f org.python.pydev.debug_%{version}/xmlrpc-server-3.1.jar
+ln -sf %{_javadir}/xmlrpc3-server.jar \
+ org.python.pydev.debug_%{version}/xmlrpc-server-3.1.jar
+
rm -rf org.python.pydev.jython_%{version}/jython.jar
-ln -sf %{_datadir}/java/jython.jar \
+ln -sf %{_javadir}/jython.jar \
org.python.pydev.jython_%{version}/jython.jar
popd
# rename cgi.py's shebang from /usr/local/bin/python to /usr/bin/env python
-sed -i 's/\/usr\/local\/bin\/python/\/usr\/bin\/env python/' ${RPM_BUILD_ROOT}%{_datadir}/eclipse/dropins/pydev/eclipse/plugins/org.python.pydev.jython_%{version}/Lib/cgi.py
+sed -i 's/\/usr\/local\/bin\/python/\/usr\/bin\/env python/' ${RPM_BUILD_ROOT}%{install_loc}/pydev/eclipse/plugins/org.python.pydev.jython_%{version}/Lib/cgi.py
# convert .py$ files from mode 0644 to mode 0755
chmod 0755 `find ${RPM_BUILD_ROOT} -name '*\.py' -perm 0644 | xargs`
@@ -169,15 +204,16 @@
%files
%defattr(-,root,root,-)
%{install_loc}/pydev
-# no xmlrpc3 -> no mylyn on ppc64 due to:
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
-%ifnarch ppc64
%files mylyn
%{install_loc}/pydev-mylyn
-%endif
%changelog
+* Thu Dec 25 2008 Alexander Kurtakov <akurtako at redhat.com> 1:1.4.0-1
+- Update to 1.4.0 - adds support for Python 2.6/3.0.
+- Use system jakarta-commons-logging and xmlrpc3.
+- Drop arch checks for mylyn - it is noarch now.
+
* Mon Dec 15 2008 Alexander Kurtakov <akurtako at redhat.com> 1:1.3.24-4
- This package is not noarch due to python-psyco and mylyn issues on different platforms.
More information about the fedora-extras-commits
mailing list