Added debug symbols.

by the eclipse-rcp package, but the directory is owned by the
equinox-osgi, and contents are owned by packages that provide them.

Conflicts:
	eclipse.spec

.gitignore

@@ -17,3 +17,6 @@ eclipse-3.8.0-I20120314-1800-src.tar.bz2
 eclipse-build-2c0f2ac34e3aee110187aa1dea28430bec724bdb.tar.xz
 eclipse-4.2.0-I20120405-1114-src.tar.bz2
 eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
+/.project
+eclipse-build-6df9efbd645d64284c969e9775d51be63fec7627.tar.xz
+eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz

eclipse-reconciler.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# This script is used to be a dummy script for old
-# packagers which have scriptlet code which runs the
-# reconciler.
-# This file should be removed after a coupld of update
-# cycles.
-exit 0

eclipse.spec

@@ -3,13 +3,13 @@ Epoch:  1
 %global eclipse_major   4
 %global eclipse_minor   2
 %global eclipse_majmin  %{eclipse_major}.%{eclipse_minor}
-%global eclipse_micro   0
+%global eclipse_micro   1
 %global initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/
-%global eb_sha1         5b8ee4c44320ee145596a3ce98fef1aa199055dd
-%global build_id        I20120405-1114
+%global eb_sha1         ec1dc4a92868df7716ee3caf5b530b236fa3542c
+%global build_id        M20120914-1800
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
-%global emf_version     2.8.0
+%global emf_version     2.8.1
 
 # FIXME:  update java packaging guidelines for this.  See
 # fedora-devel-java-list discussion in September 2008.
@@ -20,21 +20,19 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        0.9.I201204051114%{?dist}
+Release:        2%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
 Source0:        %{download_url}eclipse-build-%{eb_sha1}.tar.xz
 Source1:        %{download_url}eclipse-%{eclipse_version}-%{build_id}-src.tar.bz2
-Source2:        eclipse-reconciler.sh
 Source4:        macros.%{name}
 Source5:        http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi/3.6.0.v20100517/org.eclipse.osgi-3.6.0.v20100517.pom
 # Fetched from http://repo1.maven.org/maven2/org/eclipse/osgi/org.eclipse.osgi.services/3.2.100.v20100503/org.eclipse.osgi.services-3.2.100.v20100503.pom
 # Patched to remove fake parent
 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
+Source8:        org.eclipse.jdt.core-3.8.0.v_C03.pom
 
 BuildRequires:  ant >= 1.8.3
 BuildRequires:  rsync
@@ -51,9 +49,10 @@ BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
 BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1:1.7.0
-BuildRequires:  java-javadoc
+BuildRequires:  java-javadoc >= 1:1.7.0
 BuildRequires:  libXt-devel
 BuildRequires:  webkitgtk-devel
+BuildRequires:  geronimo-annotation >= 1.0-7
 
 BuildRequires: icu4j-eclipse >= 1:4.4.2.2-11
 BuildRequires: tomcat-lib >= 7.0.25-3
@@ -64,20 +63,20 @@ BuildRequires: jsch >= 0:0.1.46-2
 BuildRequires: apache-commons-el >= 1.0-22
 BuildRequires: apache-commons-logging
 BuildRequires: apache-commons-codec >= 1.6-2
-BuildRequires: jakarta-commons-httpclient
+BuildRequires: jakarta-commons-httpclient >= 1:3.1-7
 BuildRequires: felix-gogo-command >= 0.12
 BuildRequires: felix-gogo-shell >= 0.10.0-3
 BuildRequires: jetty >= 8.1.0-1
-BuildRequires: lucene >= 2.9.4-5
-BuildRequires: lucene-contrib >= 2.9.4-5
-BuildRequires: junit >= 4.10-4
-BuildRequires: hamcrest >= 0:1.1-9.2
+BuildRequires: lucene >= 2.9.4-8
+BuildRequires: lucene-contrib >= 2.9.4-8
+BuildRequires: junit >= 4.10-5
+BuildRequires: hamcrest >= 0:1.1-11
 BuildRequires: sat4j >= 2.3.0-1
 BuildRequires: objectweb-asm >= 3.3.1-1
 BuildRequires: zip
