rpms/eclipse/F-13 .cvsignore, 1.67, 1.68 eclipse.spec, 1.701, 1.702 sources, 1.91, 1.92 eclipse-addusrsharedropins.patch, 1.3, NONE eclipse-junit-dropins.patch, 1.1, NONE eclipse-swtbug291128.patch, 1.2, NONE
Andrew Overholt
overholt at fedoraproject.org
Mon Apr 12 14:35:58 UTC 2010
Author: overholt
Update of /cvs/pkgs/rpms/eclipse/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29653
Modified Files:
.cvsignore eclipse.spec sources
Removed Files:
eclipse-addusrsharedropins.patch eclipse-junit-dropins.patch
eclipse-swtbug291128.patch
Log Message:
* Mon Apr 12 2010 Andrew Overholt <overholt at redhat.com> 1:3.5.2-1
- Update to 3.5.2 (from rawhide; by akurtakov).
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-13/.cvsignore,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- .cvsignore 3 Dec 2009 19:53:34 -0000 1.67
+++ .cvsignore 12 Apr 2010 14:35:56 -0000 1.68
@@ -9,3 +9,6 @@ eclipse-build-0.4.0RC0.tar.gz
eclipse-build-0_4_RC3.tar.gz
eclipse-build-0_4_RC4.tar.gz
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
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-13/eclipse.spec,v
retrieving revision 1.701
retrieving revision 1.702
diff -u -p -r1.701 -r1.702
--- eclipse.spec 12 Apr 2010 13:28:26 -0000 1.701
+++ eclipse.spec 12 Apr 2010 14:35:58 -0000 1.702
@@ -6,7 +6,7 @@ Epoch: 1
%global eclipse_major 3
%global eclipse_minor 5
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%global eclipse_micro 1
+%global eclipse_micro 2
%global initialize 1
%global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/
%global bootstrap 0
@@ -27,12 +27,12 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 29%{?dist}
+Release: 1%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: %{download_url}eclipse-build-R0_4_0.tar.gz
-Source1: %{download_url}eclipse-R3_5_1-fetched-src.tar.bz2
+Source0: %{download_url}eclipse-build-0.5.0.tar.bz2
+Source1: %{download_url}eclipse-3.5.2-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
@@ -47,9 +47,6 @@ Source28: %{name}-mv-Platform.sh
Patch0: %{name}-target-platform-template.patch
# make o.e.swt.gtk.linux.ppc64 version to match ppc
Patch1: %{name}-swt-ppc64-version.patch
-Patch2: %{name}-junit-dropins.patch
-# Already upstream in eclipse-build
-Patch3: %{name}-swtbug291128.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant ant-nodeps
@@ -142,7 +139,7 @@ Requires: jetty >= 6.1.21-2
Requires: jsch >= 0.1.41
Requires: lucene >= 2.3.1-3.4
Requires: lucene-contrib >= 2.3.1-3.4
-Requires: sat4j >= 2.1.0-1
+Requires: sat4j >= 2.1.1-1
%endif
Provides: eclipse-cvs-client = 1:%{version}-%{release}
Obsoletes: eclipse-cvs-client < 1:3.3.2-20
@@ -189,11 +186,10 @@ Eclipse Plugin Development Environment.
developing Eclipse plugins.
%prep
-%setup -q -n eclipse-build-0_4_RC6
+%setup -q -n eclipse-build-0.5.0
cp %{SOURCE1} .
-%patch3
ant -DbuildArch=%{eclipse_arch} applyPatches
-pushd build/eclipse-R3_5_1-fetched-src
+pushd build/eclipse-%{version}-src
# Use our system-installed javadocs, reference only what we built, and
# don't like to osgi.org docs (FIXME: maybe we should package them?)
@@ -227,153 +223,6 @@ sed --in-place "s|$swt_frag_ver_s390x|$s
plugins/org.eclipse.swt.gtk.linux.s390x/META-INF/MANIFEST.MF
%if ! %{bootstrap}
-# Symlinks
-rm plugins/org.sat4j*
-ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
-ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
-
-ASMPLUGINVERSION=$(ls plugins | grep org.objectweb.asm_ | \
- sed 's/org.objectweb.asm_//')
-rm plugins/org.objectweb.asm_$ASMPLUGINVERSION
-ln -s %{_javadir}/objectweb-asm/asm-all.jar \
- plugins/org.objectweb.asm_$ASMPLUGINVERSION
-
-# BEGIN ANT ##
-ANTDIR=plugins/$(ls plugins | grep org.apache.ant_)
-rm $ANTDIR/lib/*
-ANTDIR=$ANTDIR/lib
-ln -s %{_javadir}/ant/ant-antlr.jar $ANTDIR/ant-antlr.jar
-ln -s %{_javadir}/ant/ant-apache-bcel.jar $ANTDIR/ant-apache-bcel.jar
-ln -s %{_javadir}/ant/ant-apache-bsf.jar $ANTDIR/ant-apache-bsf.jar
-ln -s %{_javadir}/ant/ant-apache-log4j.jar $ANTDIR/ant-apache-log4j.jar
-ln -s %{_javadir}/ant/ant-apache-oro.jar $ANTDIR/ant-apache-oro.jar
-ln -s %{_javadir}/ant/ant-apache-regexp.jar $ANTDIR/ant-apache-regexp.jar
-ln -s %{_javadir}/ant/ant-apache-resolver.jar $ANTDIR/ant-apache-resolver.jar
-ln -s %{_javadir}/ant/ant-commons-logging.jar $ANTDIR/ant-commons-logging.jar
-ln -s %{_javadir}/ant/ant-commons-net.jar $ANTDIR/ant-commons-net.jar
-#ln -s %{_javadir}/ant/ant-jai.jar $ANTDIR/ant-jai.jar
-ln -s %{_javadir}/ant.jar $ANTDIR/ant.jar
-ln -s %{_javadir}/ant/ant-javamail.jar $ANTDIR/ant-javamail.jar
-ln -s %{_javadir}/ant/ant-jdepend.jar $ANTDIR/ant-jdepend.jar
-#ln -s %{_javadir}/ant/ant-jmf.jar $ANTDIR/ant-jmf.jar
-ln -s %{_javadir}/ant/ant-jsch.jar $ANTDIR/ant-jsch.jar
-ln -s %{_javadir}/ant/ant-junit.jar $ANTDIR/ant-junit.jar
-ln -s %{_javadir}/ant-launcher.jar $ANTDIR/ant-launcher.jar
-#ln -s %{_javadir}/ant/ant-netrexx.jar $ANTDIR/ant-netrexx.jar
-ln -s %{_javadir}/ant/ant-nodeps.jar $ANTDIR/ant-nodeps.jar
-#ln -s %{_javadir}/ant/ant-starteam.jar $ANTDIR/ant-starteam.jar
-#ln -s %{_javadir}/ant/ant-stylebook.jar $ANTDIR/ant-stylebook.jar
-ln -s %{_javadir}/ant/ant-swing.jar $ANTDIR/ant-swing.jar
-ln -s %{_javadir}/ant/ant-trax.jar $ANTDIR/ant-trax.jar
-#ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar
-# END ANT ##
-
-JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
-rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-
-JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
-rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
-ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
-
-JUNITVERSION=$(ls plugins | grep org.junit_3 | sed 's/org.junit_//')
-build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
-
-rm plugins/org.junit4/junit.jar
-ln -s %{_javadir}/junit4.jar plugins/org.junit4/junit.jar
-
-# link to the jsch jar
-JSCHVERSION=$(ls plugins | grep com.jcraft.jsch_ | \
- sed 's/com.jcraft.jsch_//')
-rm plugins/com.jcraft.jsch_*.jar
-ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
-
-# link to the icu4j stuff
-ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
-rm plugins/com.ibm.icu_*.jar
-ln -s %{_libdir}/eclipse/plugins/com.ibm.icu_*.jar plugins/com.ibm.icu_$ICUVERSION
-
-# link to lucene
-LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
- sed 's/org.apache.lucene_//')
-rm plugins/org.apache.lucene_*
-ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_$LUCENEVERSION
-rm plugins/org.apache.lucene.analysis_*
-ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar \
- plugins/org.apache.lucene.analysis_$LUCENEVERSION
-
-# link to commons-logging
-COMMONSLOGGINGVERSION=$(ls plugins | grep commons.logging_ | \
- sed 's/org.apache.commons.logging_//')
-rm plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION
-ln -s %{_javadir}/commons-logging.jar \
- plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION
-
-# link to commons-el
-COMMONSELVERSION=$(ls plugins | grep commons.el_ | \
- sed 's/org.apache.commons.el_//')
-rm plugins/org.apache.commons.el_$COMMONSELVERSION
-ln -s %{_javadir}/commons-el.jar \
- plugins/org.apache.commons.el_$COMMONSELVERSION
-
-# link to commons-codec
-COMMONSCODECVERSION=$(ls plugins | grep commons.codec_ | \
- sed 's/org.apache.commons.codec_//')
-rm plugins/org.apache.commons.codec_$COMMONSCODECVERSION
-ln -s %{_javadir}/commons-codec.jar \
- plugins/org.apache.commons.codec_$COMMONSCODECVERSION
-
-# link to commons-httpclient
-COMMONSHTTPVERSION=$(ls plugins | grep commons.httpclient_ | \
- sed 's/org.apache.commons.httpclient_//')
-rm plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
-ln -s %{_javadir}/commons-httpclient.jar \
- plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
-
-# link to hamcrest-core
-HAMCRESTCOREVERSION=$(ls plugins | grep org.hamcrest.core_ | \
- sed 's/org.hamcrest.core_//')
-rm plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
-ln -s %{_javadir}/hamcrest/core.jar \
- plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
-
-# link to jasper
-JASPERVERSION=$(ls plugins | grep org.apache.jasper_ | \
- sed 's/org.apache.jasper_//')
-rm plugins/org.apache.jasper_*.jar
-ln -s %{_datadir}/eclipse/plugins/org.apache.jasper_* \
- plugins/org.apache.jasper_$JASPERVERSION
-
-# link to servlet-api
-SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_2.4 | \
- sed 's/javax.servlet_2.4//')
-rm plugins/javax.servlet_2.4*
-ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \
- plugins/javax.servlet_2.4$SERVLETAPIVERSION
-
-SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_2.5 | \
- sed 's/javax.servlet_2.5//')
-rm plugins/javax.servlet_2.5*
-ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \
- plugins/javax.servlet_2.5$SERVLETAPIVERSION
-
-#
-# link to jsp-api
-JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \
- sed 's/javax.servlet.jsp_//')
-rm plugins/javax.servlet.jsp_*
-ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar \
- plugins/javax.servlet.jsp_$JSPAPIVERSION
-
-# delete included jars
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=170662
-rm plugins/org.eclipse.swt/extra_jars/exceptions.jar \
- plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \
- plugins/org.eclipse.osgi/osgi/osgi.core.jar
-
-#fix build with commons-codec 1.4. Upstream has 1.3.
-sed -i "s|1.3.0.qualifier|0.0.0|g" features/org.eclipse.equinox.p2.user.ui/feature.xml
-
# make sure there are no jars left
JARS=""
for j in $(find -name \*.jar); do
@@ -390,8 +239,7 @@ fi
# target platform template patch
%patch0 -p0
# make o.e.swt.gtk.linux.ppc64 version to match ppc
-%patch1
-%patch2
+#%patch1
popd
%build
@@ -401,12 +249,17 @@ export JAVA_HOME=%{java_home}
%install
rm -rf $RPM_BUILD_ROOT
# Get swt version
-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_MAJ_VER=$(grep maj_ver build/eclipse-%{version}-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
+SWT_MIN_VER=$(grep min_ver build/eclipse-%{version}-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} -Dmultilib=true install
+pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
+rm -f eclipse.ini
+ln -s $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+popd
+
# Set GDK_NATIVE_WINDOWS=true
# https://bugzilla.redhat.com/531675 (https://bugs.eclipse.org/290395)
rm $RPM_BUILD_ROOT/%{_bindir}/%{name}
@@ -414,7 +267,7 @@ install -p -D -m0755 %{SOURCE2} $RPM_BUI
sed --in-place "s:/usr/lib:%{_libdir}:" \
$RPM_BUILD_ROOT%{_bindir}/%{name}
-cp $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini eclipse.ini-real
+cp $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini eclipse.ini-real
# Some directories we need
sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name}
# FIXME: We can probably get rid of the links directory (for the
@@ -631,20 +484,20 @@ popd
%endif
cp -p eclipse.ini-real \
- $sdkDir/eclipse.ini
+ $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
-sed -i "s|$RPM_BUILD_ROOT||g" $sdkDir/eclipse.ini
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
# Temporary fix until https://bugs.eclipse.org/294877 is resolved
-sed -i "s|-Xms40m|-Xms128m|g" $sdkDir/eclipse.ini
-sed -i "s|-Xmx256m|-Xmx512m|g" $sdkDir/eclipse.ini
-echo "" >> $sdkDir/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" >> $sdkDir/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>" >> $sdkDir/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" >> $sdkDir/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" >> $sdkDir/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $sdkDir/eclipse.ini
-echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $sdkDir/eclipse.ini
+sed -i "s|-Xms40m|-Xms128m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+sed -i "s|-Xmx256m|-Xmx512m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+echo "" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/links
# FIXME: We can probably get rid of the links file when we ensure all
@@ -657,7 +510,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-R3_5_1-fetched-src/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:")
+SWTJARVERSION=$(grep %{version} build/eclipse-%{version}-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
@@ -714,60 +567,6 @@ sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVER
%if ! %{bootstrap}
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-rm plugins/org.sat4j*
-ln -s %{_javadir}/org.sat4j.core* plugins/org.sat4j.core_2.1.0.v20090520.jar
-ln -s %{_javadir}/org.sat4j.pb* plugins/org.sat4j.pb_2.1.0.v20090520.jar
-
-ASMPLUGINVERSION=$(ls dropins/sdk/plugins | grep org.objectweb.asm_ | \
- sed 's/org.objectweb.asm_//')
-rm dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION
-ln -s %{_javadir}/objectweb-asm/asm-all.jar \
- dropins/sdk/plugins/org.objectweb.asm_$ASMPLUGINVERSION
-
-# link to hamcrest-core
-HAMCRESTCOREVERSION=$(ls dropins/sdk/plugins | grep org.hamcrest.core_ | \
- sed 's/org.hamcrest.core_//')
-rm dropins/sdk/plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
-ln -s %{_javadir}/hamcrest/core.jar \
- dropins/sdk/plugins/org.hamcrest.core_$HAMCRESTCOREVERSION
-
-## BEGIN ANT ##
-ANTDIR=plugins/$(ls plugins | grep org.apache.ant_)
-rm $ANTDIR/lib/*
-ANTDIR=$ANTDIR/lib
-ln -s %{_javadir}/ant/ant-antlr.jar $ANTDIR/ant-antlr.jar
-ln -s %{_javadir}/ant/ant-apache-bcel.jar $ANTDIR/ant-apache-bcel.jar
-ln -s %{_javadir}/ant/ant-apache-bsf.jar $ANTDIR/ant-apache-bsf.jar
-ln -s %{_javadir}/ant/ant-apache-log4j.jar $ANTDIR/ant-apache-log4j.jar
-ln -s %{_javadir}/ant/ant-apache-oro.jar $ANTDIR/ant-apache-oro.jar
-ln -s %{_javadir}/ant/ant-apache-regexp.jar $ANTDIR/ant-apache-regexp.jar
-ln -s %{_javadir}/ant/ant-apache-resolver.jar $ANTDIR/ant-apache-resolver.jar
-ln -s %{_javadir}/ant/ant-commons-logging.jar $ANTDIR/ant-commons-logging.jar
-ln -s %{_javadir}/ant/ant-commons-net.jar $ANTDIR/ant-commons-net.jar
-#ln -s %{_javadir}/ant/ant-jai.jar $ANTDIR/ant-jai.jar
-ln -s %{_javadir}/ant.jar $ANTDIR/ant.jar
-ln -s %{_javadir}/ant/ant-javamail.jar $ANTDIR/ant-javamail.jar
-ln -s %{_javadir}/ant/ant-jdepend.jar $ANTDIR/ant-jdepend.jar
-#ln -s %{_javadir}/ant/ant-jmf.jar $ANTDIR/ant-jmf.jar
-ln -s %{_javadir}/ant/ant-jsch.jar $ANTDIR/ant-jsch.jar
-ln -s %{_javadir}/ant/ant-junit.jar $ANTDIR/ant-junit.jar
-ln -s %{_javadir}/ant-launcher.jar $ANTDIR/ant-launcher.jar
-#ln -s %{_javadir}/ant/ant-netrexx.jar $ANTDIR/ant-netrexx.jar
-ln -s %{_javadir}/ant/ant-nodeps.jar $ANTDIR/ant-nodeps.jar
-#ln -s %{_javadir}/ant/ant-starteam.jar $ANTDIR/ant-starteam.jar
-#ln -s %{_javadir}/ant/ant-stylebook.jar $ANTDIR/ant-stylebook.jar
-ln -s %{_javadir}/ant/ant-swing.jar $ANTDIR/ant-swing.jar
-ln -s %{_javadir}/ant/ant-trax.jar $ANTDIR/ant-trax.jar
-#ln -s %{_javadir}/ant/ant-weblogic.jar $ANTDIR/ant-weblogic.jar
-## END ANT ##
-
-JETTYPLUGINVERSION=$(ls plugins | grep org.mortbay.jetty.server_6 | sed 's/org.mortbay.jetty.server_//')
-rm plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-ln -s %{_javadir}/jetty/jetty.jar plugins/org.mortbay.jetty.server_$JETTYPLUGINVERSION
-
-JETTYUTILVERSION=$(ls plugins | grep org.mortbay.jetty.util_6 | sed 's/org.mortbay.jetty.util_//')
-rm plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
-ln -s %{_javadir}/jetty/jetty-util.jar plugins/org.mortbay.jetty.util_$JETTYUTILVERSION
pushd dropins/jdt
build-jar-repository -s -p plugins/org.junit_* junit
@@ -777,74 +576,19 @@ rm plugins/org.junit4_$JUNIT4VERSION/jun
ln -s %{_javadir}/junit4.jar plugins/org.junit4_$JUNIT4VERSION/junit.jar
popd
-JSCHVERSION=$(ls plugins | grep com.jcraft.jsch_ | sed 's/com.jcraft.jsch_//')
-rm plugins/com.jcraft.jsch_$JSCHVERSION
-ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_$JSCHVERSION
-
# link to the icu4j stuff
ICUVERSION=$(ls plugins | grep com.ibm.icu_ | sed 's/com.ibm.icu_//')
rm plugins/com.ibm.icu_*.jar
-# link to lucene
-LUCENEVERSION=$(ls plugins | grep org.apache.lucene_ | \
- sed 's/org.apache.lucene_//')
-rm plugins/org.apache.lucene_*
-ln -s %{_javadir}/lucene.jar plugins/org.apache.lucene_$LUCENEVERSION
-rm plugins/org.apache.lucene.analysis_*
-ln -s %{_javadir}/lucene-contrib/lucene-analyzers.jar \
- plugins/org.apache.lucene.analysis_$LUCENEVERSION
-
-# link to commons-logging
-COMMONSLOGGINGVERSION=$(ls plugins | grep commons.logging_ | \
- sed 's/org.apache.commons.logging_//')
-rm plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION
-ln -s %{_javadir}/commons-logging.jar \
- plugins/org.apache.commons.logging_$COMMONSLOGGINGVERSION
-
-# link to commons-el
-COMMONSELVERSION=$(ls plugins | grep commons.el_ | \
- sed 's/org.apache.commons.el_//')
-rm plugins/org.apache.commons.el_$COMMONSELVERSION
-ln -s %{_javadir}/commons-el.jar \
- plugins/org.apache.commons.el_$COMMONSELVERSION
-
-# link to commons-el
-COMMONSCODECVERSION=$(ls plugins | grep commons.codec_ | \
- sed 's/org.apache.commons.codec_//')
-rm plugins/org.apache.commons.codec_$COMMONSCODECVERSION
-ln -s %{_javadir}/commons-codec.jar \
- plugins/org.apache.commons.codec_$COMMONSCODECVERSION
-
-# link to commons-el
-COMMONSHTTPVERSION=$(ls plugins | grep commons.httpclient_ | \
- sed 's/org.apache.commons.httpclient_//')
-rm plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
-ln -s %{_javadir}/commons-httpclient.jar \
- plugins/org.apache.commons.httpclient_$COMMONSHTTPVERSION
-
-# link to jasper
-JASPERVERSION=$(ls plugins | grep org.apache.jasper_ | \
- sed 's/org.apache.jasper_//')
-rm plugins/org.apache.jasper_*.jar
-ln -s %{_datadir}/eclipse/plugins/org.apache.jasper_* \
- plugins/org.apache.jasper_$JASPERVERSION
-
-# link to servlet-api
-SERVLETAPIVERSION=$(ls plugins | grep javax.servlet_ | \
- sed 's/javax.servlet_//')
-rm plugins/javax.servlet_*
-ln -s %{_javadir}/tomcat6-servlet-2.5-api.jar \
- plugins/javax.servlet_$SERVLETAPIVERSION
-
-# link to jsp-api
-JSPAPIVERSION=$(ls plugins | grep javax.servlet.jsp_ | \
- sed 's/javax.servlet.jsp_//')
-rm plugins/javax.servlet.jsp_*
-ln -s %{_javadir}/tomcat5-jsp-2.0-api.jar \
- plugins/javax.servlet.jsp_$JSPAPIVERSION
popd
%endif
+# Be sure that we have a symlink to /etc/eclipse.ini
+pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
+rm -f eclipse.ini
+ln -s %{_sysconfdir}/eclipse.ini
+popd
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -947,6 +691,7 @@ fi
%defattr(-,root,root)
%attr(0755,root,root) %{_bindir}/%{name}
%config %{_libdir}/%{name}/eclipse.ini
+%config %{_sysconfdir}/eclipse.ini
%ifnarch ppc ppc64
%{_libdir}/%{name}/about_files
%endif
@@ -1100,6 +845,9 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Mon Apr 12 2010 Andrew Overholt <overholt at redhat.com> 1:3.5.2-1
+- Update to 3.5.2 (from rawhide; by akurtakov).
+
* Mon Apr 12 2010 Andrew Overholt <overholt at redhat.com> 1:3.5.1-29
- Rebuild to pick up new xulrunner.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/F-13/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- sources 3 Dec 2009 19:53:34 -0000 1.91
+++ sources 12 Apr 2010 14:35:58 -0000 1.92
@@ -1,2 +1,2 @@
-55b14de28d6768f3e429388e37d97a9c eclipse-R3_5_1-fetched-src.tar.bz2
-8a563a261486607067e00c8eab8f1966 eclipse-build-R0_4_0.tar.gz
+24db7007d7ad739da5ed709cc97879ca eclipse-3.5.2-src.tar.bz2
+4222efa5f5817b369db90843b0ca7563 eclipse-build-0.5.0.tar.bz2
--- eclipse-addusrsharedropins.patch DELETED ---
--- eclipse-junit-dropins.patch DELETED ---
--- eclipse-swtbug291128.patch DELETED ---
More information about the scm-commits
mailing list