[eclipse] Using system jar for junit 4 and different OSGI metadata for junit 3 Adopt noarch icu4j-eclipse

[Krzysztof Daniel]

commit 9d09cc7c905fd4eb3b98cfd946fd4f7924a23ed4
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Thu Feb 16 16:33:02 2012 +0100

    Using system jar for junit 4 and different OSGI metadata for junit 3
    Adopt noarch icu4j-eclipse

 .gitignore   |    1 +
 eclipse.spec |   24 +++++++++++-------------
 sources      |    2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cc25295..b2a15ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ eclipse-3.8.0-M5-src.tar.bz2
 eclipse-build-0316c8034d15e2c083090fa759677166a76c8755.tar.xz
 eclipse-3.8.0-I20120207-0800-src.tar.bz2
 eclipse-build-34f1eef37f75faf19c8951c8351483e7a98467e9.tar.xz
+eclipse-build-f58835e3e02b0416d746bc17299acd628a72e506.tar.xz
diff --git a/eclipse.spec b/eclipse.spec
index 313b5eb..ef23c59 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -6,7 +6,7 @@ Epoch:  1
 %global eclipse_micro   0
 %global initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/3.8.x/
-%global eb_sha1         34f1eef37f75faf19c8951c8351483e7a98467e9
+%global eb_sha1         f58835e3e02b0416d746bc17299acd628a72e506
 
 # FIXME:  update java packaging guidelines for this.  See
 # fedora-devel-java-list discussion in September 2008.
@@ -17,7 +17,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        0.10.I201202070800%{?dist}
+Release:        0.11.I201202070800%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -50,7 +50,7 @@ BuildRequires:  java-javadoc
 BuildRequires:  libXt-devel
 BuildRequires:  webkitgtk-devel
 
-BuildRequires: icu4j-eclipse >= 1:4.4.2.2-9
+BuildRequires: icu4j-eclipse >= 1:4.4.2.2-11
 BuildRequires: tomcat-lib >= 7.0.25-3
 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-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
@@ -65,8 +65,7 @@ BuildRequires: felix-gogo-shell >= 0.10.0-3
 BuildRequires: jetty >= 8
 BuildRequires: lucene >= 2.9.4-5
 BuildRequires: lucene-contrib >= 2.9.4-5
-BuildRequires: junit >= 3.8.1-3jpp
-BuildRequires: junit4
+BuildRequires: junit >= 4.10-4
 BuildRequires: hamcrest >= 0:1.1-9.2
 BuildRequires: sat4j >= 2.3.0-1
 BuildRequires: objectweb-asm >= 3.3.1-1
@@ -96,7 +95,7 @@ SWT Library for GTK+-2.0.
 Summary:        Eclipse Rich Client Platform
 Group:          Development/Languages
 Requires:       %{name}-swt = %{epoch}:%{version}-%{release}
-Requires:       icu4j-eclipse >= 1:4.4.2.2-9
+Requires:       icu4j-eclipse >= 1:4.4.2.2-11
 Requires:       java >= 1.6.0
 
 %description    rcp
@@ -133,8 +132,7 @@ Summary:        Eclipse Java Development Tools
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name}-platform = %{epoch}:%{version}-%{release}
 Requires:       %{name}-cvs-client = %{epoch}:%{version}-%{release}
-Requires:       junit >= 3.8.1-3jpp
-Requires:       junit4
+Requires:       junit >= 4.10-4
 Requires:       jakarta-commons-httpclient
 Requires:       java-javadoc
 Requires:       java-devel
@@ -288,11 +286,6 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
 mv copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
 copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/copy-platform
 
-# This symlink is actually provided by the icu4j-eclipse package
-# We need to remove this *after* copy-platform creation otherwise
-# copy-platform gets generated wrong.
-rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/com.ibm.icu_*.jar
-
 # Install the PDE Build wrapper script.
 install -p -D -m0755 pdebuild/eclipse-pdebuild.sh \
   $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/pdebuild
@@ -337,6 +330,7 @@ rm -rf %{_bindir}/efj/
 %endif
 %{_libdir}/%{name}/notice.html
 %{_libdir}/%{name}/epl-v10.html
+%{_libdir}/%{name}/plugins/com.ibm.icu_*
 %{_libdir}/%{name}/plugins/org.eclipse.swt_*
 %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.*
 %{_libdir}/%{name}/swt-gtk*.jar
@@ -569,6 +563,10 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Thu Feb 16 2012 Krzysztof Daniel <kdaniel at 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 at redhat.com> 1:3.8.0-0.10.I201202070800
 - Remove reconciler macros from macros.eclipse.
 - Do not create temp eclipse directory in rpm-state.
diff --git a/sources b/sources
index 41f5d2a..0c2fc5a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 e61e2a7ae34a1a60505aca5cb1be7e34  eclipse-3.8.0-I20120207-0800-src.tar.bz2
-301755b4f30e16ee8f5feca0504c12be  eclipse-build-34f1eef37f75faf19c8951c8351483e7a98467e9.tar.xz
+c28b9713fd8caa3e01b7035c14af87b9  eclipse-build-f58835e3e02b0416d746bc17299acd628a72e506.tar.xz