[eclipse/f17: 25/25] Pick up Eclipse 4.2.

[Krzysztof Daniel]

commit bbe279583d9c0b9b01bb85ac672cc9cf00588b8d
Merge: 40bfcca 1372214
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Tue Apr 10 18:42:26 2012 +0200

    Pick up Eclipse 4.2.
    
    Conflicts:
    	.gitignore
    	eclipse.spec
    	sources

 .gitignore     |    2 +
 eclipse.spec   |  164 +++++++++++++++++++++++++++++++++++++++++---------------
 macros.eclipse |    5 ++-
 sources        |    4 +-
 4 files changed, 129 insertions(+), 46 deletions(-)
---
diff --cc .gitignore
index 6f6c357,8a771a0..9e5c51a
--- a/.gitignore
+++ b/.gitignore
@@@ -15,3 -15,5 +15,5 @@@ eclipse-3.8.0-I20120306-0800-src.tar.bz
  eclipse-build-85830ed757416af1ca59aa1c43dce00791d12241.tar.xz
  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
++eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
diff --cc eclipse.spec
index 3783986,90c9cd0..057d2ed
--- a/eclipse.spec
+++ b/eclipse.spec
@@@ -582,13 -652,41 +652,21 @@@ rm -rf %{_bindir}/efj
  %{_libdir}/%{name}/dropins/sdk
  
  %changelog
+ * Tue Apr 10 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.9.I201204051114
 -- Add proper version to conflicts eclipse-emf-core
 -
 -* Tue Apr 10 2012 Andrew Overholt <overholt at 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 at 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 at 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 at 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 at redhat.com> 1:4.2.0-0.4.fa15ab
 +* Mon Apr 2 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:3.8.0-0.21.I201203201400
  - pdebuild script installed into %{_bindir}
  
 -* Thu Mar 29 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.3.fa15ab
 -- Sort out problems with versions.
 -
 -* Thu Mar 29 2012 Krzysztof Daniel <kdaniel at 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 at 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 at redhat.com> 1:3.8.0-0.21.I201203201400
 +* Mon Mar 26 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:3.8.0-0.20.I201203201400
  - Added Provides: osgi(system.bundle)  to rcp package.
  
 -* Thu Mar 22 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:3.8.0-0.20.I201203201400
 +* Thu Mar 22 2012 Krzysztof Daniel <kdaniel at 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.