Included patch for Eclipse bug 251167

Recompiled all jsr14 bundles as 1.5
Update to final Juno release.
Removed the old pdebuild script warning.
Created OSGI subpackage.

eclipse.spec

@@ -6,8 +6,8 @@ Epoch:  1
 %global eclipse_micro   0
 %global initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/
-%global eb_sha1         dbb197875d7ff8106fdb3660fcd7bac5de3d05d9
-%global build_id        I20120503-1800
+%global eb_sha1         104cc60dff6517fa6123cf4999f8fc9afc01c1e2
+%global build_id        I20120608-1400
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
 %global emf_version     2.8.0
 
@@ -20,7 +20,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        0.24.I201205031800%{?dist}
+Release:        1%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -33,7 +33,6 @@ Source5:        http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/
 Source6:        org.eclipse.osgi.services-3.2.100.v20100503.pom
 Source7:        http://repo1.maven.org/maven2/org/eclipse/equinox/http/servlet/1.0.0-v20070606/servlet-1.0.0-v20070606.pom
 Source8:        org.eclipse.jdt.core-3.8.0.v_C03.pom
-Source9:        pdebuild_old_info.sh
 
 BuildRequires:  ant >= 1.8.3
 BuildRequires:  rsync
@@ -102,11 +101,21 @@ Requires:       webkitgtk
 %description swt
 SWT Library for GTK+-2.0.
 
+%package      equinox-osgi
+Version:        %{eclipse_version}
+Summary:        Eclipse OSGi - Equinox
+Requires:       java >= 1:1.7.0
+Requires:       jpackage-utils
+
+%description  equinox-osgi
+Eclipse OSGi - Equinox
+
 %package      emf-core
 Version:        %{emf_version}
 Summary:        Eclipse Modeling Framework Core
 Group:          Development/Languages
 Requires:       java >= 1:1.7.0
+Requires:       %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
 Conflicts:      eclipse-emf < 2.8.0-0.5
 
 %description  emf-core
@@ -118,6 +127,7 @@ Version:        %{eclipse_version}
 Summary:        Eclipse Rich Client Platform
 Group:          Development/Languages
 Requires:       %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
+Requires:       %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
 Requires:       icu4j-eclipse >= 1:4.4.2.2-11
 Requires:       %{name}-emf-core = %{epoch}:%{emf_version}-%{release}
 Provides:       osgi(system.bundle) = %{epoch}:%{eclipse_version}
@@ -317,6 +327,10 @@ popd
 install -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-osgi.services.pom
 %add_maven_depmap JPP.eclipse-osgi.services.pom %{name}/osgi.services.jar -a "org.eclipse.osgi:services"
 
+pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
+ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_*.jar osgi.util.jar
+popd
+
 pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
 ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.servlet_*.jar equinox.http.servlet.jar
 popd
@@ -349,10 +363,6 @@ PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \
 sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \
   $RPM_BUILD_ROOT%{_bindir}/%{name}-pdebuild
 
-# Install the PDE Build moved info (to be removed at some time)
-install -p -D -m0755 %{SOURCE9} \
-  $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
-
 # Install eclipse macros file
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
@@ -463,7 +473,6 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.eclipse.help_*
 %{_libdir}/%{name}/plugins/org.eclipse.jface_*
 %{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*
-%{_libdir}/%{name}/plugins/org.eclipse.osgi_*
 %{_libdir}/%{name}/plugins/org.eclipse.rcp_*
 %{_libdir}/%{name}/plugins/org.eclipse.ui_*
 %{_libdir}/%{name}/plugins/org.eclipse.ui.views_*
@@ -473,8 +482,6 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.w3c.css.sac_*
 %{_libdir}/%{name}/plugins/org.w3c.dom.svg_*
 %{_javadir}/%{name}
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
 %if %{initialize}
 %files platform -f %{name}-platform.install
@@ -669,7 +676,25 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/buildscripts
 %{_libdir}/%{name}/dropins/sdk
 
+%files equinox-osgi
+%{_javadir}/%{name}/osgi.jar
+%{_javadir}/%{name}/osgi.services.jar
+%{_javadir}/%{name}/osgi.util.jar
+%{_libdir}/%{name}/plugins/org.eclipse.osgi_*
+%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*
+%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_*
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+
 %changelog
+* Fri Jun 29 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-1
+- Included patch for Eclipse bug 251167
+- Recompiled all jsr14 bundles as 1.5
+- Update to final Juno release.
+- Removed the old pdebuild script warning.
+- Created OSGI subpackage.
+- Removed the necessity to delete ~/.eclipse after some updates.
+
 * Fri Jun 18 2012 Sami Wagiaalla <swagiaal@redhat.com> 1:4.2.0-0.24.I201205031800
 - Remove empty reconciler script.
 

pdebuild_old_info.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-echo "pdebuild was renamed into eclipse-pdebuild and moved into _bindir"
-exit 1;

sources

@@ -1,2 +1,2 @@
-3a0a246297515b6dbce78dbdb81b30be  eclipse-4.2.0-I20120503-1800-src.tar.bz2
-a13c4dc53e5579254396b90d34c521c0  eclipse-build-dbb197875d7ff8106fdb3660fcd7bac5de3d05d9.tar.xz
+9f9caf28f189706890c835d81471f8b6  eclipse-build-104cc60dff6517fa6123cf4999f8fc9afc01c1e2.tar.xz
+86d7933037b9d0e52d421c0740c1bb27  eclipse-4.2.0-I20120608-1400-src.tar.bz2