From 5f9fb355e47cc4ace7d1737dde6d6408e202e4deb4b7c465bd47ff7947f025bb Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 17 Mar 2020 08:41:23 +0000
Subject: [PATCH 1/2] Accepting request 785842 from
 home:polslinux:branches:devel:tools:scm

- Update to new upstream release 1.2.3 (no changelog)
- Bump git to latest upstream release 2.25.1

OBS-URL: https://build.opensuse.org/request/show/785842
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/cgit?expand=0&rev=36
---
 cgit-1.2.1.tar.xz   |   3 ---
 cgit-1.2.3.tar.xz   |   3 +++
 cgit.changes        |   6 ++++++
 cgit.spec           |   4 ++--
 git-2.18.1.tar.sign | Bin 566 -> 0 bytes
 git-2.18.1.tar.xz   |   3 ---
 git-2.25.1.tar.sign | Bin 0 -> 566 bytes
 git-2.25.1.tar.xz   |   3 +++
 8 files changed, 14 insertions(+), 8 deletions(-)
 delete mode 100644 cgit-1.2.1.tar.xz
 create mode 100644 cgit-1.2.3.tar.xz
 delete mode 100644 git-2.18.1.tar.sign
 delete mode 100644 git-2.18.1.tar.xz
 create mode 100644 git-2.25.1.tar.sign
 create mode 100644 git-2.25.1.tar.xz

diff --git a/cgit-1.2.1.tar.xz b/cgit-1.2.1.tar.xz
deleted file mode 100644
index b89e98e..0000000
--- a/cgit-1.2.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c547c146340fb16d4134326e7524bfb28ffa681284f1e3914bde1c27a9182bf
-size 89648
diff --git a/cgit-1.2.3.tar.xz b/cgit-1.2.3.tar.xz
new file mode 100644
index 0000000..ba920bc
--- /dev/null
+++ b/cgit-1.2.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a5f12d2f66bd3629c8bc103ec8ec2301b292e97155d30a9a61884ea414a6da4
+size 90632
diff --git a/cgit.changes b/cgit.changes
index 895724e..2d62e9b 100644
--- a/cgit.changes
+++ b/cgit.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 17 08:30:09 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to new upstream release 1.2.3 (no changelog)
+- Bump git to latest upstream release 2.25.1
+
 -------------------------------------------------------------------
 Mon May 20 13:15:12 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/cgit.spec b/cgit.spec
index a18ae8f..6a93e47 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -16,9 +16,9 @@
 #
 
 
-%define git_version	2.18.1
+%define git_version	2.25.1
 Name:           cgit
-Version:        1.2.1
+Version:        1.2.3
 Release:        0
 Summary:        A web frontend for git repositories
 License:        GPL-2.0
