rpms/eclipse/devel .cvsignore, 1.45, 1.46 eclipse-add-ppc64-sparc64-s390-s390x-2.patch, 1.2, 1.3 eclipse-addfragmentsforotherplatforms.patch, 1.1, 1.2 eclipse.spec, 1.517, 1.518 sources, 1.58, 1.59
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Thu Apr 3 15:48:54 UTC 2008
Author: overholt
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9985
Modified Files:
.cvsignore eclipse-add-ppc64-sparc64-s390-s390x-2.patch
eclipse-addfragmentsforotherplatforms.patch eclipse.spec
sources
Log Message:
* Thu Apr 03 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-1
- 3.3.2
- Update Obsoletes/Provides for ecj and make more ecj symlinks
(rhbz#439825).
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore 4 Dec 2007 16:14:34 -0000 1.45
+++ .cvsignore 3 Apr 2008 15:48:11 -0000 1.46
@@ -1,4 +1,4 @@
eclipse-fileinitializerapp.tar.bz2
org.fedoraproject.ide.feature-1.0.0.zip
-eclipse-sourceBuild-srcIncluded-3.3.1.1.zip
-org.fedoraproject.ide.platform-3.3.1.1-3.zip
+eclipse-sourceBuild-srcIncluded-3.3.2.zip
+org.fedoraproject.ide.platform-3.3.2.zip
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-add-ppc64-sparc64-s390-s390x-2.patch 1 Nov 2007 14:02:35 -0000 1.2
+++ eclipse-add-ppc64-sparc64-s390-s390x-2.patch 3 Apr 2008 15:48:11 -0000 1.3
@@ -1,17 +1,17 @@
-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
+diff -ur features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml
+--- features/org.eclipse.platform.source/feature.xml 2008-04-03 11:07:23.000000000 -0400
++++ features/org.eclipse.platform.source/feature.xml 2008-04-03 11:13:00.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.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"/>
+ <plugin id="org.eclipse.platform.source.solaris.motif.sparc" version="3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft" fragment="true" os="solaris" arch="sparc" ws="motif" download-size="0" install-size="0"/>
+ <plugin id="org.eclipse.platform.source.linux.gtk.s390" version="3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft" fragment="true" os="linux" arch="s390" ws="gtk" download-size="0" install-size="0"/>
+ <plugin id="org.eclipse.platform.source.linux.motif.x86" version="3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft" fragment="true" os="linux" arch="x86" ws="motif" download-size="0" install-size="0"/>
++ <plugin id="org.eclipse.platform.source.linux.gtk.sparc" version="3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft" fragment="true" os="linux" arch="sparc" ws="gtk" download-size="0" install-size="0"/>
++ <plugin id="org.eclipse.platform.source.linux.gtk.sparc64" version="3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft" fragment="true" os="linux" arch="sparc64" ws="gtk" download-size="0" install-size="0"/>
++ <plugin id="org.eclipse.platform.source.linux.gtk.alpha" version="3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft" fragment="true" os="linux" arch="alpha" ws="gtk" download-size="0" install-size="0"/>
</feature>
-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
+diff -ur features/org.eclipse.rcp/feature.xml features/org.eclipse.rcp/feature.xml
+--- features/org.eclipse.rcp/feature.xml 2008-04-03 11:16:49.000000000 -0400
++++ features/org.eclipse.rcp/feature.xml 2008-04-03 11:07:23.000000000 -0400
@@ -499,4 +499,48 @@
version="0.0.0"
fragment="true"/>
@@ -61,15 +61,15 @@
+ unpack="false"/>
+
</feature>
-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
+diff -ur features/org.eclipse.rcp.source/feature.xml features/org.eclipse.rcp.source/feature.xml
+--- features/org.eclipse.rcp.source/feature.xml 2008-04-03 11:07:23.000000000 -0400
++++ features/org.eclipse.rcp.source/feature.xml 2008-04-03 11:17:54.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.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"/>
+ <plugin id="org.eclipse.rcp.source.solaris.motif.sparc" version="3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" fragment="true" os="solaris" arch="sparc" ws="motif" download-size="0" install-size="0"/>
+ <plugin id="org.eclipse.rcp.source.linux.gtk.s390" version="3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" fragment="true" os="linux" arch="s390" ws="gtk" download-size="0" install-size="0"/>
+ <plugin id="org.eclipse.rcp.source.linux.motif.x86" version="3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" fragment="true" os="linux" arch="x86" ws="motif" download-size="0" install-size="0"/>
++ <plugin id="org.eclipse.rcp.source.linux.gtk.ppc64" version="3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" fragment="true" os="linux" arch="ppc64" ws="gtk" download-size="0" install-size="0"/>
++ <plugin id="org.eclipse.rcp.source.linux.gtk.sparc" version="3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" fragment="true" os="linux" arch="sparc" ws="gtk" download-size="0" install-size="0"/>
++ <plugin id="org.eclipse.rcp.source.linux.gtk.sparc64" version="3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" fragment="true" os="linux" arch="sparc64" ws="gtk" download-size="0" install-size="0"/>
++ <plugin id="org.eclipse.rcp.source.linux.gtk.alpha" version="3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" fragment="true" os="linux" arch="alpha" ws="gtk" download-size="0" install-size="0"/>
</feature>
eclipse-addfragmentsforotherplatforms.patch:
Index: eclipse-addfragmentsforotherplatforms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-addfragmentsforotherplatforms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-addfragmentsforotherplatforms.patch 22 Nov 2007 18:11:14 -0000 1.1
+++ eclipse-addfragmentsforotherplatforms.patch 3 Apr 2008 15:48:11 -0000 1.2
@@ -1,26 +1,19 @@
---- assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2007-11-21 13:50:10.000000000 -0500
-+++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2007-11-21 13:51:56.000000000 -0500
-@@ -122,6 +122,9 @@
+--- assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-04-03 11:20:05.000000000 -0400
++++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2008-04-03 11:24:25.000000000 -0400
+@@ -299,6 +299,12 @@
<ant antfile="build.xml" dir="plugins/org.eclipse.pde.core" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
+ <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.launcher.gtk.linux.ia64" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -281,6 +284,9 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.user" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
+ <ant antfile="build.xml" dir="plugins/org.eclipse.core.filesystem.linux.ia64" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.console" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.servlet" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -732,6 +738,10 @@
+@@ -812,6 +818,10 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
@@ -28,6 +21,6 @@
+ </antcall>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.ui.console_3.2.1.v20070824_r331"/>
+ <param name="elementName" value="org.eclipse.ui.ide_3.3.2.M20080207-0800"/>
</antcall>
<antcall target="jarUp">
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -r1.517 -r1.518
--- eclipse.spec 31 Mar 2008 18:45:06 -0000 1.517
+++ eclipse.spec 3 Apr 2008 15:48:11 -0000 1.518
@@ -6,7 +6,7 @@
%define eclipse_major 3
%define eclipse_minor 3
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro 1.1
+%define eclipse_micro 2
%define libname libswt3
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -19,19 +19,19 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 18%{?dist}
+Release: 1%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.3.1.1-200710231652/eclipse-sourceBuild-srcIncluded-3.3.1.1.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.3.2-200802211800/eclipse-sourceBuild-srcIncluded-3.3.2.zip
Source2: %{name}.desktop
Source3: eclipse.in
# cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
-# -r fedoraeclipse-3_3_1_1-3 branding/org.fedoraproject.ide.platform
+# -r fedoraeclipse-3_3_2 branding/org.fedoraproject.ide.platform
# cd branding
-# zip -r org.fedoraproject.ide.platform-3.3.1.1-3.zip \
+# zip -r org.fedoraproject.ide.platform-3.3.2.zip \
# org.fedoraproject.ide.platform
-Source4: org.fedoraproject.ide.platform-%{version}-3.zip
+Source4: org.fedoraproject.ide.platform-%{version}.zip
# cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
# -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature
# cd branding
@@ -78,8 +78,6 @@
Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch
Patch28: %{name}-add-ppc64-sparc64-s390-s390x-2.patch
Patch30: %{name}-addfragmentsforotherplatforms.patch
-#https://bugs.eclipse.org/bugs/show_bug.cgi?id=198840
-Patch25: %{name}-launcher-double-free-bug.patch
#FIXME: file a bug upstream
Patch26: %{name}-launcher-fix-java-home.patch
# On a 1.7 VM, generate 1.6-level bytecode
@@ -153,8 +151,8 @@
%package ecj
Summary: Eclipse Compiler for Java
Group: Development/Languages
-Obsoletes: ecj <= 2.1.3
-Provides: ecj <= 2.1.3
+Obsoletes: ecj < %{version}-%{release}
+Provides: ecj <= %{version}-%{release}
%if %{gcj_support}
Requires: libgcj >= 4.0.2
Requires(post): java-gcj-compat >= 1.0.64
@@ -364,7 +362,6 @@
rm plugins/org.eclipse.platform/launchersrc.zip
pushd features/org.eclipse.equinox.executable
%patch12 -p0
-%patch25 -p0
%patch26 -p0
# put the configuration directory in an arch-specific location
sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c
@@ -717,7 +714,6 @@
-Dnobootstrap=true \
-DinstallOs=linux -DinstallWs=gtk -DinstallArch=%{eclipse_arch} \
-Dlibsconfig=true -DjavacSource=1.5 -DjavacTarget=1.5 -DcompilerArg="-encoding ISO-8859-1 -nowarn"
-
# build 1.6 when building with IcedTea
SDK=$(cd eclipse && pwd)
@@ -941,8 +937,18 @@
# Install the eclipse-ecj.jar symlink for java-1.4.2-gcj-compat's "javac"
JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//")
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
-ln -s %{_javadir}/eclipse-ecj.jar $RPM_BUILD_ROOT%{_javadir}/jdtcore.jar
+ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_$JDTCORESUFFIX \
+ $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj-%{version}.jar
+ln -s %{_javadir}/eclipse-ecj-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/eclipse-ecj.jar
+ln -s %{_javadir}/eclipse-ecj-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/jdtcore-%{version}.jar
+ln -s %{_javadir}/jdtcore-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/jdtcore.jar
+ln -s %{_javadir}/eclipse-ecj-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/ecj-%{version}.jar
+ln -s %{_javadir}/ecj-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/ecj.jar
# FIXME: get rid of this by putting logic in package build to know what version
# of pde.build it's using
@@ -1284,8 +1290,9 @@
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/plugins
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_*
-%{_javadir}/eclipse-ecj.jar
-%{_javadir}/jdtcore.jar
+%{_javadir}/eclipse-ecj*.jar
+%{_javadir}/jdtcore*.jar
+%{_javadir}/ecj*.jar
%{_bindir}/ecj
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
@@ -1631,6 +1638,11 @@
%endif
%changelog
+* Thu Apr 03 2008 Andrew Overholt <overholt at redhat.com> 3.3.2-1
+- 3.3.2
+- Update Obsoletes/Provides for ecj and make more ecj symlinks
+ (rhbz#439825).
+
* Mon Mar 31 2008 Andrew Overholt <overholt at redhat.com> 3.3.1.1-18
- Add PDE Build wrapper script (%%{_datadir}/eclipse/pdebuild) for
packaging guidelines.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 4 Dec 2007 16:14:34 -0000 1.58
+++ sources 3 Apr 2008 15:48:11 -0000 1.59
@@ -1,4 +1,4 @@
e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2
28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip
-593b56fce7d1f1f799e87365cafefbef eclipse-sourceBuild-srcIncluded-3.3.1.1.zip
-fbb918b95640b17d7225eddbd75564f0 org.fedoraproject.ide.platform-3.3.1.1-3.zip
+4b7016cf9aedf07b8f34b39470947799 eclipse-sourceBuild-srcIncluded-3.3.2.zip
+08529425250f218c59acd622728b9b44 org.fedoraproject.ide.platform-3.3.2.zip
More information about the fedora-extras-commits
mailing list