rpms/eclipse/devel sources, 1.93, 1.94 eclipse.spec, 1.710, 1.711 .cvsignore, 1.69, 1.70 eclipse-mv-Platform.sh, 1.5, 1.6
Alexander Kurtakov
akurtakov at fedoraproject.org
Thu Jul 8 21:23:52 UTC 2010
Author: akurtakov
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1706/devel
Modified Files:
sources eclipse.spec .cvsignore eclipse-mv-Platform.sh
Log Message:
Helios is coming to Fedora!
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- sources 19 Mar 2010 07:07:58 -0000 1.93
+++ sources 8 Jul 2010 21:23:50 -0000 1.94
@@ -1,2 +1,2 @@
-24db7007d7ad739da5ed709cc97879ca eclipse-3.5.2-src.tar.bz2
-4222efa5f5817b369db90843b0ca7563 eclipse-build-0.5.0.tar.bz2
+f10973d6ca26bfe56234148667c40345 eclipse-3.6.0-src.tar.bz2
+7dce1d1a04cc23bb1b7475d309d63fac eclipse-build-0.6.1RC0.tar.bz2
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.710
retrieving revision 1.711
diff -u -p -r1.710 -r1.711
--- eclipse.spec 8 Jul 2010 20:02:35 -0000 1.710
+++ eclipse.spec 8 Jul 2010 21:23:50 -0000 1.711
@@ -4,18 +4,18 @@
Epoch: 1
%global eclipse_major 3
-%global eclipse_minor 5
+%global eclipse_minor 6
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%global eclipse_micro 2
+%global eclipse_micro 0
%global initialize 1
%global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/
%global bootstrap 0
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
%ifarch %{ix86}
-%define eclipse_arch x86
+%global eclipse_arch x86
%else
-%define eclipse_arch %{_arch}
+%global eclipse_arch %{_arch}
%endif
# FIXME: update java packaging guidelines for this. See
@@ -27,12 +27,12 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 10%{?dist}
+Release: 1%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: %{download_url}eclipse-build-0.5.0.tar.bz2
-Source1: %{download_url}eclipse-3.5.2-src.tar.bz2
+Source0: %{download_url}eclipse-build-0.6.1RC0.tar.bz2
+Source1: %{download_url}eclipse-3.6.0-src.tar.bz2
Source2: eclipse.sh.in
Source17: efj.sh.in
# This file contains the types of files we'd like to extract from the jars
@@ -186,7 +186,7 @@ Eclipse Plugin Development Environment.
developing Eclipse plugins.
%prep
-%setup -q -n eclipse-build-0.5.0
+%setup -q -n eclipse-build-0.6.1RC0
cp %{SOURCE1} .
ant -DbuildArch=%{eclipse_arch} applyPatches
pushd build/eclipse-%{version}-src
@@ -206,9 +206,6 @@ sed -i -e "s|http://java.sun.com/j2se/1.
plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
plugins/org.eclipse.pde.doc.user/pdeOptions.txt
-# Remove signatures for JARs
-find -iname \*.sf | xargs rm
-find -iname \*.rsa | xargs rm
# FIXME: do this as part of Linux distros project
#
@@ -219,8 +216,8 @@ SWT_MIN_VER=$(grep min_ver plugins/org.e
SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
-sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
- plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
+#sed --in-place "s|$swt_frag_ver_s390x|$swt_frag_ver|g" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml \
+# plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
%if ! %{bootstrap}
# make sure there are no jars left
@@ -237,14 +234,14 @@ fi
%endif
# target platform template patch
-%patch0 -p0
+#%patch0 -p0
# make o.e.swt.gtk.linux.ppc64 version to match ppc
#%patch1
popd
%build
export JAVA_HOME=%{java_home}
-./build.sh
+ant
%install
rm -rf $RPM_BUILD_ROOT
@@ -552,9 +549,7 @@ for p in $(ls -d dropins/sdk/plugins/*);
done
popd
-sed --in-place "s|$RPM_BUILD_ROOT%{_libdir}/eclipse-Platform/p2/|%{_libdir}/eclipse/p2/|" \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
-sed --in-place "s|file\\\:%{_libdir}/eclipse/p2/|@config.dir/../p2/|" \
+sed --in-place "s|file\\\:$RPM_BUILD_ROOT%{_libdir}/eclipse-Platform/p2|@config.dir/../p2/|" \
$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
# Install the PDE Build wrapper script.
@@ -570,11 +565,11 @@ sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVER
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
pushd dropins/jdt
-build-jar-repository -s -p plugins/org.junit_* junit
+build-jar-repository -s -p plugins/org.junit_3* junit
-JUNIT4VERSION=$(ls plugins | grep org.junit4_ | sed 's/org.junit4_//')
-rm plugins/org.junit4_$JUNIT4VERSION/junit.jar
-ln -s %{_javadir}/junit4.jar plugins/org.junit4_$JUNIT4VERSION/junit.jar
+JUNIT4VERSION=$(ls plugins | grep org.junit_4 | sed 's/org.junit_//')
+rm plugins/org.junit_$JUNIT4VERSION/junit.jar
+ln -s %{_javadir}/junit4.jar plugins/org.junit_$JUNIT4VERSION/junit.jar
popd
# link to the icu4j stuff
@@ -830,6 +825,7 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.compare_*
%{_libdir}/%{name}/plugins/org.eclipse.compare.core_*
%{_libdir}/%{name}/plugins/org.eclipse.core.boot_*
+%{_libdir}/%{name}/plugins/org.eclipse.core.externaltools_*
%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_*
%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem_*
%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_*
@@ -839,12 +835,12 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.update.core.linux_*
%endif
%{_libdir}/%{name}/plugins/org.eclipse.core.resources_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*
%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*
%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
%{_libdir}/%{name}/plugins/org.eclipse.core.variables_*
%{_libdir}/%{name}/plugins/org.eclipse.debug.core_*
%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.event_*
%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.jetty_*
%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.registry_*
%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.servlet_*
@@ -894,7 +890,6 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_*
%{_libdir}/%{name}/plugins/org.eclipse.cvs_*
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*
-%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh_*
%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_*
%{_libdir}/%{name}/features/org.eclipse.cvs_*
%{_libdir}/%{name}/features/org.eclipse.help_*
@@ -910,10 +905,11 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata_*
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata.repository_*
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.artifact.repository_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.exemplarysetup_*
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.natives_*
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.console_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ql_*
+%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.operations_*
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui_*
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk_*
%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_*
@@ -961,6 +957,10 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Fri Jul 9 2010 Alexander Kurtakov <akurtako at redhat.com> 1:3.6.0-1
+- Update to 3.6.0.
+- Based on eclipse-build 0.6.1 RC0.
+
* Thu Jul 08 2010 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.2-10
- Rebuild for new jetty.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- .cvsignore 19 Mar 2010 07:07:58 -0000 1.69
+++ .cvsignore 8 Jul 2010 21:23:51 -0000 1.70
@@ -12,3 +12,5 @@ eclipse-build-R0_4_0.tar.gz
eclipse-3.5.2-src.tar.bz2
eclipse-build-0_5_0RC0.tar.gz
eclipse-build-0.5.0.tar.bz2
+eclipse-3.6.0-src.tar.bz2
+eclipse-build-0.6.1RC0.tar.bz2
Index: eclipse-mv-Platform.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-mv-Platform.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eclipse-mv-Platform.sh 3 Aug 2009 15:29:56 -0000 1.5
+++ eclipse-mv-Platform.sh 8 Jul 2010 21:23:51 -0000 1.6
@@ -14,7 +14,6 @@ mv $baseDir/features/org.eclipse.help_*
mv $baseDir/features/org.eclipse.cvs_* features
mv $baseDir/plugins/org.eclipse.cvs_* plugins
mv $baseDir/plugins/org.eclipse.team.cvs.core_* plugins
-mv $baseDir/plugins/org.eclipse.team.cvs.ssh_* plugins
mv $baseDir/plugins/org.eclipse.team.cvs.ssh2_* plugins
mv $baseDir/plugins/org.eclipse.team.cvs.ui_* plugins
mv $baseDir/features/org.eclipse.equinox.p2.user.ui_* features
@@ -27,7 +26,6 @@ mv $baseDir/plugins/org.eclipse.core.fil
mv $baseDir/plugins/org.eclipse.core.filesystem_* plugins
mv $baseDir/plugins/org.eclipse.core.net_* plugins
mv $baseDir/plugins/org.eclipse.core.resources_* plugins
-mv $baseDir/plugins/org.eclipse.core.resources.compatibility_* plugins
mv $baseDir/plugins/org.eclipse.osgi.util_* plugins
mv $baseDir/plugins/org.eclipse.debug.core_* plugins
mv $baseDir/plugins/org.eclipse.debug.ui_* plugins
@@ -87,8 +85,10 @@ mv $baseDir/plugins/org.eclipse.update.c
mv $baseDir/plugins/org.eclipse.equinox.simpleconfigurator_* plugins
mv $baseDir/plugins/org.eclipse.rcp_* plugins
mv $baseDir/plugins/org.eclipse.core.contenttype_* plugins
+mv $baseDir/plugins/org.eclipse.core.externaltools_* plugins
mv $baseDir/plugins/org.eclipse.equinox.app_* plugins
mv $baseDir/plugins/org.eclipse.equinox.common_* plugins
+mv $baseDir/plugins/org.eclipse.equinox.event_* plugins
mv $baseDir/plugins/org.eclipse.equinox.ds_* plugins
mv $baseDir/plugins/org.eclipse.equinox.initializer_* plugins
mv $baseDir/plugins/org.eclipse.equinox.preferences_* plugins
@@ -131,13 +131,13 @@ mv $baseDir/plugins/org.eclipse.equinox.
mv $baseDir/plugins/org.eclipse.equinox.p2.director.app_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.directorywatcher_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.engine_* plugins
-mv $baseDir/plugins/org.eclipse.equinox.p2.exemplarysetup_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.extensionlocation_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.garbagecollector_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.jarprocessor_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.metadata_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.metadata.generator_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.metadata.repository_* plugins
+mv $baseDir/plugins/org.eclipse.equinox.p2.operations_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.publisher_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.repository_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.repository.tools_* plugins
@@ -145,6 +145,7 @@ mv $baseDir/plugins/org.eclipse.equinox.
mv $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.touchpoint.natives_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.ui_* plugins
+mv $baseDir/plugins/org.eclipse.equinox.p2.ql_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.ui.sdk_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_* plugins
mv $baseDir/plugins/org.eclipse.equinox.p2.updatechecker_* plugins
More information about the scm-commits
mailing list