rpms/eclipse/devel eclipse-pde.build-add-package-build.patch, 1.11, 1.12 eclipse-add-ppc64-sparc64-s390-s390x-2.patch, 1.7, 1.8 eclipse-addfragmentsforotherplatforms.patch, 1.8, 1.9 eclipse-platform_build.patch, 1.1, 1.2 sources, 1.72, 1.73 eclipse.spec, 1.637, 1.638 .cvsignore, 1.56, 1.57
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Apr 22 08:18:31 UTC 2009
- Previous message (by thread): rpms/kde-plasma-runcommand/F-10 .cvsignore, 1.5, 1.6 kde-plasma-runcommand.spec, 1.6, 1.7 sources, 1.6, 1.7
- Next message (by thread): rpms/photoprint/F-10 import.log, NONE, 1.1 photoprint-0.4.0-g++44.patch, NONE, 1.1 photoprint-0.4.0-paths.patch, NONE, 1.1 photoprint.spec, NONE, 1.1 .cvsignore, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: akurtakov
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13938/devel
Modified Files:
eclipse-pde.build-add-package-build.patch
eclipse-add-ppc64-sparc64-s390-s390x-2.patch
eclipse-addfragmentsforotherplatforms.patch
eclipse-platform_build.patch sources eclipse.spec .cvsignore
Log Message:
- Update to newer I-build.
- Update fedora customization.
- Bump dependencies minimal versions.
- Fix update site functionality.
- Simplify jdt %%files section.
eclipse-pde.build-add-package-build.patch:
Index: eclipse-pde.build-add-package-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pde.build-add-package-build.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eclipse-pde.build-add-package-build.patch 19 Dec 2008 17:47:47 -0000 1.11
+++ eclipse-pde.build-add-package-build.patch 22 Apr 2009 08:18:29 -0000 1.12
@@ -68,7 +68,7 @@
+ if [ "x$ERROR" != "xyes" ]; then
+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
+ echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
-+ ln -sf "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
++ ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
+ fi
+ fi
+ fi
@@ -102,7 +102,7 @@
+ if [ "x$ERROR" != "xyes" ]; then
+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
+ echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
-+ ln -sf "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
++ ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
+ fi
+ fi;
+
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-add-ppc64-sparc64-s390-s390x-2.patch 13 Apr 2009 13:56:20 -0000 1.7
+++ eclipse-add-ppc64-sparc64-s390-s390x-2.patch 22 Apr 2009 08:18:29 -0000 1.8
@@ -53,18 +53,18 @@
os="solaris"
ws="gtk"
diff -up ./features/org.eclipse.rcp.source/feature.xml.arches ./features/org.eclipse.rcp.source/feature.xml
---- ./features/org.eclipse.rcp.source/feature.xml.orig 2009-04-13 15:04:47.000000000 +0200
-+++ ./features/org.eclipse.rcp.source/feature.xml 2009-04-13 15:07:51.000000000 +0200
+--- ./features/org.eclipse.rcp.source/feature.xml.orig 2009-04-17 16:05:51.000000000 +0200
++++ ./features/org.eclipse.rcp.source/feature.xml 2009-04-17 16:07:57.000000000 +0200
@@ -49,7 +49,11 @@
- <plugin id="org.eclipse.swt.motif.hpux.ia64_32.source" version="3.5.0.v3539" os="hpux" arch="ia64_32" ws="motif" unpack="false"/>
- <plugin id="org.eclipse.swt.motif.linux.x86.source" version="3.5.0.v3539" os="linux" arch="x86" ws="motif" unpack="false"/>
+ <plugin id="org.eclipse.swt.motif.hpux.ia64_32.source" version="3.5.0.v3541a" os="hpux" arch="ia64_32" ws="motif" unpack="false"/>
+ <plugin id="org.eclipse.swt.motif.linux.x86.source" version="3.5.0.v3541a" os="linux" arch="x86" ws="motif" unpack="false"/>
<plugin id="org.eclipse.swt.gtk.linux.ia64.source" version="3.5.0.HEAD" os="linux" arch="ia64" ws="gtk" unpack="false"/>
-- <plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif" unpack="false"/>
+- <plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3541a" os="solaris" arch="sparc" ws="motif" unpack="false"/>
+ <plugin id="org.eclipse.swt.gtk.linux.ppc64.source" version="3.5.0.v3539" os="linux" arch="ppc64" ws="gtk" unpack="false"/>
+ <plugin id="org.eclipse.swt.gtk.linux.sparc.source" version="3.5.0.v3539" os="linux" arch="sparc" ws="gtk" unpack="false"/>
+ <plugin id="org.eclipse.swt.gtk.linux.sparc64.source" version="3.5.0.v3539" os="linux" arch="sparc64" ws="gtk" unpack="false"/>
+ <plugin id="org.eclipse.swt.gtk.linux.alpha.source" version="3.5.0.v3539" os="linux" arch="alpha" ws="gtk" unpack="false"/>
-+ <plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif" unpack="false"/>
- <plugin id="org.eclipse.swt.photon.qnx.x86.source" version="3.5.0.v3539" os="qnx" arch="x86" ws="photon" unpack="false"/>
++ <plugin id="org.eclipse.swt.motif.solaris.sparc.source" version="3.5.0.v3539" os="solaris" arch="sparc" ws="motif" unpack="false"/>
+ <plugin id="org.eclipse.swt.photon.qnx.x86.source" version="3.5.0.v3541a" os="qnx" arch="x86" ws="photon" unpack="false"/>
<plugin id="org.eclipse.rcp.source" version="3.4.0.v20080507" unpack="false"/>
<plugin id="org.eclipse.core.contenttype.source" version="3.4.0.v20090302" unpack="false"/>
eclipse-addfragmentsforotherplatforms.patch:
Index: eclipse-addfragmentsforotherplatforms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-addfragmentsforotherplatforms.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-addfragmentsforotherplatforms.patch 14 Apr 2009 19:28:34 -0000 1.8
+++ eclipse-addfragmentsforotherplatforms.patch 22 Apr 2009 08:18:29 -0000 1.9
@@ -1,12 +1,12 @@
---- ./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
+--- assemble.org.eclipse.sdk.linux.gtk.s390x.xml.orig 2009-04-17 16:10:31.000000000 +0200
++++ assemble.org.eclipse.sdk.linux.gtk.s390x.xml 2009-04-17 16:16:48.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.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.forms" projectName="org.eclipse.ui.forms_3.4.0.v20090413" 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>
eclipse-platform_build.patch:
Index: eclipse-platform_build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-platform_build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-platform_build.patch 2 Apr 2009 08:12:56 -0000 1.1
+++ eclipse-platform_build.patch 22 Apr 2009 08:18:29 -0000 1.2
@@ -1,6 +1,6 @@
---- features/org.eclipse.platform/build.xml.orig 2009-04-02 08:59:23.000000000 +0200
-+++ features/org.eclipse.platform/build.xml 2009-04-02 09:03:36.000000000 +0200
-@@ -176,6 +176,11 @@
+--- features/org.eclipse.platform/build.xml.orig 2009-04-17 16:21:20.000000000 +0200
++++ features/org.eclipse.platform/build.xml 2009-04-17 16:26:21.000000000 +0200
+@@ -166,6 +166,11 @@
<property name="ws" value="win32"/>
<property name="os" value="win32"/>
</ant>
@@ -9,6 +9,6 @@
+ <property name="ws" value="win32"/>
+ <property name="os" value="win32"/>
+ </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.intro" target="${target}">
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.cheatsheets" target="${target}">
<property name="arch" value="x86"/>
<property name="ws" value="win32"/>
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- sources 2 Apr 2009 08:12:56 -0000 1.72
+++ sources 22 Apr 2009 08:18:29 -0000 1.73
@@ -1,7 +1,6 @@
611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2
-43c2aa722a815c61706549d28786d134 eclipse-ecj-gcj.tar.bz2
e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2
28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip
3e031f11b0de3f15b00233deec2b19f3 eclipse-3.4.2-testframework.tar.bz2
-c36f10cac0ab63f5da28e07a6b1bae9f org.fedoraproject.ide.platform-3.4.2.zip
-2d40313df780077e45b0fca5646470be eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
+1c3bb4e384cbc5f4e2b7275238a010f7 eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+9a644442e9b40b0311bee190701e77f5 org.fedoraproject.ide.platform-3.5.0.zip
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -r1.637 -r1.638
--- eclipse.spec 14 Apr 2009 19:28:34 -0000 1.637
+++ eclipse.spec 22 Apr 2009 08:18:30 -0000 1.638
@@ -10,7 +10,7 @@
%define eclipse_minor 5
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%define eclipse_micro 0
-%define swtver 3.5.0.v3539
+%define swtver 3.5.0.v3541a
%define initialize 1
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -29,11 +29,11 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 0.2.3%{?dist}
+Release: 0.2.4%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/I20090401-1325/eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/I20090416-1053/eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
Source2: %{name}.desktop
#Source3: eclipse.in
# cvs -d :pserver:anonymous at sources.redhat.com:/cvs/eclipse export \
@@ -41,7 +41,7 @@
# cd branding
# zip -r org.fedoraproject.ide.platform-3.4.2.zip \
# org.fedoraproject.ide.platform
-Source4: org.fedoraproject.ide.platform-3.4.2.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
@@ -182,7 +182,7 @@
BuildRequires: cairo >= 1.0
BuildRequires: unzip
BuildRequires: icu4j-eclipse >= 4.0.1
-BuildRequires: tomcat5-jasper-eclipse >= 5.5.26-1.5
+BuildRequires: tomcat5-jasper-eclipse >= 5.5.27-6.3
BuildRequires: tomcat6-servlet-2.5-api
BuildRequires: desktop-file-utils
BuildRequires: java-devel >= 1.6.0
@@ -204,7 +204,7 @@
BuildRequires: regexp
BuildRequires: junit >= 3.8.1-3jpp
BuildRequires: junit4
-BuildRequires: sat4j >= 2.0.3
+BuildRequires: sat4j >= 2.1.0
BuildRequires: objectweb-asm
%description
@@ -254,14 +254,14 @@
Requires: jakarta-commons-el >= 1.0-9
Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
Requires: mx4j >= 2.1
-Requires: tomcat5-jasper-eclipse >= 5.5.26-1.5
+Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
Requires: tomcat6-servlet-2.5-api > 6.0.18-9.1
Requires: jetty >= 5.1.14-1.6
Requires: jsch >= 0.1.41
Requires: lucene >= 2.3.1-3.4
Requires: lucene-contrib >= 2.3.1-3.4
Requires: regexp
-Requires: sat4j >= 2.0.3
+Requires: sat4j >= 2.1.0
Provides: eclipse-cvs-client = 1:%{version}-%{release}
Obsoletes: eclipse-cvs-client < 1:3.3.2-20
@@ -1043,6 +1043,11 @@
rm -r $sdkDir/configuration/org.eclipse.update
%if %{initialize}
+#Find better way to fix this
+sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,true|" \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
# FIXME: investigate why it doesn't work to set this -- configuration data is
# always written to /usr/share/eclipse/configuration, even with
# -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1051,9 +1056,6 @@
#
# Extract .so files
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
-
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
pushd $RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins $RPM_BUILD_ROOT/dropins
mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
@@ -1576,27 +1578,6 @@
%defattr(-,root,root)
%{_bindir}/efj
%{_libdir}/%{name}/dropins/jdt
-#%{_libdir}/%{name}/dropins/jdt/content.xml
-%{_libdir}/%{name}/dropins/jdt/features
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.ant.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.pluggable.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.tool_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core.manipulation_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit.runtime_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit4.runtime_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.launching_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.junit_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.junit4_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.doc.user_*
%files pde
%defattr(-,root,root)
@@ -1606,6 +1587,13 @@
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Wed Apr 22 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.4
+- Update to newer I-build.
+- Update fedora customization.
+- Bump dependencies minimal versions.
+- Fix update site functionality.
+- Simplify jdt %%files section.
+
* Tue Apr 14 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-0.2.3
- Rediff patch30.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore 2 Apr 2009 08:12:57 -0000 1.56
+++ .cvsignore 22 Apr 2009 08:18:30 -0000 1.57
@@ -10,3 +10,5 @@
eclipse-3.4.2-testframework.tar.bz2
org.fedoraproject.ide.platform-3.4.2.zip
eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
+eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+org.fedoraproject.ide.platform-3.5.0.zip
- Previous message (by thread): rpms/kde-plasma-runcommand/F-10 .cvsignore, 1.5, 1.6 kde-plasma-runcommand.spec, 1.6, 1.7 sources, 1.6, 1.7
- Next message (by thread): rpms/photoprint/F-10 import.log, NONE, 1.1 photoprint-0.4.0-g++44.patch, NONE, 1.1 photoprint-0.4.0-paths.patch, NONE, 1.1 photoprint.spec, NONE, 1.1 .cvsignore, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list