rpms/eclipse-pydev/devel use-piccolo2d-bundle.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 eclipse-pydev.spec, 1.31, 1.32 fetch-pydev-mylyn.sh, 1.1, NONE
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Oct 13 19:02:43 UTC 2009
Author: akurtakov
Update of /cvs/pkgs/rpms/eclipse-pydev/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5164/devel
Modified Files:
.cvsignore sources eclipse-pydev.spec
Added Files:
use-piccolo2d-bundle.patch
Removed Files:
fetch-pydev-mylyn.sh
Log Message:
Update to upstream 1.5.0.
use-piccolo2d-bundle.patch:
MANIFEST.MF | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE use-piccolo2d-bundle.patch ---
--- plugins/com.python.pydev/META-INF/MANIFEST.MF.sav 2009-10-12 21:23:15.114882563 +0300
+++ plugins/com.python.pydev/META-INF/MANIFEST.MF 2009-10-12 21:24:31.891881990 +0300
@@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.console,
org.python.pydev.jython,
org.eclipse.search,
- org.eclipse.ui.ide
+ org.eclipse.ui.ide,
+ org.piccolo2d.swt
Eclipse-LazyStart: true
Bundle-ClassPath: pydev.jar,
retroweaver-rt.jar,
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore 17 Jul 2009 14:02:31 -0000 1.20
+++ .cvsignore 13 Oct 2009 19:02:42 -0000 1.21
@@ -2,3 +2,4 @@ org.python.pydev.mylyn.feature-fetched-s
org.python.pydev.feature-1.4.5.2727-sources.zip
org.python.pydev.feature-1.4.6.2788-sources.zip
org.python.pydev.feature-1.4.7.2843-sources.zip
+org.python.pydev.feature-1.5.0.1251989166-sources.zip
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources 17 Jul 2009 14:02:31 -0000 1.20
+++ sources 13 Oct 2009 19:02:42 -0000 1.21
@@ -1 +1 @@
-43b70bf1ddd1db0d1e64e53b32fb3130 org.python.pydev.feature-1.4.7.2843-sources.zip
+3a72ab31ae84d1788925c5d3f1142446 org.python.pydev.feature-1.5.0.1251989166-sources.zip
Index: eclipse-pydev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-pydev/devel/eclipse-pydev.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- eclipse-pydev.spec 24 Jul 2009 20:56:37 -0000 1.31
+++ eclipse-pydev.spec 13 Oct 2009 19:02:42 -0000 1.32
@@ -1,6 +1,6 @@
# psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
%global debug_package %{nil}
-%global qualifier 2843
+%global qualifier 1251989166
Epoch: 1
@@ -8,25 +8,24 @@ Epoch: 1
%define install_loc %{_libdir}/eclipse/dropins
%define major 1
-%define minor 4
-%define maint 7
+%define minor 5
+%define maint 0
Summary: Eclipse Python development plug-in
Name: eclipse-pydev
Version: %{major}.%{minor}.%{maint}
-Release: 3%{?dist}
+Release: 1%{?dist}
License: EPL
-URL: http://pydev.sourceforge.net
+URL: http://pydev.org
Group: Development/Tools
Source0: http://downloads.sourceforge.net/pydev/org.python.pydev.feature-%{version}.%{qualifier}-sources.zip
-Source1: fetch-pydev-mylyn.sh
-
+Patch0: use-piccolo2d-bundle.patch
BuildRequires: java-devel >= 1.5.0
Requires: eclipse-jdt
Requires: python
-# Psyco is available only on x86
+# Psyco is available only on x86
%ifarch %{ix86}
Requires: python-psyco
%endif
@@ -68,83 +67,73 @@ Group: Development/Tools
Mylyn Task-Focused UI extensions for Pydev.
%prep
-%setup -q -c
-
+%setup -q -c
+%patch0
#fix mylyn plugin version
sed --in-place 's:version="0.3.0":version="%{version}.%{qualifier}":' features/org.python.pydev.mylyn.feature/feature.xml
# remove pre-generated build files
-find . -name build.xml | xargs rm
+find . -name build.xml | xargs rm
-# remove pre-built jars
-rm -f plugins/org.python.pydev.core/core.jar
-rm -f plugins/org.python.pydev.ast/ast.jar
-rm -f plugins/org.python.pydev.debug/pydev-debug.jar
-rm -f plugins/org.python.pydev.parser/parser.jar
-rm -f plugins/org.python.pydev/pydev.jar
-rm -f plugins/org.python.pydev.jython/pydev-jython.jar
-rm -f plugins/org.python.pydev.refactoring/refactoring.jar
+#remove piccolo2d sources, we use the system one
+rm -fr plugins/com.python.pydev/src/edu
-# remove included retroweaver jars as it isn't being used
-find . -name retroweaver-rt.jar | xargs rm
+# remove pre-built jars
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
# link to system jars
-rm -f plugins/org.python.pydev.core/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 %{_javadir}/junit.jar \
plugins/org.python.pydev.core/junit.jar
-rm -f plugins/org.python.pydev.jython/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
#ln -sf %{_datadir}/java/jflex.jar \
# plugins/org.python.pydev.refactoring/tests/lib/JFlex.jar
-rm -f plugins/org.python.pydev.refactoring/tests/lib/xpp3_min-1.1.3.4.O.jar
# enable when tests are used
#ln -sf %{_datadir}/java/xpp3-minimal.jar \
# plugins/org.python.pydev.refactoring/tests/lib/xpp3_min-1.1.3.4.O.jar
-rm -f plugins/org.python.pydev.refactoring/tests/lib/xstream-1.2.1.jar
# enable when tests are used
#ln -sf %{_datadir}/java/xstream.jar \
# plugins/org.python.pydev.refactoring/tests/lib/xstream-1.2.1.jar
-rm -f plugins/org.python.pydev.refactoring/contrib/ch/hsr/ukistler/astgraph/jgraph.jar
+
+mkdir orbitDeps
+pushd orbitDeps
+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
+popd
%build
%{eclipse_base}/buildscripts/pdebuild \
- -f org.python.pydev.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5"
+ -f org.python.pydev.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" -o `pwd`/orbitDeps
%{eclipse_base}/buildscripts/pdebuild \
-d mylyn \
- -f org.python.pydev.mylyn.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5"
+ -f org.python.pydev.mylyn.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5" -o `pwd`/orbitDeps
%install
rm -rf $RPM_BUILD_ROOT
@@ -160,6 +149,9 @@ unzip -q -d ${installDir}-mylyn build/rp
# deal with linked deps
pushd $installDir/eclipse/plugins
+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 \
org.python.pydev.core_%{version}.%{qualifier}/commons-codec.jar
@@ -171,11 +163,11 @@ ln -sf %{_javadir}/junit.jar \
rm -rf org.python.pydev.debug_%{version}.%{qualifier}/commons-logging-1.1.jar
ln -sf %{_javadir}/jakarta-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
ln -sf %{_javadir}/ws-commons-util.jar \
org.python.pydev.debug_%{version}.%{qualifier}/ws-commons-util-1.0.2.jar
-
+
rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-client-3.1.jar
ln -sf %{_javadir}/xmlrpc3-client.jar \
org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-client-3.1.jar
@@ -183,7 +175,7 @@ ln -sf %{_javadir}/xmlrpc3-client.jar \
rm -f org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-common-3.1.jar
ln -sf %{_javadir}/xmlrpc3-common.jar \
org.python.pydev.debug_%{version}.%{qualifier}/xmlrpc-common-3.1.jar
-
+
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
@@ -202,7 +194,7 @@ chmod 0755 `find ${RPM_BUILD_ROOT} -name
# sed -i 's/\r//' `find ${RPM_BUILD_ROOT} -name '*\.py' | xargs`
-%clean
+%clean
rm -rf ${RPM_BUILD_ROOT}
%files
@@ -214,6 +206,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{install_loc}/pydev-mylyn
%changelog
+* Tue Oct 13 2009 Alexander Kurtakov <akurtako at redhat.com> 1:1.5.0-1
+- Update to upstream 1.5.0.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -351,7 +346,7 @@ rm -rf ${RPM_BUILD_ROOT}
- Update to version 1.2.5.
- Include Jython functionality again.
- Fix spacing issues.
-- Remove backport to Java 1.4.
+- Remove backport to Java 1.4.
- Change build method to package-build.
- Include script to create the tarball.
--- fetch-pydev-mylyn.sh DELETED ---
More information about the scm-commits
mailing list