From ae6b80601993c61046b2607f4b6873763fbbe070e5c77805ae666fdc59dc734d Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 6 Oct 2015 10:01:12 +0000
Subject: [PATCH] - Update bundled git tarball to 2.6.1 [bnc#948969]

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/cgit?expand=0&rev=24
---
 cgit.changes       |   5 +++++
 cgit.spec          |   8 ++++----
 git-2.5.3.tar.sign | Bin 543 -> 0 bytes
 git-2.5.3.tar.xz   |   3 ---
 git-2.6.1.tar.sign | Bin 0 -> 543 bytes
 git-2.6.1.tar.xz   |   3 +++
 6 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 git-2.5.3.tar.sign
 delete mode 100644 git-2.5.3.tar.xz
 create mode 100644 git-2.6.1.tar.sign
 create mode 100644 git-2.6.1.tar.xz

diff --git a/cgit.changes b/cgit.changes
index 0ec9d8f..3083196 100644
--- a/cgit.changes
+++ b/cgit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  6 09:59:22 UTC 2015 - jengelh@inai.de
+
+- Update bundled git tarball to 2.6.1 [bnc#948969]
+
 -------------------------------------------------------------------
 Thu Sep 24 14:47:29 UTC 2015 - jengelh@inai.de
 
diff --git a/cgit.spec b/cgit.spec
index 7733fa9..c025e3d 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define git_version	2.5.3
+%define git_version	2.6.1
 
 Name:           cgit
 Version:        0.11.2
@@ -67,8 +67,8 @@ make install install-man DESTDIR="%buildroot" prefix="%_prefix" \
 mkdir -p "%buildroot/srv/www/cgi-bin/cgit/"
 mv "%{buildroot}"/srv/www/{htdocs,cgi-bin}/cgit/cgit.cgi
 
-mkdir -p "%{buildroot}"/etc
-cp %{SOURCE9} "%{buildroot}"/etc/cgitrc
+mkdir -p "%buildroot/%_sysconfdir"
+cp %{SOURCE9} "%buildroot/%_sysconfdir/cgitrc"
 
 %files
 %defattr(-,root,root)
@@ -77,6 +77,6 @@ cp %{SOURCE9} "%{buildroot}"/etc/cgitrc
 /srv/www/cgi-bin/cgit/
 /srv/www/htdocs/cgit/
 /usr/lib/cgit/
-%config(noreplace) /etc/cgitrc
+%config(noreplace) %_sysconfdir/cgitrc
 
 %changelog
diff --git a/git-2.5.3.tar.sign b/git-2.5.3.tar.sign
deleted file mode 100644
index 1e5553ab5aad31ff7e111b09710fa0232ad50fedf30621f6de368923076bf392..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 543
zcmV+)0^t3L0vrSY0RjL91p-z3HA?^r2@tTg=!TZB=F2L$5CEZCmZnhhN@hW@1#T3x
z9d6$KX3+|nKzIAv^8TriU$oE-lU)VSz=+POhJk*<OXcZ{wJu*>G0jqww598Fw;3@{
zN`8zL*ewhB%W#X<*IKnjY^O6!?d8!HB8n{{C}He9oOHdYq%8^R9One*RARlm;Suc6
z`4+XH*_aM&bg372X$6aiA%T)o9pkC~zuZ*keeR9?jsFl+EE5K##He#Po?+vhNBl~T
zL>4F-_^Tb}8si~AZ<_>Gt9}ILD9A8T#G}OvY8fXLh7Ii3`Umzs<@*!Lxe);UPOwoR
z-{wF>^D<Z1PI=!Owc5khRxs5KTPqr%hlIy7e<FV;epVmosLL4<W4&VZ_Gjo%-hoY8
zM4N>P6es`xEYvDAW}!Uw75QUI8r9?yLSQZZQqL$bKFvHx7hLr6(|e+rL>AcpAW~S-
zOj!WC2%F4pZL1#Fu<FnR0~gfln^Ll33%hJH%8Om&!h{_^K41n|<nYEe&8dwDNb%=T
zb&vRW^yTBy5>$NAZUh|`vmyA~GcNY0S47UaO0*!f1bDLWw~JQNO0rqUQmGFuoM1~6
z+k@|j@r~8G^TVA;?Pix6|9DPl(fW0JF5FZGvjYJ2jytAcUf{p(d<_TdAD1xnb%r9L
hzpv!1m6^K&ZO*t(u2e!6tu%MS!0RY?bFQowfj{pN3Y`D|

diff --git a/git-2.5.3.tar.xz b/git-2.5.3.tar.xz
deleted file mode 100644
index b3abe4c..0000000
--- a/git-2.5.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:124d29d857a1282fd2111cf4a021f156e8bae917f455b4551b2aea87f0453a1a
-size 3745096
diff --git a/git-2.6.1.tar.sign b/git-2.6.1.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..3a3105a889a7d029a2ea10b919cb9c1548b228b86472429d58bc091524c227dd
GIT binary patch
literal 543
zcmV+)0^t3L0vrSY0RjL91p-zN3E%(<2@tTg=!TZB=F5MX5C3r21v^&;G)^!cO!Jnq
z%_U_WdMnQ3aS-QcL$>1VCyR<`853|PAHf^YpxOc0Ws9SLoWE?4DE*jb_6Qh%{AHB+
zEx$U9rEu;U8XKc=0fs{H1%QxHHeQhAGi-b_ppH1V0$EQ*HWwiK%Q|a#WV=kD+ct)o
zGp7KrgG|d~WPSq6(L=6<u374a?b?9(-T$sFR7ao1>L#s!-S1+hCV5~~GHp_DEhd*-
zzZQXXf9ju+w=fIn)63ROS+VbKB5PTfas&a0P8eDsefgTdZ(sC&BVLJl5s#{%HIN%{
zLKOr;hcp%U1z48V`jb(`d0AW*Rq~d|hGq%DCvZQYM5hbe&KT-(&=n?T^M-w)|Mm@p
zLI=_GhI>b$i!~RZcG8M##@OQ@g|X)pF?E~NbdquZ>2qlB>QZD-vYnvEVr5F;n2uzc
zh@AaCd6znE%K6RUWA|Pxv*b`84@uN?csG$uL%5>j@XeveWID}<oZdKU3}OG=s_7wm
z6{pwUWgY2w>Mw?m>o)Et-xSDJQaSWZR_;SfwDCh*f!4Mszm}kq&-E6`2d@pu7YtvO
zeK%kWL;I^O9!$yAIv0@K<<~X&{*Sr6C#$O5`8&TtMPrbYpj&AF#tn@x2Nd+B=dJNm
hYy>V8i^?eO&4-x+-jGz%X8GDY<1O%!%nnbw(_3#v3fBMt

literal 0
HcmV?d00001

diff --git a/git-2.6.1.tar.xz b/git-2.6.1.tar.xz
new file mode 100644
index 0000000..023ac4f
--- /dev/null
+++ b/git-2.6.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc7c727745d5eb0d796a16dc7c4b999c184830110e0aeb592c788597cc8e9ccd
+size 3811268