[eclipse-egit/f17: 2/3] - Fix 1.3.0 which was previously using wrong sources. - Fix JGit BR/R since EGit depends on the same

jerboaa jerboaa at fedoraproject.org
Thu Apr 26 20:06:12 UTC 2012


commit fc16f0fd2251b0f3209152537cc329c5a8290ef3
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Apr 26 15:35:45 2012 -0400

    - Fix 1.3.0 which was previously using wrong sources.
    - Fix JGit BR/R since EGit depends on the same version of JGit.

 .gitignore        |    2 ++
 eclipse-egit.spec |   17 ++++++++++-------
 sources           |    2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9dde826..5339772 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ egit*.bz2
 egit-v1.1.0.201109151100-r.tar.bz2
 egit-b1bbfd4ce7d321df35cd2320309129a8692fcc90.tar.bz2
 egit-0658d4b95b5de54c58bd3b4ee137fb0b0fa8cd3c.tar.bz2
+egit-6ac365c0577dcc2332a074df0653b386ac4b0eb9.tar.bz2
+egit-1.3.0.201202151440-r.tar.bz2
diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 6814216..a8ebf1d 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -4,21 +4,20 @@
 Summary:          Eclipse Git Integration
 Name:             eclipse-egit
 Version:          1.3.0
-Release:          1%{?dist}
+Release:          2%{?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=0658d4b95b5de54c58bd3b4ee137fb0b0fa8cd3c;sf=tbz2
-Source0:          egit-0658d4b95b5de54c58bd3b4ee137fb0b0fa8cd3c.tar.bz2
+# retrieved from http://git.eclipse.org/c/cbi/egit.git/snapshot/egit-1.3.0.201202151440-r.tar.bz2
+Source0:          egit-1.3.0.201202151440-r.tar.bz2
 Patch0:           encoding-fix.patch
 
 BuildRequires:    java-devel >= 1.6.0
 BuildRequires:    eclipse-pde
-BuildRequires:    eclipse-jgit >= 1.1.0
+BuildRequires:    eclipse-jgit >= 1.3.0
 BuildRequires:    jpackage-utils >= 0:1.5
 Requires:         eclipse-platform >= 1:3.5.0
-Requires:         eclipse-jgit >= 1.1.0
+Requires:         eclipse-jgit >= 1.3.0
 
 BuildArch:        noarch
 
@@ -27,7 +26,7 @@ The eclipse-egit package contains Eclipse plugins for
 interacting with Git repositories.
 
 %prep
-%setup -n egit -q
+%setup -n egit-1.3.0.201202151440-r -q
 %patch0 -p1
 
 %build
@@ -44,6 +43,10 @@ unzip -q -d $RPM_BUILD_ROOT%{install_loc}/ build/rpmBuild/org.eclipse.egit.zip
 %doc LICENSE README
 
 %changelog
+* Thu Apr 26 2012 Severin Gehwolf <sgehwolf at redhat.com> 1.3.0-2
+- Fix 1.3.0 which was previously using wrong sources.
+- Fix JGit BR/R since EGit depends on the same version of JGit.
+
 * Fri Feb 17 2012 Andrew Robinson <arobinso at redhat.com> 1.3.0-1
 - Update to 1.3.0 upstream release.
 
diff --git a/sources b/sources
index 22042db..1659401 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2cf4ea1bc84b3afa5b67f0600f358ca5  egit-0658d4b95b5de54c58bd3b4ee137fb0b0fa8cd3c.tar.bz2
+89ac7482fecbdcfc73369360290ab719  egit-1.3.0.201202151440-r.tar.bz2


More information about the scm-commits mailing list