Rediff patch30.

This commit is contained in:
Alexander Kurtakov 2009-04-14 19:28:34 +00:00
parent 774997dd9f
commit 8bb07bcb02
2 changed files with 17 additions and 16 deletions

View File

@ -1,22 +1,21 @@
diff -up ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml
--- ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments 2008-10-03 08:59:56.000000000 -0400
+++ ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml 2008-10-03 09:02:46.000000000 -0400
@@ -184,6 +184,7 @@
<customGather dir="plugins/org.eclipse.update.ui" projectName="org.eclipse.update.ui_3.2.101.R34x_v20081128" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
--- ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments 2009-04-14 21:14:09.000000000 +0200
+++ ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml 2009-04-14 21:22:53.000000000 +0200
@@ -205,6 +205,7 @@
<customGather dir="plugins/org.eclipse.update.scheduler" projectName="org.eclipse.update.scheduler_3.2.200.v20081127" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.update.ui" projectName="org.eclipse.update.ui_3.2.200.v20090213" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.ui.workbench.compatibility" projectName="org.eclipse.ui.workbench.compatibility_3.2.0.I20080509-2000" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.update.core.linux" projectName="org.eclipse.update.core.linux_3.2.1.R34x_v20081024" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
+ <customGather dir="plugins/org.eclipse.core.filesystem.linux.s390x" projectName="org.eclipse.core.filesystem.linux.s390x_1.2.0.v20080604-1400" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.ui.views.properties.tabbed" projectName="org.eclipse.ui.views.properties.tabbed_3.4.2.M20090127-1700" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.core.commands.source" projectName="org.eclipse.core.commands.source_3.4.0.I20080509-2000" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.core.databinding.source" projectName="org.eclipse.core.databinding.source_1.1.1.M20080827-0800b" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
@@ -795,6 +796,10 @@
+ <customGather dir="plugins/org.eclipse.core.filesystem.linux.s390x" projectName="org.eclipse.core.filesystem.linux.s390x_1.2.0.v20090316" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.core.variables" projectName="org.eclipse.core.variables_3.2.200.v20090302-1500" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.ui.forms" projectName="org.eclipse.ui.forms_3.4.0.v20090316" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
<customGather dir="plugins/org.eclipse.ui.views.properties.tabbed" projectName="org.eclipse.ui.views.properties.tabbed_3.5.0.I20090120-0800" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" />
@@ -838,6 +839,10 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName" value="org.eclipse.core.filesystem.linux.s390x_1.2.0.v20080604-1400"/>
+ <param name="elementName" value="org.eclipse.core.filesystem.linux.s390x_1.2.0.v20090316"/>
+ </antcall>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
<param name="elementName" value="org.eclipse.ui.views.properties.tabbed_3.4.2.M20090127-1700"/>
<param name="elementName" value="org.eclipse.ui.views.properties.tabbed_3.5.0.I20090120-0800"/>
</antcall>
<antcall target="jarUp">

View File

@ -29,7 +29,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 0.2.2%{?dist}
Release: 0.2.3%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -414,8 +414,7 @@ mv plugins/org.eclipse.swt.gtk.linux.ia64.source_{3.5.0.HEAD,%{swtver}}
# Nasty hack to get suppport for ppc64, sparc{,64} and alpha
%patch24 -p1
%patch28
# TODO and this one
#%patch30
%patch30
%patch31 -p1
%patch38
@ -1607,6 +1606,9 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
* Tue Apr 14 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.0-0.2.3
- Rediff patch30.
* Tue Apr 14 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.0-0.2.2
- Fix version of source bundles.