-BuildRequires: sac
-BuildRequires: batik
-BuildRequires: xml-commons-apis
+BuildRequires: sac >= 1.3-12
+BuildRequires: batik  >= 1.8
+BuildRequires: xml-commons-apis >= 1.4.01-6
 BuildRequires: atinject >= 1-6
 
 %if 0%{?rhel} >= 6
@@ -94,6 +93,7 @@ Version:        %{eclipse_version}
 Summary:        SWT Library for GTK+-2.0
 Group:          Text Editors/Integrated Development Environments (IDE)
 # %{_libdir}/java directory owned by jpackage-utils
+Requires:       java >= 1:1.7.0
 Requires:       jpackage-utils
 Requires:       gtk2
 Requires:       webkitgtk
@@ -101,10 +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
@@ -116,10 +127,10 @@ 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:       java >= 1:1.7.0
 Requires:       %{name}-emf-core = %{epoch}:%{emf_version}-%{release}
-Provides:       osgi(system.bundle)
+Provides:       osgi(system.bundle) = %{epoch}:%{eclipse_version}
 
 %description    rcp
 Eclipse Rich Client Platform
@@ -132,22 +143,23 @@ Requires:   %{name}-rcp = %{epoch}:%{eclipse_version}-%{release}
 Requires: 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
 Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
 Requires: ant-scripts
-Requires: apache-commons-el >= 1.0-22 
+Requires: apache-commons-el >= 1.0-23 
 Requires: apache-commons-logging 
 Requires: apache-commons-codec >= 1.6-2
-Requires: jakarta-commons-httpclient
+Requires: jakarta-commons-httpclient >= 1:3.1-7
 Requires: tomcat-lib >= 7.0.25-3
 Requires: felix-gogo-command >= 0.12
 Requires: felix-gogo-shell >= 0.10.0-3
 Requires: jetty >= 8.1.0-1
 Requires: jsch >= 0.1.46-2
-Requires: lucene >= 2.9.4-5
-Requires: lucene-contrib >= 2.9.4-5
+Requires: lucene >= 2.9.4-8
+Requires: lucene-contrib >= 2.9.4-8
 Requires: sat4j >= 2.3.0-1
-Requires: sac
-Requires: xml-commons-apis
-Requires: batik
+Requires: sac >= 1.3-12
+Requires: xml-commons-apis >= 1.4.01-6
+Requires: batik >= 1.8
 Requires: atinject >= 1-6
+Requires: geronimo-annotation >= 1.0-7
 Provides: eclipse-cvs-client = 1:%{eclipse_version}-%{release}
 Obsoletes: eclipse-cvs-client < 1:3.3.2-20
 
@@ -162,10 +174,11 @@ Summary:        Eclipse Java Development Tools
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
 Requires:       %{name}-cvs-client = %{epoch}:%{eclipse_version}-%{release}
-Requires:       junit >= 4.10-4
-Requires:       jakarta-commons-httpclient
-Requires:       java-javadoc
-Requires:       java-devel >= 1:1.7.0
+Requires:       junit >= 4.10-5
+Requires:       jakarta-commons-httpclient >= 1:3.1-7
+Requires:       hamcrest >= 0:1.1-11
+Requires:       java-javadoc >= 1:1.7.0
+
 
 %description    jdt
 Eclipse Java Development Tools.  This package is required to use Eclipse for
@@ -180,7 +193,6 @@ Provides:       eclipse-sdk = %{epoch}:%{eclipse_version}-%{release}
 Requires:       %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
 Requires:       %{name}-jdt = %{epoch}:%{eclipse_version}-%{release}
 Requires:       objectweb-asm >= 3.3.1-1
-Requires:       hamcrest >= 0:1.1-9.2
 # For PDE Build wrapper script + creating jars
 Requires:       zip
 Requires:       bash
@@ -200,15 +212,22 @@ pushd build/eclipse-%{eclipse_version}-%{build_id}-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?)
-sed -i -e "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
+sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
    -e "/osgi\.org/d" \
    -e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf.filetransfer_3.0.0.v20090302-0803.jar\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
     plugins/org.eclipse.platform.doc.isv/platformOptions.txt
-sed -i -e "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadoc/java|" \
+sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
    -e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \
    plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
-sed -i -e "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \
+sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \
+   -e "/osgi\.org/d" \
+   plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+sed -i -e "s|http://download.oracle.com/javase/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
    -e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \
