rpms/eclipse/devel eclipse.spec,1.621,1.622

Andrew Overholt overholt at fedoraproject.org
Mon Mar 9 21:57:19 UTC 2009 

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29763

Modified Files:
	eclipse.spec 
Log Message:
* Mon Mar 9 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-3
- Remove ecj sub-package as it is replaced by standalone ecj package.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.621
retrieving revision 1.622
diff -u -r1.621 -r1.622
--- eclipse.spec	26 Feb 2009 17:08:30 -0000	1.621
+++ eclipse.spec	9 Mar 2009 21:56:49 -0000	1.622
@@ -1,5 +1,4 @@
 # TODO:
-# - update ecj-rpmdebuginfo patch
 # - look at startup script and launcher patches
 # - get Ganymede update site pre-configured (https://bugs.eclipse.org/249133)
 # - investigate bi-arch requirements
@@ -30,7 +29,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -51,7 +50,6 @@
 Source5:        org.fedoraproject.ide.feature-1.0.0.zip
 Source16:       %{name}-copy-platform.sh
 Source17:       efj.sh.in
-Source18:       ecj.sh.in
 # This file contains the types of files we'd like to extract from the jars
 # when using the FileInitializer
 Source19:       %{name}-filenamepatterns.txt
@@ -75,11 +73,6 @@
 Source27:       ecf-filetransfer-build.properties
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
-# Use ECJ for GCJ
-# cvs -d:pserver:anonymous at sourceware.org:/cvs/rhug \
-# export -r eclipse_r34_1 eclipse-gcj
-# tar cjf eclipse-ecj-gcj.tar.bz2 eclipse-gcj
-Source29:       %{name}-ecj-gcj.tar.bz2
 # Test feature and plugins
 # cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse co equinox-incubator/org.eclipse.equinox.initializer
 # mkdir %{name}-%{version}-testframework; cd %{name}-%{version}-testframework
@@ -107,9 +100,6 @@
 #    (which contains the JNI .sos) is in %{_libdir}
 # We should investigate whether or not this can go upstream
 #Patch12:        %{name}-launcher-set-install-dir-and-shared-config.patch
-# Always generate debug info when building RPMs (Andrew Haley)
-# This needs to be investigated for getEnv changes
-Patch14:        %{name}-ecj-rpmdebuginfo.patch
 # generic releng plugins that can be used to build plugins
 # see this thread for details:
 # https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
@@ -157,10 +147,6 @@
 Patch43:		%{name}-osgi-classpath.patch
 Patch44:		%{name}-fix-javahome64.patch
 
-# Default to 1.5 source and bytecode
-# https://bugzilla.redhat.com/354721
-Patch45:		%{name}-ecj-defaultto1.5.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -183,10 +169,6 @@
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc
 BuildRequires:  libXt-devel
-# For ecj's AOT bits
-BuildRequires:  gcc-java
-BuildRequires:  java-1.5.0-gcj-javadoc
-BuildRequires:  java-gcj-compat-devel
 
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
@@ -209,20 +191,6 @@
 environments (IDEs), server-side applications, desktop applications, and
 everything in between.
 
-%package        ecj
-Summary:        Eclipse Compiler for Java
-Group:          Development/Languages
-Obsoletes:      ecj < %{version}-%{release}
-Provides:       ecj = %{version}-%{release}
-Requires:       java >= 1.6.0
-# For AOT bits
-Requires:       libgcj >= 4.0.2
-Requires(post):     java-gcj-compat >= 1.0.64
-Requires(postun):   java-gcj-compat >= 1.0.64
-
-%description    ecj
-Eclipse compiler for Java.
-
 %package     swt
 Summary:        SWT Library for GTK+-2.0
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -284,7 +252,6 @@
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-cvs-client = %{epoch}:%{version}-%{release}
-Requires:       %{name}-ecj = %{epoch}:%{version}-%{release}
 Requires:       junit >= 3.8.1-3jpp
 Requires:       junit4
 Requires:       java-javadoc
@@ -322,14 +289,6 @@
 %patch4 -p0
 %patch32 -p0
 
-# Use ECJ for GCJ's bytecode compiler
-tar jxf %{SOURCE29}
-mv eclipse-gcj/org/eclipse/jdt/internal/compiler/batch/GCCMain.java \
-  plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/
-cat eclipse-gcj/gcc.properties >> \
-  plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
-rm -rf eclipse-gcj
-
 # liblocalfile fixes
 sed --in-place "s/JAVA_HOME =/#JAVA_HOME =/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
 sed --in-place "s/OPT_FLAGS=-O/OPT_FLAGS=-O2 -g/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
@@ -361,11 +320,6 @@
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
    plugins/org.eclipse.pde.doc.user/pdeOptions
 
-pushd plugins/org.eclipse.jdt.core
-%patch14 -p0
-%patch45 -p0
-popd
-
 pushd plugins/org.eclipse.pde.build
 %patch15
 sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-build/build.properties
@@ -1096,23 +1050,6 @@
 ln -s ../%{name}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ../java/swt.jar
 popd
 
-# Install the eclipse-ecj.jar symlink for java-1.4.2-gcj-compat's "javac"
-JDTCORESUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins \
-  | grep jdt.core_ | sed "s/org.eclipse.jdt.core_//")
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-ln -s %{_libdir}/%{name}/dropins/jdt/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
-
 # Icons
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 ln -s %{_libdir}/%{name}/plugins/org.fedoraproject.ide.platform_%{version}/eclipse48.png \
@@ -1131,10 +1068,6 @@
 sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \
   $RPM_BUILD_ROOT%{_bindir}/efj
 
-# Install the ecj wrapper script
-install -p -D -m0755 %{SOURCE18} $RPM_BUILD_ROOT%{_bindir}/ecj
-sed --in-place "s:@JAVADIR@:%{_javadir}:" $RPM_BUILD_ROOT%{_bindir}/ecj
-
 # A sanity check.
 desktop-file-validate %{SOURCE2}
 
@@ -1281,25 +1214,9 @@
 
 popd
 
-tmpdir=$PWD/aot-compile-ecj # must not be within $RPM_BUILD_ROOT
-mkdir -p $tmpdir
-cp -p $sdkDir/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar $tmpdir
-RPM_PACKAGE_NAME=eclipse-ecj RPM_BUILD_ROOT=$tmpdir aot-compile-rpm
-cp -rp $tmpdir%{_libdir}/gcj $RPM_BUILD_ROOT%{_libdir}/gcj
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post ecj
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
-%postun ecj
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
-  %{_bindir}/rebuild-gcj-db
-fi
-
 %post platform
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -1312,19 +1229,6 @@
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%files ecj
-%defattr(-,root,root)
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/dropins
-%dir %{_libdir}/%{name}/dropins/jdt
-%dir %{_libdir}/%{name}/dropins/jdt/plugins
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_*
-%{_javadir}/eclipse-ecj*.jar
-%{_javadir}/jdtcore*.jar
-%{_javadir}/ecj*.jar
-%{_bindir}/ecj
-%{_libdir}/gcj/eclipse-ecj
-
 %if %{initialize}
 %files swt -f %{name}-swt.install
 %else
@@ -1568,6 +1472,9 @@
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Mar 9 2009 Andrew Overholt <overholt at redhat.com> 1:3.4.2-3
+- Remove ecj sub-package as it is replaced by standalone ecj package.
+
 * Thu Feb 26 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.4.2-2
 - Strict R/BR for sat4j >= 2.0.3.

More information about the fedora-extras-commits mailing list