[eclipse-egit] Fix build agains the lates o.e.jface.util.Policy.

[swagiaal]

commit 1e5f71f3c02eaa51972eee59431c7459ba8d26ef
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date:   Thu May 22 14:11:43 2014 -0400

    Fix build agains the lates o.e.jface.util.Policy.

 eclipse-egit.spec                 |    7 ++++++-
 fix-CommonUtils-build-error.patch |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 9e5f41e..399ef6a 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -7,11 +7,12 @@
 Summary:          Eclipse Git Integration
 Name:             %{?scl_prefix}eclipse-egit
 Version:          3.3.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          EPL
 URL:              http://www.eclipse.org/egit
 Group:            Development/Tools
 Source0:          http://git.eclipse.org/c/egit/egit.git/snapshot/egit-%{version}.%{version_suffix}.tar.bz2
+Patch1: fix-CommonUtils-build-error.patch
 
 BuildRequires:    java-devel >= 1.6.0
 BuildRequires:    %{?scl_prefix}eclipse-jgit >= 3.3.2
@@ -61,6 +62,7 @@ sed -i -e "12,14d" org.eclipse.egit.repository/category.xml
 # Allow building against newer versions of mylyn wikitext
 sed -i -e "s|1.3.0,2.0.0|1.3.0,3.0.0|g" org.eclipse.egit.doc/META-INF/MANIFEST.MF
 
+%patch1 -p1
 
 %build
 xmvn -o clean verify -Dmaven.test.skip=true
@@ -97,6 +99,9 @@ rm $RPM_BUILD_ROOT%{install_loc}/eclipse/*.jar
 %{install_loc}/eclipse/plugins/org.eclipse.egit.mylyn.ui_*.jar
 
 %changelog
+* Thu May 22 2014 Sami Wagiaalla <swagiaal at redhat.com> - 3.3.2-2
+- Fix build agains the lates o.e.jface.util.Policy.
+
 * Mon Apr 28 2014 Mat Booth <mat.booth at redhat.com> - 3.3.2-1
 - Update to 3.3.2.
 
diff --git a/fix-CommonUtils-build-error.patch b/fix-CommonUtils-build-error.patch
new file mode 100644
index 0000000..d28c0f2
--- /dev/null
+++ b/fix-CommonUtils-build-error.patch
@@ -0,0 +1,21 @@
+diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CommonUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CommonUtils.java
+index 42a4b83..bd86ae9 100644
+--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CommonUtils.java
++++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CommonUtils.java
+@@ -94,13 +94,9 @@ public int compare(Ref o1, Ref o2) {
+ 	 * {@link IResource#getName()}.
+ 	 */
+ 	public static final Comparator<IResource> RESOURCE_NAME_COMPARATOR = new Comparator<IResource>() {
+-		@SuppressWarnings("unchecked")
+-		private final Comparator<String> stringComparator = Policy
+-				.getComparator();
+-
+-		public int compare(IResource r1, IResource r2) {
+-			return stringComparator.compare(r1.getName(), r2.getName());
+-		}
++	    public int compare(IResource r1, IResource r2) {
++		return  Policy.getComparator().compare(r1.getName(), r2.getName());
++	    }
+ 	};
+ 
+ 	/**