[eclipse-egit/f17] Update to 1.3.0 upstream release.
Andrew Robinson
arobinso at fedoraproject.org
Tue Mar 13 14:09:46 UTC 2012
commit c40a5d2f9aa006e0c9e6dbd3b2956a0832849030
Author: Andrew Robinson <arobinso at redhat.com>
Date: Tue Feb 21 17:16:38 2012 -0500
Update to 1.3.0 upstream release.
.gitignore | 1 +
eclipse-egit.spec | 13 +++++++++----
encoding-fix.patch | 20 ++++++++++++++++++++
sources | 3 +--
4 files changed, 31 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46ce8f0..9dde826 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
egit*.bz2
egit-v1.1.0.201109151100-r.tar.bz2
egit-b1bbfd4ce7d321df35cd2320309129a8692fcc90.tar.bz2
+egit-0658d4b95b5de54c58bd3b4ee137fb0b0fa8cd3c.tar.bz2
diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 6334c01..6814216 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -3,14 +3,15 @@
Summary: Eclipse Git Integration
Name: eclipse-egit
-Version: 1.2.0
+Version: 1.3.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=b1bbfd4ce7d321df35cd2320309129a8692fcc90;sf=tbz2
-Source0: egit-b1bbfd4ce7d321df35cd2320309129a8692fcc90.tar.bz2
+# retrieved from http://egit.eclipse.org/w/?p=egit.git;a=snapshot;h=0658d4b95b5de54c58bd3b4ee137fb0b0fa8cd3c;sf=tbz2
+Source0: egit-0658d4b95b5de54c58bd3b4ee137fb0b0fa8cd3c.tar.bz2
+Patch0: encoding-fix.patch
BuildRequires: java-devel >= 1.6.0
BuildRequires: eclipse-pde
@@ -27,9 +28,10 @@ interacting with Git repositories.
%prep
%setup -n egit -q
+%patch0 -p1
%build
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.egit -d "jgit mylyn"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.egit -d "jgit"
%install
install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
@@ -42,6 +44,9 @@ unzip -q -d $RPM_BUILD_ROOT%{install_loc}/ build/rpmBuild/org.eclipse.egit.zip
%doc LICENSE README
%changelog
+* Fri Feb 17 2012 Andrew Robinson <arobinso at redhat.com> 1.3.0-1
+- Update to 1.3.0 upstream release.
+
* Thu Jan 5 2012 Alexander Kurtakov <akurtako at redhat.com> 1.2.0-1
- Update to upstream 1.2.0.
diff --git a/encoding-fix.patch b/encoding-fix.patch
new file mode 100644
index 0000000..7aa4145
--- /dev/null
+++ b/encoding-fix.patch
@@ -0,0 +1,20 @@
+diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitLabelProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitLabelProvider.java
+index 3bf8cae..44dec5c 100644
+--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitLabelProvider.java
++++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/GitLabelProvider.java
+@@ -67,13 +67,13 @@ public static String formatBranchTrackingStatus(BranchTrackingStatus status) {
+ int ahead = status.getAheadCount();
+ int behind = status.getBehindCount();
+ if (ahead != 0) {
+- sb.append('↑');
++ sb.append('\u2191');
+ sb.append(ahead);
+ }
+ if (behind != 0) {
+ if (sb.length() != 0)
+ sb.append(' ');
+- sb.append('↓');
++ sb.append('\u2193');
+ sb.append(status.getBehindCount());
+ }
+ return sb.toString();
diff --git a/sources b/sources
index 7bff0b8..22042db 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-9ccdbda7b486084dfcc005e678431cca egit-v1.1.0.201109151100-r.tar.bz2
-796b6f3991a548f62551b3f8427f8d6f egit-b1bbfd4ce7d321df35cd2320309129a8692fcc90.tar.bz2
+2cf4ea1bc84b3afa5b67f0600f358ca5 egit-0658d4b95b5de54c58bd3b4ee137fb0b0fa8cd3c.tar.bz2
More information about the scm-commits
mailing list