From 57a09440500dc48d95c9f15c5053373feb73a5f9 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jan 12 2018 11:10:52 +0000
Subject: Update to latest upstream release

Drop upstreamed patch

---

diff --git a/eclipse-launchbar-fix-launch-target-manager.patch b/eclipse-launchbar-fix-launch-target-manager.patch
deleted file mode 100644
index 9510dd2..0000000
--- a/eclipse-launchbar-fix-launch-target-manager.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 3618e446ad54791e40db174b96e03f7d6b91df79 Mon Sep 17 00:00:00 2001
-From: Roland Grunberg <rgrunber@redhat.com>
-Date: Thu, 20 Jul 2017 14:47:14 -0400
-Subject: [PATCH] Synchronize access to listeners list in LaunchTargetManager.
-
----
- .../core/internal/target/LaunchTargetManager.java   | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/target/LaunchTargetManager.java b/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/target/LaunchTargetManager.java
-index 2ad11c3..66df115 100644
---- a/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/target/LaunchTargetManager.java
-+++ b/bundles/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/target/LaunchTargetManager.java
-@@ -8,6 +8,7 @@
- package org.eclipse.launchbar.core.internal.target;
- 
- import java.util.ArrayList;
-+import java.util.Collections;
- import java.util.LinkedHashMap;
- import java.util.LinkedList;
- import java.util.List;
-@@ -35,7 +36,7 @@ public class LaunchTargetManager implements ILaunchTargetManager {
- 	private Map<String, Map<String, ILaunchTarget>> targets;
- 	private Map<String, IConfigurationElement> typeElements;
- 	private Map<String, ILaunchTargetProvider> typeProviders = new LinkedHashMap<>();
--	private List<ILaunchTargetListener> listeners = new LinkedList<>();
-+	private List<ILaunchTargetListener> listeners = Collections.synchronizedList(new LinkedList<>());
- 
- 	private static final String DELIMETER1 = ","; //$NON-NLS-1$
- 	private static final String DELIMETER2 = ":"; //$NON-NLS-1$
-@@ -201,8 +202,10 @@ public class LaunchTargetManager implements ILaunchTargetManager {
- 			Activator.log(e);
- 		}
- 
--		for (ILaunchTargetListener listener : listeners) {
--			listener.launchTargetAdded(target);
-+		synchronized (listeners) {
-+			for (ILaunchTargetListener listener : listeners) {
-+				listener.launchTargetAdded(target);
-+			}
- 		}
- 
- 		return target;
-@@ -226,16 +229,20 @@ public class LaunchTargetManager implements ILaunchTargetManager {
- 				Activator.log(e);
- 			}
- 			
--			for (ILaunchTargetListener listener : listeners) {
--				listener.launchTargetRemoved(target);
-+			synchronized (listeners) {
-+				for (ILaunchTargetListener listener : listeners) {
-+					listener.launchTargetRemoved(target);
-+				}
- 			}
- 		}
- 	}
- 
- 	@Override
- 	public void targetStatusChanged(ILaunchTarget target) {
--		for (ILaunchTargetListener listener : listeners) {
--			listener.launchTargetStatusChanged(target);
-+		synchronized (listeners) {
-+			for (ILaunchTargetListener listener : listeners) {
-+				listener.launchTargetStatusChanged(target);
-+			}
- 		}
- 	}
- 
--- 
-2.13.3
-
diff --git a/eclipse-launchbar.spec b/eclipse-launchbar.spec
index b9d9f19..2c7eac5 100644
--- a/eclipse-launchbar.spec
+++ b/eclipse-launchbar.spec
@@ -1,4 +1,4 @@
-%global git_tag 0d496a289212b119720dbbffad068706e140a13e
+%global git_tag 494fbe48cbb01fc37239b46b02edc366cc67862f
 
 # Set this to avoid building remote launching bundles to eliminate
 # a circular dep on CDT->launchbar->remote->CDT
@@ -6,16 +6,14 @@
 
 Epoch:          1
 Name:           eclipse-launchbar
-Version:        2.1.2
-Release:        2%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        Eclipse Launchbar plug-in
 License:        EPL
 URL:            https://wiki.eclipse.org/CDT/LaunchBar
 
 Source0:        http://git.eclipse.org/c/cdt/org.eclipse.launchbar.git/snapshot/org.eclipse.launchbar-%{git_tag}.tar.xz
 
-Patch0:         eclipse-launchbar-fix-launch-target-manager.patch
-
 BuildArch:      noarch
 
 BuildRequires: tycho
@@ -33,7 +31,6 @@ An alternative to the default launcher toolbar in Eclipse.
 
 %prep
 %setup -q -n org.eclipse.launchbar-%{git_tag}
-%patch0 -p1
 
 find -name *.jar -exec rm -rf {} \;
 find -name *.class -exec rm -rf {} \;
@@ -43,6 +40,7 @@ find -name *.class -exec rm -rf {} \;
 
 # Disable tests for now
 %pom_disable_module tests/org.eclipse.launchbar.core.tests
+%pom_disable_module tests/org.eclipse.launchbar.ui.tests
 
 %if %{without remote}
 %pom_disable_module bundles/org.eclipse.launchbar.remote.core
@@ -50,6 +48,9 @@ find -name *.class -exec rm -rf {} \;
 %pom_disable_module features/org.eclipse.launchbar.remote
 %endif
 
+# No parent poms
+%mvn_package "::pom::" __noinstall
+
 %build
 %mvn_build -j
 
@@ -59,6 +60,10 @@ find -name *.class -exec rm -rf {} \;
 %files -f .mfiles
 
 %changelog
+* Fri Jan 12 2018 Mat Booth <mat.booth@redhat.com> - 1:2.2.0-1
+- Update to latest upstream release
+- Drop upstreamed patch
+
 * Mon Sep 18 2017 Mat Booth <mat.booth@redhat.com> - 1:2.1.2-2
 - Synchronize access to listeners list in LaunchTargetManager