[eclipse-egit] Add patch to fix New git repo wizard starting.

[Alexander Kurtakov]

commit 2c755ca5568c0cd1fda44d96354f45b5ea25ebbb
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Fri Nov 18 13:35:52 2011 +0200

    Add patch to fix New git repo wizard starting.

 NewRepositoryWizard.java.patch |   20 ++++++++++++++++++++
 eclipse-egit.spec              |   22 ++++++++++------------
 2 files changed, 30 insertions(+), 12 deletions(-)
---
diff --git a/NewRepositoryWizard.java.patch b/NewRepositoryWizard.java.patch
new file mode 100644
index 0000000..3c45883
--- /dev/null
+++ b/NewRepositoryWizard.java.patch
@@ -0,0 +1,20 @@
+X-Git-Url: http://egit.eclipse.org/w/?p=egit.git;a=blobdiff_plain;f=org.eclipse.egit.ui%2Fsrc%2Forg%2Feclipse%2Fegit%2Fui%2Finternal%2Frepository%2FNewRepositoryWizard.java;h=8d197379a6de98d9f8a17b07fa350e49d8a87677;hp=fdaf17e9b4765f74bb2280bda3bcdfa526a9336f;hb=2fb1004864142e0424e64f61d2af297e76b062ba;hpb=07dc07c85b152542690f02d5a99930159c294c24
+
+diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/NewRepositoryWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/NewRepositoryWizard.java
+index fdaf17e..8d19737 100644
+--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/NewRepositoryWizard.java
++++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/NewRepositoryWizard.java
+@@ -32,6 +32,13 @@ public class NewRepositoryWizard extends Wizard implements INewWizard {
+ 	private Repository newRepo;
+ 
+ 	/**
++	 * Default constructor. Needed for File->New->Other->Git->Git Repository
++	 */
++	public NewRepositoryWizard(){
++		this(false);
++	}
++
++	/**
+ 	 * @param hideBareOption
+ 	 *            if <code>true</code>, no "bare" repository can be created
+ 	 */
diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 3ed9ca4..bb43fe4 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -11,6 +11,7 @@ Group:            Development/Tools
 
 # retrieved from http://egit.eclipse.org/w/?p=egit.git;a=snapshot;h=v1.1.0.201109151100-r;sf=tbz2
 Source0:          egit-v1.1.0.201109151100-r.tar.bz2
+Patch0:           NewRepositoryWizard.java.patch
 
 BuildRequires:    java-devel >= 1.6.0
 BuildRequires:    eclipse-pde
@@ -20,40 +21,37 @@ Requires:         eclipse-platform >= 1:3.5.0
 Requires:         eclipse-jgit >= 1.1.0
 
 BuildArch:        noarch
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The eclipse-egit package contains Eclipse plugins for
 interacting with Git repositories.
 
 %prep
-%setup -n eclipse-egit -q -c
-NR=$((`wc -l egit/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitCloneWizard.java | \
+%setup -n egit -q
+%patch0 -p1
+NR=$((`wc -l org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitCloneWizard.java | \
             cut -d' ' -f1` - 1))
-       tail -n$NR egit/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitCloneWizard.java > part2.java
+       tail -n$NR org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitCloneWizard.java > part2.java
 echo "/*******************************************************************************" > part1.java
-cat part1.java part2.java > egit/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitCloneWizard.java
+cat part1.java part2.java > org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitCloneWizard.java
 
 %build
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.egit -d jgit mylyn
 
 %install
-rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
 
 # egit main feature
 unzip -q -d $RPM_BUILD_ROOT%{install_loc}/ build/rpmBuild/org.eclipse.egit.zip
 
-%clean 
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %{install_loc}
-%doc egit/LICENSE
-%doc egit/README
+%doc LICENSE README
 
 %changelog
+* Fri Nov 18 2011 Alexander Kurtakov <akurtako at redhat.com> 1.1.0-1
+- Add patch to fix New git repo wizard.
+
 * Mon Jun 26 2011 Andrew Robinson <arobinso at redhat.com> 1.1.0-1
 - Update to upstream release 1.1.0.