[qgit] update for git 1.7.5 (#708251)

[Dan Horák]

commit 203d03d5f2f802577432e241b1a0985f81cd1713
Author: Dan Horák <dan at danny.cz>
Date:   Fri May 27 11:24:38 2011 +0200

    update for git 1.7.5 (#708251)

 qgit-2.3-repo-config.patch |   35 +++++++++++++++++++++++++++++++++++
 qgit.spec                  |    7 ++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/qgit-2.3-repo-config.patch b/qgit-2.3-repo-config.patch
new file mode 100644
index 0000000..dd636d0
--- /dev/null
+++ b/qgit-2.3-repo-config.patch
@@ -0,0 +1,35 @@
+From ef9d869bd49c9ad1794ee9018c9a304268386a72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Fri, 27 May 2011 10:11:08 +0200
+Subject: [PATCH] git repo-config depreciated
+
+git repo-config is depreciated in git 1.7.5, use git config instead.
+---
+ src/git.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/git.cpp b/src/git.cpp
+index 50e6dd3..8e9365c 100644
+--- a/src/git.cpp
++++ b/src/git.cpp
+@@ -427,7 +427,7 @@ void Git::setTextCodec(QTextCodec* tc) {
+ 	if (name == "Big5-HKSCS")
+ 		name = "Big5";
+ 
+-	run("git repo-config i18n.commitencoding " + name);
++	run("git config i18n.commitencoding " + name);
+ }
+ 
+ QTextCodec* Git::getTextCodec(bool* isGitArchive) {
+@@ -437,7 +437,7 @@ QTextCodec* Git::getTextCodec(bool* isGitArchive) {
+ 		return NULL;
+ 
+ 	QString runOutput;
+-	if (!run("git repo-config --get i18n.commitencoding", &runOutput))
++	if (!run("git config --get i18n.commitencoding", &runOutput))
+ 		return NULL;
+ 
+ 	if (runOutput.isEmpty()) // git docs says default is utf-8
+-- 
+1.7.4.4
+
diff --git a/qgit.spec b/qgit.spec
index 3e9f530..8112a2a 100644
--- a/qgit.spec
+++ b/qgit.spec
@@ -1,6 +1,6 @@
 Name:           qgit
 Version:        2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GUI browser for git repositories
 
 Group:          Development/Tools
@@ -10,6 +10,7 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Source1:        %{name}.desktop
 Source2:        %{name}48d.png
 Patch0:         %{name}-2.3-qmake.patch
+Patch1:         %{name}-2.3-repo-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, qt4-devel 
@@ -22,6 +23,7 @@ and changed files, graphically following different development branches.
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .qmake
+%patch1 -p1 -b .repo-config
 
 # fix permissions
 chmod a-x src/*.{cpp,h}
@@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri May 27 2011 Dan Horák <dan[at]danny.cz> - 2.3-4
+- update for git 1.7.5 (#708251)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild