rpms/eclipse/devel eclipse-s390ands390x.patch, 1.7, 1.8 eclipse.spec, 1.227, 1.228
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jan 5 02:26:46 UTC 2006
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27959
Modified Files:
eclipse-s390ands390x.patch eclipse.spec
Log Message:
Fix the s390 patch (again).
eclipse-s390ands390x.patch:
assemble.org.eclipse.sdk.all.xml | 6
assemble.org.eclipse.sdk.linux.gtk.s390.xml | 619 ++++++++++
assemble.org.eclipse.sdk.linux.gtk.s390x.xml | 619 ++++++++++
build | 4
build.xml | 2
features/org.eclipse.jdt.source/build.xml | 4
features/org.eclipse.jdt/build.xml | 12
features/org.eclipse.pde.source/build.xml | 4
features/org.eclipse.pde/build.xml | 4
features/org.eclipse.platform.launchers/build.xml | 4
features/org.eclipse.platform.launchers/feature.xml | 2
features/org.eclipse.platform.launchers/library/gtk/build.sh | 8
features/org.eclipse.platform.launchers/target.build.properties | 4
features/org.eclipse.platform.source/build.xml | 16
features/org.eclipse.platform.source/feature.xml | 2
features/org.eclipse.platform/build.properties | 2
features/org.eclipse.platform/build.xml | 20
features/org.eclipse.sdk/build.xml | 12
plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties | 3
plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml | 9
plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties | 3
plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml | 9
plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases | 1
plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java | 16
plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties | 3
plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml | 9
plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties | 3
plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml | 9
plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.platform.source.linux.gtk.s390/about.html | 27
plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties | 3
plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml | 109 +
plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml | 9
plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html | 27
plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties | 3
plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml | 109 +
plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml | 9
42 files changed, 1740 insertions(+), 7 deletions(-)
Index: eclipse-s390ands390x.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-s390ands390x.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-s390ands390x.patch 5 Jan 2006 02:17:23 -0000 1.7
+++ eclipse-s390ands390x.patch 5 Jan 2006 02:26:42 -0000 1.8
@@ -1282,31 +1282,6 @@
diff -uNr build.xml build.xml
--- build.xml 2006-01-03 17:40:22.000000000 -0500
+++ build.xml 2006-01-03 17:14:52.000000000 -0500
-@@ -130,19 +130,19 @@
- pde.convertSchemaToHTML and help.buildHelpIndex tasks which are used when generating extension-point and help indeces.-->
- <antcall target="install.eclipse.${archive.format}" />
-
-- <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.isv">
-+ <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.isv" output="platform.doc.isv.txt">
- <arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner gather.bin.parts -Ddestination.temp.folder=${buildDirectory}/tmp/eclipse/plugins/" />
- </java>
-- <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.user">
-+ <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.user" output="platform.doc.user.txt">
- <arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner gather.bin.parts -Ddestination.temp.folder=${buildDirectory}/tmp/eclipse/plugins/" />
- </java>
-- <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv">
-+ <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv" output="jdt.doc.isv.txt">
- <arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner gather.bin.parts -Ddestination.temp.folder=${buildDirectory}/tmp/eclipse/plugins/" />
- </java>
-- <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.user">
-+ <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.user" output="jdt.doc.user.txt">
- <arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner gather.bin.parts -Ddestination.temp.folder=${buildDirectory}/tmp/eclipse/plugins/" />
- </java>
-- <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.pde.doc.user">
-+ <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.pde.doc.user" output="pde.doc.user.txt">
- <arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner gather.bin.parts -Ddestination.temp.folder=${buildDirectory}/tmp/eclipse/plugins/" />
- </java>
-
@@ -272,6 +272,8 @@
<condition property="libsconfig">
<or>
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- eclipse.spec 4 Jan 2006 22:32:40 -0000 1.227
+++ eclipse.spec 5 Jan 2006 02:26:42 -0000 1.228
@@ -334,7 +334,7 @@
%patch4 -p0
%patch5 -p0
%if %{gcj_support}
-%patch13 -p1
+%patch13 -p0
%endif
%if %{gcj_support}
#%patch16 -p0
@@ -344,10 +344,10 @@
popd
pushd plugins/org.eclipse.jdt.core
%patch19 -p0
-#%patch20 -p0
+%patch20 -p0
popd
pushd plugins/org.eclipse.jdt.ui
-#%patch21 -p0
+%patch21 -p0
popd
pushd plugins/org.eclipse.update.core
%patch22 -p0
More information about the fedora-cvs-commits
mailing list