diff --git a/git-2.18.1.tar.sign b/git-2.18.1.tar.sign
deleted file mode 100644
index 8686e4ca3b25bbf6411b3576f255a80b78ced36292a7bfb465e42cd2d8f2006e..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0$aBi`v3|F5U{oA
zhL*49%aJM%|77**`G!aOfo!k4!#-wN`Nux{{IP)iM86B0qig9sQ>y6IF)lyX7J)X4
zFY$rUETQ!aZ|v(cR{&QmrNpR&?yw23pIK;lnvb4U7)abZ0@py)*bJJL#0c%sINg$G
zRXWsNiV`HU_`wcx>fLImd9SgcvhY}M?3G^waIFPe$v2%-viK^?;320&4MH{$W`5j<
z1Y#3ct30R%D1vOb355ldGua4u<y^I&k7<ti*lm>Q4=azVylG*ekDOTuTX5xU!WIER
z#P$Emil!WEb!eX-N#L7;nEd!V>M?z$Fu^9d|GU(&RR|iK6(j%An-L(h4Z3&gE^m(H
ziJJK%a>o_~wh4UaYU~Q`wgHXPYs%&+aZg9Q_cyX~lZXN#rp$r?<Q|qK7-8ct&e+@g
z;&*(4P>fo#&P@^R;Jo2N?k)q2G6DZ}5W)&GZ*4f-IbW*@&eA)XR454HsUK$bcOuUK
z<0#~u^3_Q93te<Sw`3815tIrx$2g4TvW{IM$OC+^JqZ1a$l@v8SmqOrM+}OHVj6T#
zD-De2g@@spW>H|(eQ{d*BeI%qJk`jYTk8>=i)_Z3p`oei-g34yRRW{v6KEDE3E-+u
z43<2w?mglH{E)v2vM)i4{9p_1$HvddoZ12xQW2g1IIp84Gw*c(&2iZ#iVY^@gz;2r
ENn^JdhyVZp

diff --git a/git-2.18.1.tar.xz b/git-2.18.1.tar.xz
deleted file mode 100644
index 081e0d9..0000000
--- a/git-2.18.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:888504a45cb70a002258374b3add9b5cdc044c35edd5976ab8bbeec4800898b6
-size 5102812
diff --git a/git-2.25.1.tar.sign b/git-2.25.1.tar.sign
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..25b110271fe5bc4b28fe631864eaff3e024cd59358cc7897f900be0c8e0ca571
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c<k@6wdjVHujb1I0$xfRr~nEH5U{oA
zhL*49%R`3`|94NoD)L5A&HR_Qh9jj6-!J!?<LZ2I2%476<%?CHwn+Wg@kLX)dOp%t
zPnu?kpGzeadKY288&7K!KlhZrB8cS>D+bV}|I6E4dG%!h2#}Z>Ly3uEU6kplQoV~_
z-r+K#*J5<#<nahwa7@K|cMZbY4_tu-O!FpU!&L-RzPf5}r1HeH?G@<~*%e}BZc;K>
zL*<R@q;Z^0_ZR7};MqW&-u{;Ar6<bMfJz&m$gZrjV{V%?K)wL}<D5H8gbl>;ng5gB
z){J7-1&|VWK+6g!?1|(HjQl6K=Q@3lRLPmVj~UY~s!Bf5i~n>G@TVD&RkjN^$_L%M
zIA2aV!4>+#eXsTU17o=kYA!^fnh){r2ijhWm`_`8Q{v-xM+RWCyBm0bC5FE}VvYC!
zox=Agf`Hp3*xK}E2tc(;?J>_hDbtv#(9d`og@w9ZL*&S{13&L0E)->W3xwkjM%A-&
zl5A0)hru<2KiS3+p|Ms%#QZ->Z%;;85NpOLJ^m6``ng9LC6ZrrgGQ{D!2xX{p}0MV
zZwk0IBK=|T<LJWu5KSf?&n}D`rb24=0jBS)*JFJykw4Z|9W1qmZ-7s$Wc~?;H8E*U
z-q-!AL^-&U@6p$t+-BuDc>09xnJlb)931M6@~mIz@<dc4tG>Ktt0$aufxGI>#E00K
EVVQ&;p#T5?

literal 0
HcmV?d00001

diff --git a/git-2.25.1.tar.xz b/git-2.25.1.tar.xz
new file mode 100644
index 0000000..226a79a
--- /dev/null
+++ b/git-2.25.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:222796cc6e3bf2f9fd765f8f097daa3c3999bb7865ac88a8c974d98182e29f26
+size 5875548

From 2bdb219d2404aebe7b328bbef308adcbf0fd0f9a07588d1fcdb1b1e2de7460bf Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 17 Mar 2020 08:45:02 +0000
Subject: [PATCH 2/2] add changelog

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/cgit?expand=0&rev=37
---
 cgit.changes | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cgit.changes b/cgit.changes
index 2d62e9b..4c0f025 100644
--- a/cgit.changes
+++ b/cgit.changes
@@ -1,7 +1,9 @@
 -------------------------------------------------------------------
 Tue Mar 17 08:30:09 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
 
-- Update to new upstream release 1.2.3 (no changelog)
+- Update to new upstream release 1.2.3
+  * Offer lzip and zstd as compression methods through the webui.
+  * ui-tree: allow per repository override for enable-blame.
 - Bump git to latest upstream release 2.25.1
 
 -------------------------------------------------------------------