rpms/eclipse/devel eclipse-add-ppc64-sparc64-s390-s390x-2.patch, 1.1, 1.2 eclipse.spec, 1.497, 1.498

Andrew Overholt (overholt) fedora-extras-commits at redhat.com
Thu Nov 1 14:02:38 UTC 2007


Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1815

Modified Files:
	eclipse-add-ppc64-sparc64-s390-s390x-2.patch eclipse.spec 
Log Message:
Update swt file-level requirement for 3.3.1.1 and BR: libXt-devel everywhere (IcedTea will add it to its Requirements soon).

eclipse-add-ppc64-sparc64-s390-s390x-2.patch:

Index: eclipse-add-ppc64-sparc64-s390-s390x-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-add-ppc64-sparc64-s390-s390x-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-add-ppc64-sparc64-s390-s390x-2.patch	22 Oct 2007 14:33:37 -0000	1.1
+++ eclipse-add-ppc64-sparc64-s390-s390x-2.patch	1 Nov 2007 14:02:35 -0000	1.2
@@ -1,17 +1,17 @@
-diff -ur features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
---- features/org.eclipse.platform.source/feature.xml	2007-09-28 11:50:28.000000000 -0400
-+++ features/org.eclipse.platform.source/feature.xml	2007-09-28 11:47:21.000000000 -0400
+diff -uNr features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
+--- features/org.eclipse.platform.source/feature.xml	2007-10-31 11:14:44.000000000 -0400
++++ features/org.eclipse.platform.source/feature.xml	2007-10-31 11:16:06.000000000 -0400
 @@ -42,4 +42,7 @@
- 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.solaris.motif.sparc" version="3.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390" version="3.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
- 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.3.1.R33x_r20070911-_19UEkpF-B7Uh2hKy75y"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc64" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="alpha" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.alpha" version="3.3.0.v20070612-_19UEkLEzwsdF9jSqQ-G"/>
+ 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.solaris.motif.sparc" version="3.3.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
+ 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.s390" version="3.3.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
+ 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.3.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc" version="3.3.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.sparc64" version="3.3.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="alpha" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.alpha" version="3.3.2.R33x_v20071022-_19UEksF-G8Yc6bUv3Dz"/>
  </feature>
-diff -ur features/org.eclipse.rcp/feature.xml features/org.eclipse.rcp/feature.xml
---- features/org.eclipse.rcp/feature.xml	2007-09-28 11:50:28.000000000 -0400
-+++ features/org.eclipse.rcp/feature.xml	2007-09-28 11:47:47.000000000 -0400
+diff -uNr features/org.eclipse.rcp/feature.xml features/org.eclipse.rcp/feature.xml
+--- features/org.eclipse.rcp/feature.xml	2007-10-31 11:18:13.000000000 -0400
++++ features/org.eclipse.rcp/feature.xml	2007-10-31 11:14:44.000000000 -0400
 @@ -499,4 +499,48 @@
           version="0.0.0"
           fragment="true"/>
@@ -61,15 +61,15 @@
 +          unpack="false"/>
 +
  </feature>
-diff -ur features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
---- features/org.eclipse.rcp.source/feature.xml	2007-09-28 11:50:28.000000000 -0400
-+++ features/org.eclipse.rcp.source/feature.xml	2007-09-28 11:48:25.000000000 -0400
+diff -uNr features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
+--- features/org.eclipse.rcp.source/feature.xml	2007-10-31 11:14:44.000000000 -0400
++++ features/org.eclipse.rcp.source/feature.xml	2007-10-31 11:17:45.000000000 -0400
 @@ -30,4 +30,8 @@
- 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
- 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
- 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.motif.x86" version="3.3.1.R33x_r20070802-8y8eE8sEV3Fz0z0GlHJrXvTAUS"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="ppc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.ppc64" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc64" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
-+	<plugin ws="gtk"  os="linux" fragment="true" arch="alpha" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.alpha" version="3.3.0.v20070607-8y8eE8NEbsN3X_fjWS8HPNG"/>
+ 	<plugin ws="motif"  os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.3.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
+ 	<plugin ws="gtk"  os="linux" fragment="true" arch="s390" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.s390" version="3.3.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
+ 	<plugin ws="motif"  os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.motif.x86" version="3.3.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="ppc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.ppc64" version="3.3.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc" version="3.3.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="sparc64" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.sparc64" version="3.3.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
++	<plugin ws="gtk"  os="linux" fragment="true" arch="alpha" download-size="0" install-size="0" id="org.eclipse.rcp.source.linux.gtk.alpha" version="3.3.2.R33x_r20071022-8y8eE9CEV3FspP8HJrY1M2dS"/>
  </feature>


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -r1.497 -r1.498
--- eclipse.spec	1 Nov 2007 14:01:07 -0000	1.497
+++ eclipse.spec	1 Nov 2007 14:02:35 -0000	1.498
@@ -31,7 +31,7 @@
 # cd branding
 # zip -r org.fedoraproject.ide.platform-3.3.1.2.zip \
 #   org.fedoraproject.ide.platform
-Source4:        org.fedoraproject.ide.platform-%{version}.2.zip
+Source4:        org.fedoraproject.ide.platform-3.3.1.2.zip
 # cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
 #   -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature
 # cd branding
@@ -108,6 +108,7 @@
 BuildRequires:  gcc-java >= 4.1.2
 BuildRequires:  java-1.5.0-gcj-javadoc
 BuildRequires:  java-gcj-compat-devel >= 1.0.64
+BuildRequires:  libXt-devel
 %else
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc >= 1.6.0
@@ -180,7 +181,7 @@
 Group:          Development/Languages
 Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 # This file-level requirement is for the bi-arch multilib case
-Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.1.v3346i.jar
+Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.2.v3347.jar
 Requires(post):     %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires(postun):   %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires:           icu4j-eclipse >= 3.6.1-1jpp.4
@@ -214,7 +215,7 @@
 %endif
 Requires:   %{name}-rcp = %{epoch}:%{version}-%{release}
 # This file-level requirement is for the bi-arch multilib case
-Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.1.v3346i.jar
+Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.2.v3347.jar
 Requires(post):    %{name}-rcp = %{epoch}:%{version}-%{release}
 Requires(postun):  %{name}-rcp = %{epoch}:%{version}-%{release}
 # Need to investigate why we don't build ant-apache-bsf or ant-commons-net in




More information about the fedora-extras-commits mailing list