[eclipse-pydev/f17] Update to 2.5.0 release.
swagiaal
swagiaal at fedoraproject.org
Thu Apr 26 20:10:58 UTC 2012
commit ff3f4f0133858e6a919a334f6ef346624ecf8cd1
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date: Thu Apr 26 15:59:14 2012 -0400
Update to 2.5.0 release.
eclipse-pydev.spec | 28 ++++++++++++++---------
pydev-removeruntimeerror.patch | 11 ---------
remove-org.eclipse.mylyn-requirement.patch | 33 ++++++++++++++++++++++++++++
remove-red-core.patch | 10 ++++----
sources | 2 +-
5 files changed, 56 insertions(+), 28 deletions(-)
---
diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec
index 565a1c0..7972215 100644
--- a/eclipse-pydev.spec
+++ b/eclipse-pydev.spec
@@ -1,25 +1,24 @@
# psyco: Bug 483357 - Empty eclipse-pydev-debuginfo
-%global qualifier 2012020116
+%global qualifier 2012040618
%global _python_bytecompile_errors_terminate_build 0
Epoch: 1
-%global eclipse_base %{_libdir}/eclipse
%global install_loc %{_datadir}/eclipse/dropins
Summary: Eclipse Python development plug-in
Name: eclipse-pydev
-Version: 2.4.0
+Version: 2.5.0
Release: 1%{?dist}
License: EPL
URL: http://pydev.org
Group: Development/Tools
-#Source0: http://downloads.sourceforge.net/project/pydev/pydev/PyDev%202.4.0/PyDev%202.4.0-sources.zip
-Source0: PyDev-2.4.0-sources.zip
-Patch0: pydev-removeruntimeerror.patch
+#Source0: http://downloads.sourceforge.net/project/pydev/pydev/PyDev%202.5.0/PyDev%202.5.0-sources.zip
+Source0: PyDev-2.5.0-sources.zip
Patch1: remove-red-core.patch
Patch2: remove-winregistry.patch
+Patch3: remove-org.eclipse.mylyn-requirement.patch
BuildRequires: java-devel >= 1.5.0
BuildArch: noarch
@@ -40,6 +39,7 @@ Requires: ipython
BuildRequires: eclipse-pde
BuildRequires: eclipse-mylyn-commons >= 3.5.0
BuildRequires: eclipse-mylyn-context >= 3.5.0
+BuildRequires: eclipse-mylyn-context-team >= 3.5.0
BuildRequires: eclipse-mylyn-ide >= 3.5.0
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: junit >= 3.8.1
@@ -67,9 +67,9 @@ Mylyn Task-Focused UI extensions for Pydev.
%prep
%setup -q -c
-%patch0
%patch1 -b .sav
%patch2 -b .sav
+%patch3 -b .sav
#fix mylyn plugin version
sed --in-place 's:version="0.3.0":version="%{version}.%{qualifier}":' features/org.python.pydev.mylyn.feature/feature.xml
@@ -126,12 +126,12 @@ ln -sf %{_javadir}/xmlrpc3-server.jar \
%build
-%{eclipse_base}/buildscripts/pdebuild \
- -d "mylyn mylyn-commons mylyn-ide mylyn-context" \
+eclipse-pdebuild \
+ -d "mylyn mylyn-commons mylyn-ide mylyn-context mylyn-context-team" \
-f org.python.pydev.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5"
-%{eclipse_base}/buildscripts/pdebuild \
- -d "mylyn mylyn-commons mylyn-ide mylyn-context" \
+eclipse-pdebuild \
+ -d "mylyn mylyn-commons mylyn-ide mylyn-context mylyn-context-team" \
-f org.python.pydev.mylyn.feature -a "-DjavacSource=1.5 -DjavacTarget=1.5"
%install
@@ -198,6 +198,12 @@ fi
%{install_loc}/pydev-mylyn
%changelog
+* Thu Apr 26 2012 Sami Wagiaalla <swagiaal at redhat.com> 1:2.5.0-1
+- Update to 2.5.0 release.
+- Use eclipse-pdebuild.
+- Remove definition of eclipse_base.
+- Remove pydev-removeruntimeerror.patch (already applied upstream).
+
* Wed Feb 1 2012 Alexander Kurtakov <akurtako at redhat.com> 1:2.4.0-1
- Update to upstream 2.4.0 release.
diff --git a/remove-org.eclipse.mylyn-requirement.patch b/remove-org.eclipse.mylyn-requirement.patch
new file mode 100644
index 0000000..4ea8e5d
--- /dev/null
+++ b/remove-org.eclipse.mylyn-requirement.patch
@@ -0,0 +1,33 @@
+From ce25e02b3ce08c9af86bbd425472e9bfdebbe47e Mon Sep 17 00:00:00 2001
+From: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Thu, 26 Apr 2012 13:52:36 -0400
+Subject: [PATCH] remove-org.eclipse.mylyn-requirement
+
+
+diff --git features/org.python.pydev.mylyn.feature/feature.xml features/org.python.pydev.mylyn.feature/feature.xml
+index 5563ee1..a3f6074 100644
+--- features/org.python.pydev.mylyn.feature/feature.xml
++++ features/org.python.pydev.mylyn.feature/feature.xml
+@@ -25,7 +25,6 @@
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.ui.navigator"/>
+ <import plugin="org.eclipse.ui.views"/>
+- <import plugin="org.eclipse.mylyn" version="2.0.0.v20070627-1400" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.mylyn.context.core"/>
+ <import plugin="org.eclipse.mylyn.context.ui"/>
+ <import plugin="org.eclipse.mylyn.ide.ui"/>
+diff --git plugins/org.python.pydev.mylyn/META-INF/MANIFEST.MF plugins/org.python.pydev.mylyn/META-INF/MANIFEST.MF
+index dce4356..629c228 100644
+--- plugins/org.python.pydev.mylyn/META-INF/MANIFEST.MF
++++ plugins/org.python.pydev.mylyn/META-INF/MANIFEST.MF
+@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.ui.navigator,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.views,
+- org.eclipse.mylyn,
+ org.eclipse.mylyn.context.core,
+ org.eclipse.mylyn.context.ui,
+ org.eclipse.mylyn.ide.ui,
+--
+1.7.10
+
diff --git a/remove-red-core.patch b/remove-red-core.patch
index bc880cb..c4d5e38 100644
--- a/remove-red-core.patch
+++ b/remove-red-core.patch
@@ -1,13 +1,13 @@
---- features/org.python.pydev.feature/feature.xml.orig 2011-06-24 20:03:24.000000000 +0300
-+++ features/org.python.pydev.feature/feature.xml 2011-06-30 14:05:52.648218201 +0300
-@@ -223,10 +223,5 @@ This Agreement is governed by the laws o
+--- features/org.python.pydev.feature/feature.xml
++++ features/org.python.pydev.feature/feature.xml
+@@ -223,10 +223,5 @@ This Agreement is governed by the laws of the State of New York and the intellec
download-size="160"
install-size="160"
- version="2.4.0.2012020116"/>
+ version="2.5.0.2012040618"/>
- <plugin
- id="org.python.pydev.red_core"
- download-size="160"
- install-size="160"
-- version="2.4.0.2012020116"/>
+- version="2.5.0.2012040618"/>
</feature>
diff --git a/sources b/sources
index 6ab8967..1f0e66f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3deebb03b648f436c37eb266a22a360f PyDev-2.4.0-sources.zip
+ff2da759c11a419d3385af2412e375fe PyDev-2.5.0-sources.zip
More information about the scm-commits
mailing list