+   -e "/osgi\.org/d" \
+   plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
+   plugins/org.eclipse.pde.doc.user/pdeOptions.txt
+sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
    plugins/org.eclipse.pde.doc.user/pdeOptions.txt
 
@@ -239,7 +258,7 @@ ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -Dmultilib=true installSDKinDropins
 
 # We don't need icon.xpm
 # https://bugs.eclipse.org/292472
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/icon.xpm
+rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/icon.xpm
 
 # Some directories we need
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
@@ -263,9 +282,6 @@ pushd $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.osgi/
     rm -rf .bundledata* .lazy* .manager .state*
 popd
 
-#install the reconciler script
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/
-
 # Symlinks to the SWT JNI shared libraries in %%{_libdir}/eclipse
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 for lib in $(find configuration -name libswt\*.so); do
@@ -278,6 +294,7 @@ sed -i "s|-Xms40m|-Xms128m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
 sed -i "s|-Xmx384m|-Xmx512m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
 echo "" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
 echo "-Dorg.eclipse.swt.browser.UseWebKitGTK=true" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+echo "-Dhelp.lucene.tokenizer=standard" >> $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
@@ -285,6 +302,13 @@ echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOM
 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
 
+# Prevent running master Eclipse in a shared configuration
+echo "-preventMasterEclipseLaunch" | cat - $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini > /tmp/out && mv -f /tmp/out $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini
+
+# Deploy installation debug config
+echo -e "org.eclipse.equinox.p2.core/debug=true" >  $RPM_BUILD_ROOT%{_libdir}/%{name}/.options
+echo -e "org.eclipse.equinox.p2.core/reconciler=true" >>  $RPM_BUILD_ROOT%{_libdir}/%{name}/.options
+
 # SWT JAR symlink in libdir
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 ln -s ../%{name}/swt.jar ../java/swt.jar
@@ -303,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
@@ -335,14 +363,13 @@ 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/
 
+# Remove the junit library duplicated by pdebuild.
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/jdt/plugins/org.junit_4.10.0.v4_10_0_v20120426-0900.jar
+
 %post platform
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -373,6 +400,8 @@ rm -rf %{_bindir}/efj/
 %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles
 %endif
 %{_libdir}/%{name}/notice.html
+%{_libdir}/%{name}/eclipse.ini
+%{_libdir}/%{name}/.options
 %{_libdir}/%{name}/epl-v10.html
 %{_libdir}/%{name}/plugins/org.eclipse.swt_*
 %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.*
