[eclipse-egit] Update to upstream 1.2.0.

Alexander Kurtakov akurtakov at fedoraproject.org
Thu Jan 5 14:40:02 UTC 2012


commit b169cd5d1cbc84f14308e132cf672840e642d852
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Jan 5 16:39:44 2012 +0200

    Update to upstream 1.2.0.

 .gitignore                     |    1 +
 NewRepositoryWizard.java.patch |   20 --------------------
 eclipse-egit.spec              |   20 ++++++++------------
 sources                        |    1 +
 4 files changed, 10 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5235d1d..46ce8f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 egit*.bz2
 egit-v1.1.0.201109151100-r.tar.bz2
+egit-b1bbfd4ce7d321df35cd2320309129a8692fcc90.tar.bz2
diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 2a61eb8..6334c01 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -3,15 +3,14 @@
 
 Summary:          Eclipse Git Integration
 Name:             eclipse-egit
-Version:          1.1.0
-Release:          2%{?dist}
+Version:          1.2.0
+Release:          1%{?dist}
 License:          EPL
 URL:              http://www.eclipse.org/egit
 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
+# retrieved from http://egit.eclipse.org/w/?p=egit.git;a=snapshot;h=b1bbfd4ce7d321df35cd2320309129a8692fcc90;sf=tbz2
+Source0:          egit-b1bbfd4ce7d321df35cd2320309129a8692fcc90.tar.bz2
 
 BuildRequires:    java-devel >= 1.6.0
 BuildRequires:    eclipse-pde
@@ -28,15 +27,9 @@ interacting with Git repositories.
 
 %prep
 %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 org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitCloneWizard.java > part2.java
-echo "/*******************************************************************************" > part1.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
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.egit -d "jgit mylyn"
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
@@ -49,6 +42,9 @@ unzip -q -d $RPM_BUILD_ROOT%{install_loc}/ build/rpmBuild/org.eclipse.egit.zip
 %doc LICENSE README
 
 %changelog
+* Thu Jan 5 2012 Alexander Kurtakov <akurtako at redhat.com> 1.2.0-1
+- Update to upstream 1.2.0.
+
 * Fri Nov 18 2011 Alexander Kurtakov <akurtako at redhat.com> 1.1.0-2
 - Add patch to fix New git repo wizard.
 
diff --git a/sources b/sources
index 8f8ee23..7bff0b8 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 9ccdbda7b486084dfcc005e678431cca  egit-v1.1.0.201109151100-r.tar.bz2
+796b6f3991a548f62551b3f8427f8d6f  egit-b1bbfd4ce7d321df35cd2320309129a8692fcc90.tar.bz2


More information about the scm-commits mailing list