rpms/eclipse/devel sources, 1.83, 1.84 eclipse.spec, 1.674, 1.675 eclipse-pde.build-add-package-build.patch, 1.13, NONE eclipse-osgi-classpath.patch, 1.2, NONE eclipse-gtk2.18zorder.patch, 1.1, NONE

Thu Oct 8 10:07:45 UTC 2009

Author: akurtakov

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

Modified Files:
	sources eclipse.spec 
Removed Files:
	eclipse-pde.build-add-package-build.patch 
	eclipse-osgi-classpath.patch eclipse-gtk2.18zorder.patch 
Log Message:
- New eclipse-build snapshot. Remove parts included in it.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/sources,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84

--- sources	2 Oct 2009 20:01:51 -0000	1.83
+++ sources	8 Oct 2009 10:07:44 -0000	1.84
@@ -1,2 +1,2 @@
 3ed7a1c9c13a73f6d7abc0b0305631e3  eclipse-R3_5_1-fetched-src.tar.bz2
-a756f9afb426b6deeab225c537e1645c  eclipse-build-0.4.0RC0.tar.gz
+c02651bd19acc5bddec2e53dbc3e8820  eclipse-build-0.4.0RC0.tar.gz


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.674
retrieving revision 1.675
diff -u -p -r1.674 -r1.675
--- eclipse.spec	7 Oct 2009 19:59:11 -0000	1.674
+++ eclipse.spec	8 Oct 2009 10:07:44 -0000	1.675
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -49,16 +49,6 @@ Source27:       ecf-filetransfer-build.p
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 
-# This does two things:
-# 1. allows the launcher to be in /usr/bin and
-# 2. ensures that the OSGi configuration directory
-#    (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
-# 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
-Patch0:        %{name}-pde.build-add-package-build.patch
 Patch1:        %{name}-add-ppc64-sparc64-s390-s390x.patch
 Patch2:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
 
@@ -69,14 +59,6 @@ Patch5:        %{name}-add-ppc64-filesys
 # need to go upstream.
 Patch6:        %{name}-target-platform-template.patch
 
-# Add /usr/share/eclipse/dropins to list of dropins locations
-# Already applied in eclipse-build upstream rev. #23023
-Patch7:        %{name}-addusrsharedropins.patch
-
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=287307
-# Already applied in eclipse-build upstream
-Patch8:        %{name}-gtk2.18zorder.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.5, make, gcc
@@ -222,14 +204,9 @@ developing Eclipse plugins.
 %prep
 %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 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
-sed --in-place "s/OPT_FLAGS=-O/OPT_FLAGS=-O2 -g/" plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile
-
 # Use our system-installed javadocs, reference only what we built, and
 # don't like to osgi.org docs (FIXME:  maybe we should package them?)
 sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
@@ -245,19 +222,10 @@ 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
 
-pushd plugins/org.eclipse.pde.build
-%patch0
-sed --in-place "s:/usr/share/eclipse:%{_libdir}/%{name}:" templates/package-build/build.properties
-popd
-
 # Remove signatures for JARs
 find -iname \*.sf | xargs rm
 find -iname \*.rsa | xargs rm
 
-# all output should be directed to stdout
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=144942
-find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g" "{}" \;
-
 # Remove existing .sos and binary launcher
 find -name \*.so | xargs rm
 find features/org.eclipse.equinox.executable -type f -name eclipse | xargs rm
@@ -497,11 +465,6 @@ rm plugins/org.eclipse.swt/extra_jars/ex
    plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \
    plugins/org.eclipse.osgi/osgi/osgi.core.jar
 
-# FIXME:  figure out a way to symlink to something.  Alternatively,
-# patch out of package.org.eclipse.sdk*.xml.
-# Delete unnecessary-for-build source JARs
-#rm plugins/*.source_*.jar
-
 # make sure there are no jars left
 JARS=""
 for j in $(find -name \*.jar); do
@@ -527,11 +490,6 @@ popd
 
 # target platform template patch
 %patch6 -p0
-%patch7 -p0
-popd
-
-pushd build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt
-%patch8 -p0
 popd
 
 %build
@@ -576,17 +534,15 @@ SWT_MAJ_VER=$(grep maj_ver build/eclipse
 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
 
+ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} install
+
+cp $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini eclipse.ini-real
 # Some directories we need
 sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name}
-install -d -m 755 $sdkDir
-install -d -m 755 $sdkDir/plugins
-install -d -m 755 $sdkDir/features
 # FIXME:  We can probably get rid of the links directory (for the
 # datadir.link file) when we ensure all plugins are installing into
 # dropins (either in libdir or datadir).
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/dropins
 
 # FIXME:  Please don't install stuff to these directories.  They're only
 # still here for legacy plugins (which probably won't function in 3.4).
@@ -813,24 +769,10 @@ done
 popd
 %endif
 
-cp -p build/eclipse-R3_5_1-fetched-src/installation/eclipse.ini \
+cp -p eclipse.ini-real \
   $sdkDir/eclipse.ini
-# We have /usr/share/eclipse/dropins in eclipse.ini
-sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini
 
-sed --in-place "s/osgi.ws=gtk/osgi.ws=gtk\norg.eclipse.update.reconcile=false/" \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/config.ini
-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
-
-# Install the Eclipse binary wrapper
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-ln -s %{_libdir}/%{name}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
-#cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/eclipse
-#sed --in-place "s|@LIBDIR@|%{_libdir}|g" $RPM_BUILD_ROOT%{_bindir}/eclipse
-#ECLIPSELIBSUFFIX=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux*/*.so | sed "s/.*.launcher.gtk.linux.//")
-#sed --in-place "s|@ECLIPSELIBSUFFIX@|$ECLIPSELIBSUFFIX|" $RPM_BUILD_ROOT%{_bindir}/eclipse
+sed -i "s|$RPM_BUILD_ROOT||g" $sdkDir/eclipse.ini
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/links
 # FIXME:  We can probably get rid of the links file when we ensure all
@@ -851,20 +793,6 @@ ln -s swt-gtk-%{eclipse_majmin}.%{eclips
 ln -s ../%{name}/swt-gtk-%{eclipse_majmin}.%{eclipse_micro}.jar ../java/swt.jar
 popd
 
-# Icons
-PLATFORMVERSION=$(ls $sdkDir/plugins | grep org.eclipse.platform_ | sed 's/org.eclipse.platform_//')
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse48.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse32.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-ln -s %{_libdir}/%{name}/plugins/org.eclipse.platform_$PLATFORMVERSION/eclipse.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s %{_datadir}/icons/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
 # Install the efj wrapper script
 install -p -D -m0755 %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/efj
 sed --in-place "s:startup.jar:%{_libdir}/%{name}/startup.jar:" \
@@ -1147,8 +1075,6 @@ fi
 %defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/%{name}
 %config %{_libdir}/%{name}/eclipse.ini
-#%{_libdir}/%{name}/.eclipseproduct
-%{_libdir}/%{name}/configuration/config.ini
 %ifnarch ppc
 %{_libdir}/%{name}/about_files
 %endif
@@ -1302,6 +1228,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Oct 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-4
+- New eclipse-build snapshot. Remove parts included in it.
+
 * Wed Oct 07 2009 Andrew Overholt <overholt at redhat.com> 1:3.5.1-3
 - Add patch for bugs.eclipse.org/287307
 


--- eclipse-pde.build-add-package-build.patch DELETED ---


--- eclipse-osgi-classpath.patch DELETED ---


--- eclipse-gtk2.18zorder.patch DELETED ---


