rpms/eclipse/devel sources, 1.82, 1.83 eclipse.spec, 1.671, 1.672 .cvsignore, 1.63, 1.64 fetch-ecf.sh, 1.3, NONE
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Oct 2 20:01:52 UTC 2009
- Previous message (by thread): rpms/mdadm/F-12 mdadm-3.0-mdmon-dev-.mdadm.patch, NONE, 1.1 mdadm-3.0-rh526761.patch, NONE, 1.1 mdadm-3.0-calloc.patch, 1.1, NONE
- Next message (by thread): rpms/kernel/F-12 linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch, NONE, 1.1 kernel.spec, 1.1843, 1.1844
- 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-serv9880/devel
Modified Files:
sources eclipse.spec .cvsignore
Removed Files:
fetch-ecf.sh
Log Message:
Update to Eclipse sdk 3.5.1.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- sources 29 Sep 2009 12:18:16 -0000 1.82
+++ sources 2 Oct 2009 20:01:51 -0000 1.83
@@ -1,3 +1,2 @@
-72a590190a4fea7a4f8885bfe26a3e18 eclipse-I20090611-1540-fetched-src.tar.bz2
-d9b5bdc848ded1c2f1f62da94b9c70a0 ecf-filetransfer-v20090604-1131.tar.bz2
-0c08b2d3cbdec806afeddf10ab7d7bb0 eclipse-build-0_4_RC0.tar.gz
+3ed7a1c9c13a73f6d7abc0b0305631e3 eclipse-R3_5_1-fetched-src.tar.bz2
+a756f9afb426b6deeab225c537e1645c eclipse-build-0.4.0RC0.tar.gz
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.671
retrieving revision 1.672
diff -u -p -r1.671 -r1.672
--- eclipse.spec 29 Sep 2009 13:34:23 -0000 1.671
+++ eclipse.spec 2 Oct 2009 20:01:51 -0000 1.672
@@ -9,8 +9,8 @@ Epoch: 1
%define eclipse_major 3
%define eclipse_minor 5
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%define eclipse_micro 0
-%define swtver 3.5.0.v3550
+%define eclipse_micro 1
+%define swtver 3.5.1.v3555a
%define initialize 1
%global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/
@@ -30,12 +30,12 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 4%{?dist}
+Release: 1%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: %{download_url}eclipse-build-0_4_RC0.tar.gz
-Source1: %{download_url}eclipse-I20090611-1540-fetched-src.tar.bz2
+Source0: %{download_url}eclipse-build-0.4.0RC0.tar.gz
+Source1: %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
Source16: %{name}-copy-platform.sh
Source17: efj.sh.in
# This file contains the types of files we'd like to extract from the jars
@@ -43,13 +43,6 @@ Source17: efj.sh.in
Source19: %{name}-filenamepatterns.txt
# Script to wrap PDE Build calls for bundle builds
Source21: %{name}-pdebuild.sh
-Source24: fetch-ecf.sh
-# This was fetched using the above script.
-# We will eventually have an eclipse-ecf package but since the ECF
-# filetransfer bits that are part of the SDK actually require the SDK >=
-# 3.4 to build, I'm going to build them here and have them be owned by
-# the SDK packages for now. -- overholt, 2008-07-07
-Source25: ecf-filetransfer-v20090604-1131.tar.bz2
# Create a simple feature for building ECF's filetransfer plugins
Source26: ecf-filetransfer-feature.xml
Source27: ecf-filetransfer-build.properties
@@ -219,11 +212,11 @@ Eclipse Plugin Development Environment.
developing Eclipse plugins.
%prep
-%setup -q -n eclipse-build-0_4_RC0
+%setup -q -n eclipse-build-0.4.0RC0
cp %{SOURCE1} .
sed --in-place "s/<target name=\"build\" depends=\"applyPatches,bootstrap,compilelibs\">/<target name=\"build\" depends=\"bootstrap,compilelibs\">/" build.xml
-ant -DbuildId=I20090611-1540 applyPatches
-pushd build/eclipse-I20090611-1540-fetched-src
+ant applyPatches
+pushd build/eclipse-R3_5_1-fetched-src
# liblocalfile fixes
sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
@@ -514,8 +507,9 @@ if [ ! -z "$JARS" ]; then
fi
# ECF filetransfer plugins
-tar jxf %{SOURCE25}
-pushd org.eclipse.ecf
+pushd ecf-src
+mkdir -p plugins
+mv org.eclipse* plugins
mkdir -p features/org.eclipse.ecf.filetransfer-feature
pushd features/org.eclipse.ecf.filetransfer-feature
cp -p %{SOURCE26} feature.xml
@@ -533,10 +527,10 @@ ORIGCLASSPATH=$CLASSPATH
export JAVA_HOME=%{java_home}
./build.sh
-SDK=$(cd build/eclipse-I20090611-1540-fetched-src/installation && pwd)
+SDK=$(cd build/eclipse-R3_5_1-fetched-src/installation && pwd)
LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
PDEPLUGINVERSION=$(ls $SDK/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-pushd build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.equinox.initializer
+pushd build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.equinox.initializer
java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
org.eclipse.core.launcher.Main \
-application org.eclipse.ant.core.antRunner \
@@ -545,7 +539,7 @@ cp org.eclipse.equinox.initializer*.jar
popd
# Build the ECF filetransfer plugins
-pushd build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf
+pushd build/eclipse-R3_5_1-fetched-src/ecf-src
mkdir -p build
homedir=$(mkdir home| cd home|pwd)
java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
@@ -556,7 +550,7 @@ java -cp $SDK/plugins/org.eclipse.equino
-Did=org.eclipse.ecf.filetransfer_feature \
-DsourceDirectory=$(pwd) \
-DbaseLocation=$SDK \
- -DforceContextQualifier=v20090604-1131 \
+ -DforceContextQualifier=v20090831-1906 \
-Dbuilder=$SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/templates/package-build \
-debug -consolelog \
-f $SDK/plugins/org.eclipse.pde.build_$PDEPLUGINVERSION/scripts/build.xml
@@ -566,8 +560,8 @@ popd
%install
rm -rf $RPM_BUILD_ROOT
# Get swt version
-SWT_MAJ_VER=$(grep maj_ver build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
-SWT_MIN_VER=$(grep min_ver build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MAJ_VER=$(grep maj_ver build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MIN_VER=$(grep min_ver build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
# Some directories we need
@@ -589,12 +583,12 @@ install -d -m 755 $RPM_BUILD_ROOT%{_data
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
# Explode the resulting SDK tarball
-cp -R build/eclipse-I20090611-1540-fetched-src/installation/* $RPM_BUILD_ROOT%{_libdir}/eclipse
+cp -R build/eclipse-R3_5_1-fetched-src/installation/* $RPM_BUILD_ROOT%{_libdir}/eclipse
rm -fr $RPM_BUILD_ROOT%{_libdir}/eclipse/p2
# ECF filetransfer plugins we built
rm $sdkDir/plugins/org.eclipse.ecf*.jar
unzip -d $RPM_BUILD_ROOT%{_libdir} \
- build/eclipse-I20090611-1540-fetched-src/org.eclipse.ecf/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
+ build/eclipse-R3_5_1-fetched-src/ecf-src/build/rpmBuild/org.eclipse.ecf.filetransfer_feature.zip
# Remove the feature we used for building
rm -rf \
$sdkDir/features/org.eclipse.ecf.filetransfer_feature_*
@@ -628,7 +622,8 @@ org.eclipse.equinox.p2.metadata.generato
-publishArtifacts \
-append \
-artifactRepositoryName "Eclipse Platform" \
--metadataRepositoryName "Eclipse Platform"
+-metadataRepositoryName "Eclipse Platform" \
+-debug -consolelog
# JDT
jdtDir=$sdkDir-JDT
@@ -806,7 +801,7 @@ done
popd
%endif
-cp -p build/eclipse-I20090611-1540-fetched-src/installation/eclipse.ini \
+cp -p build/eclipse-R3_5_1-fetched-src/installation/eclipse.ini \
$sdkDir/eclipse.ini
# We have /usr/share/eclipse/dropins in eclipse.ini
sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini
@@ -836,7 +831,7 @@ echo "path:%{_datadir}" > \
chmod 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{name}
# Install the SWT jar symlinks in libdir
-SWTJARVERSION=$(grep v$SWT_VERSION build/eclipse-I20090611-1540-fetched-src/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
+SWTJARVERSION=$(grep v$SWT_VERSION build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
ln -s plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_$SWTJARVERSION.jar swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar
ln -s swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar swt-gtk-%{eclipse_majmin}.jar
@@ -1295,6 +1290,9 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Fri Oct 2 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-1
+- Update to 3.5.1.
+
* Tue Sep 29 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.0-4
- Symlink to unversioned jetty jars.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore 29 Sep 2009 12:18:16 -0000 1.63
+++ .cvsignore 2 Oct 2009 20:01:51 -0000 1.64
@@ -4,3 +4,5 @@ eclipse-I20090611-1540-fetched-src.tar.b
eclipse-build-R0_3_0.tar.gz
ecf-filetransfer-v20090604-1131.tar.bz2
eclipse-build-0_4_RC0.tar.gz
+eclipse-R3_5_1-fetched-src.tar.bz2
+eclipse-build-0.4.0RC0.tar.gz
--- fetch-ecf.sh DELETED ---
- Previous message (by thread): rpms/mdadm/F-12 mdadm-3.0-mdmon-dev-.mdadm.patch, NONE, 1.1 mdadm-3.0-rh526761.patch, NONE, 1.1 mdadm-3.0-calloc.patch, 1.1, NONE
- Next message (by thread): rpms/kernel/F-12 linux-2.6-iwlwifi-reduce-noise-when-skb-allocation-fails.patch, NONE, 1.1 kernel.spec, 1.1843, 1.1844
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list