@@ -444,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_*
@@ -453,9 +481,6 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_*
 %{_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
@@ -470,7 +495,6 @@ rm -rf %{_bindir}/efj/
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/*/*/apps/*
-%{_bindir}/eclipse-reconciler.sh
 %{_libdir}/%{name}/eclipse
 %dir %{_libdir}/%{name}/dropins
 %dir %{_datadir}/%{name}/dropins
@@ -639,95 +663,162 @@ rm -rf %{_bindir}/efj/
 # Put this in -platform since we're putting the p2 stuff here
 %{_libdir}/%{name}/artifacts.xml
 # FIXME: should we ship content.xml for the platform?
-#%{_libdir}/%{name}/metadata
+#%%{_libdir}/%%{name}/metadata
 %{_libdir}/%{name}/p2
+%{_javadir}/%{name}/equinox.http.servlet.jar
 
 %files jdt
-%{_bindir}/efj
+%attr(0755,root,root) %{_bindir}/efj
 %{_libdir}/%{name}/dropins/jdt
+%{_javadir}/%{name}/jdt.core.jar
 
 %files pde
 %{_bindir}/%{name}-pdebuild
 %{_libdir}/%{name}/buildscripts
 %{_libdir}/%{name}/dropins/sdk
 
+%files equinox-osgi
+%dir %{_javadir}/%{name}
+%{_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 Nov 9 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-2
+- Added debug symbols.
+
+* Tue Oct 2 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-1
+- Update to upstream 4.2.1 version.
+
+* Tue Jul 17 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-3
+- Bug 839986 - eclipse-rcp: broken symlinks
+
+* Fri Jul 6 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-2
+- Improved patch for discovering changes after update.
+
+* 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.
+
+* Fri Jun 15 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.23.I201205031800
+- Workaround for Eclipse bug 382574
+
+* Thu May 24 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.22.I201205031800
+- Do not pass the -preventMasterLaunch to non SDK applications.
+
+* Fri May 18 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.21.I201205031800
+- Prevent running Eclipse as root.
+- Populate Update Sites.
+- Pick renamed plugins on startup.
+- Bundle the .option file for investigating startup problems.
+
+* Sat May 5 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.20.I201205031800
+- Update to M7.
+
+* Mon Apr 30 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.19.I201204291800
+- Update to I20120429-1800.
+
+* Tue Apr 24 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.18.I201204171000
+- Regenerating s390 and s390x launcher fragments from scratch.
+
+* Mon Apr 23 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.17.I201204171000
+- Remove duplicated junit library.
+- Initial s390 and s390x support.
+- Update to latest eclipse-build.
+
+* Fri Apr 20 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.16.I201204171000
+- Bug 814332 - Documentation is not pointing to locally installed javadoc. 
+
+* Thu Apr 19 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.15.I201204171000
+- Amendment to previous release.
+
+* Thu Apr 19 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.14.I201204171000
+- Bug 813763 - /usr/bin/efj has missising exec permissions
+- Bug 813756 - eclipse-jdt: bundled junit library
+- Move hamcrest dependency to JDT.
+
+* Wed Apr 18 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.13.I201204171000
+- Move to the latest upstream I-build
+- Generate full documentation.
+- Formalize requirement on geronimo.
+
+* Wed Apr 18 2012 Sami Wagiaalla <swagiaal@redhat.com> 1:4.2.0-0.12.I201204051114
+- Don't fail if icon.xpm does not exist.
+
+* Thu Apr 12 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.11.I201204051114
+- Version more requirements.
+- Move java requirement to the lowest-in-stack package.
+- Removed some rpmlint warnings from spec file.
+
+* Wed Apr 11 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.10.I201204051114
+- Specified version for java-javadoc requirements.
+
 * Tue Apr 10 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.9.I201204051114
-- Add proper version to conflicts eclipse-emf-core
-
-* Tue Apr 10 2012 Andrew Overholt <overholt@redhat.com> 1:4.2.0-0.8.I201204051114
-- Add epoch to java and java-devel {Build,}Requires.
-
-* Tue Apr 10 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.7.I201204051114
-- Bug 810568 - require Java 7 to run.
-- Bug 810970 - Cannot start 4.2.0-0.6.I201204051114.fc18.x86_64
+- Picked rawhide 4.2 package.
 
 * Fri Apr 6 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.6.I201204051114
 - Update to I20120405-1114 upstream Eclipse build.
 - Update to latest e-b
 - Bug 810552 - JSch Requires should be versioned
 
-* Wed Apr 4 2012 Roland Grunberg <rgrunber@redhat.com> 1:4.2.0-0.5.fa15ab
-- Define %%{_eclipse_base} to properly resolve %%{_libdir} for noarch.
+* Mon Apr 2 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.21.I201203201400
+- pdebuild script installed into %%{_bindir}
 
-* Mon Apr 2 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.4.fa15ab
-- pdebuild script installed into %{_bindir}
-
-* Thu Mar 29 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.3.fa15ab
-- Sort out problems with versions.
-
-* Thu Mar 29 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.2.fa15ab
-- Change eclipse-emf-core package version to 2.8
-
-* Thu Mar 29 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.0-0.1.fa15ab
-- Update to 4.2
-- Added eclipse-emf-core package.
-
-* Mon Mar 26 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.21.I201203201400
+* Mon Mar 26 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.20.I201203201400
 - Added Provides: osgi(system.bundle)  to rcp package.
 
-* Thu Mar 22 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.20.I201203201400
+* Thu Mar 22 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.19.I201203201400
 - Update to I20120320-1400.
 - Ant version changed to 1.8.3.
 - ECF version changed to 3.5.5.
 - Experimental ARM support.
 
-* Fri Mar 16 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.19.I201203141800
+* Fri Mar 16 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.18.I201203141800
 - Update to I20120314-1800.
 - Eclipse-build updated to head.
 - Required Jsch version updated to include correct MANIFEST.MF 
 
-* Sun Mar 11 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.18.I201203060800
+* Sun Mar 11 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.17.I201203060800
 - Update to I20120228-0800.
 - Properly build org.eclipse.jdt.launching from source.
 
-* Wed Feb 29 2012 Andrew Overholt <overholt@redhat.com> 1:3.8.0-0.17.I201202280800
+* Wed Feb 29 2012 Andrew Overholt <overholt@redhat.com> 1:3.8.0-0.16.I201202280800
 - Add macro for build ID to ease moving to new ones.
 
-* Wed Feb 29 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.16.I201202280800
+* Wed Feb 29 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.15.I201202280800
 - Eclipse update to I20120228-0800
 
-* Wed Feb 22 2012 Roland Grunberg <rgrunber@redhat.com> 1:3.8.0-0.15.I201202140800
+* Wed Feb 22 2012 Roland Grunberg <rgrunber@redhat.com> 1:3.8.0-0.14.I201202140800
 - Add org.eclipse.tycho:org.eclipse.osgi to osgi depmap.
 - Install org.eclipse.jdt.core in javadir/eclipse.
 - Add maven pom and depmap for org.eclipse.jdt.core.
 
-* Wed Feb 22 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.14.I201202140800
+* Wed Feb 22 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.13.I201202140800
 - Updated dependencies to match jetty 8.1.0-1.
 - Updated commons-codec minimal requirements.
 - Moved icu4j dependency from swt to rcp.
 
-* Fri Feb 17 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.13.I201202140800
+* Fri Feb 17 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.12.I201202140800
+- Adopt noarch icu4j-eclipse
 - Add the icu4j-source bundle.
+- Using system jar for junit 4 and different OSGI metadata for junit 3
 - Update to Eclipse build I20120214-0800.
 
-* Thu Feb 16 2012 Sami Wagiaalla <swagiaal@redhat.com> 1:3.8.0-0.12.I201202070800
+* Thu Feb 16 2012 Sami Wagiaalla <swagiaal@redhat.com> 1:3.8.0-0.11.I201202070800
 - Install a blank eclipse-reconciler.sh.
 
-* Thu Feb 16 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.11.I201202070800
-- Using system jar for junit 4 and different OSGI metadata for junit 3
-- Adopt noarch icu4j-eclipse
-
 * Mon Feb 13 2012 Sami Wagiaalla <swagiaal@redhat.com> 1:3.8.0-0.10.I201202070800
 - Remove reconciler macros from macros.eclipse.
 - Do not create temp eclipse directory in rpm-state.
@@ -737,7 +828,7 @@ rm -rf %{_bindir}/efj/
 * Thu Feb 9 2012 Sami Wagiaalla <swagiaal@redhat.com> 1:3.8.0-0.9.I201202070800
 - Remove -debug reconciler flag
 - Remove macro _eclipse_reqs.
-- Define %_eclipse_base in macros.eclipse.
+- Define %%{_eclipse_base} in macros.eclipse.
 - Pass dropins dir to reconciler when updating the platform.
 
 * Wed Feb 8 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:3.8.0-0.7.I201201310842
@@ -800,7 +891,7 @@ rm -rf %{_bindir}/efj/
 - Use -Dosgi.checkConfiguration=true when updating the platform.
 - Remove cache.timestamps and .bundledata* when running the reconciler
   with -Dosgi.checkConfiguration=true.
-- Do not verify %{_libdir}/%{name}/artifacts.xml.
+- Do not verify %%{_libdir}/%%{name}/artifacts.xml.
 
 * Tue Nov 29 2011 Roland Grunberg <rgrunber@redhat.com> 1:3.7.1-7
 - Bump release.
@@ -877,7 +968,7 @@ rm -rf %{_bindir}/efj/
 - Add new script eclipse-reconciler.sh
 - Run eclipse-reconciler.sh in the post and postun sections of jdt 
   and post seciton on platform.
-- Remove all old profiles in %pre rcp.
+- Remove all old profiles in %%pre rcp.
 
 * Wed Sep 21 2011 Alexander Kurtakov <akurtako@redhat.com> 1:3.7.0-4
 - Remove _bindir/efj in pre - Fixes #738677.

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 @@
-d93c53bfaa0a09b8f57e86a588db7ebd  eclipse-4.2.0-I20120405-1114-src.tar.bz2
-9bbd7b12c404f2500a9097f94c51a6f1  eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
+8a8e05c31b9f3b277922762e0e86e4cc  eclipse-4.2.1-M20120914-1800-src.tar.bz2
+ae9858a3499271b0c5805bae9b743aa7  eclipse-build-ec1dc4a92868df7716ee3caf5b530b236fa3542c.tar.xz