[felix-gogo-shell] Temporary fix for bug 786041

[Krzysztof Daniel]

commit 821a8caede8f69dc1a9b714d15c5528c509e718a
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Tue Jan 31 15:10:18 2012 +0100

    Temporary fix for bug 786041

 felix-gogo-shell.spec          |   11 ++++++++---
 ignoreActivatorException.patch |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/felix-gogo-shell.spec b/felix-gogo-shell.spec
index 16b91cf..2a29064 100644
--- a/felix-gogo-shell.spec
+++ b/felix-gogo-shell.spec
@@ -3,7 +3,7 @@
 
 Name:             %{project}-gogo-shell
 Version:          0.10.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Community OSGi R4 Service Platform Implementation - Basic Commands
 Group:            Development/Tools
 License:          ASL 2.0
@@ -14,9 +14,11 @@ Source0:          http://mirror.catn.com/pub/apache//felix/org.apache.felix.gogo
 # Changed GroupID from osgi to felix
 Patch0:           %{name}-groupid.patch
 
+Patch1:           ignoreActivatorException.patch
+
 BuildArch:        noarch
 
-BuildRequires:    java
+BuildRequires:    java-devel >= 1.7.0
 BuildRequires:    jpackage-utils
 BuildRequires:    maven
 BuildRequires:    maven-plugin-bundle
@@ -48,6 +50,7 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{bundle}-%{version}
 %patch0 -p1 -F3
+%patch1
 
 %build
 mvn-rpmbuild install javadoc:aggregate 
@@ -78,9 +81,11 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jan 31 2012 Krzysztof Daniel <kdaniel at redhat.com> 0.10.0-3
+- Temporary fix for bug 786041
+
 * Wed Jan 18 2012 Tomas Radej <tradej at redhat.com> - 0.10.0-2
 - Changed jar path
 
 * Mon Jan 09 2012 Tomas Radej <tradej at redhat.com> - 0.10.0-1
 - Initial packaging
-
diff --git a/ignoreActivatorException.patch b/ignoreActivatorException.patch
new file mode 100644
index 0000000..aeabc7f
--- /dev/null
+++ b/ignoreActivatorException.patch
@@ -0,0 +1,14 @@
+Index: src/main/java/org/apache/felix/gogo/shell/Activator.java
+===================================================================
+--- src/main/java/org/apache/felix/gogo/shell/Activator.java	(revision 1238398)
++++ src/main/java/org/apache/felix/gogo/shell/Activator.java	(working copy)
+@@ -74,6 +74,9 @@
+             args = (args == null) ? "" : args;
+             session.execute("gosh --login " + args);
+         }
++        catch (InterruptedException e){
++        	// ignore
++        }
+         catch (Exception e)
+         {
+             Object loc = session.get(".location");