From ba716b33f6313b2c59e965f0107556e1798acc899c585f4ad77687471e277965 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 5 Aug 2018 16:56:33 +0000
Subject: [PATCH] - Remove cgit-built-with-git-v2.11.0.patch (merged upstream)

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/cgit?expand=0&rev=33
---
 cgit-built-with-git-v2.11.0.patch | 27 ---------------------------
 cgit.changes                      |  1 +
 cgit.spec                         |  8 ++++----
 3 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 cgit-built-with-git-v2.11.0.patch

diff --git a/cgit-built-with-git-v2.11.0.patch b/cgit-built-with-git-v2.11.0.patch
deleted file mode 100644
index 01a2309..0000000
--- a/cgit-built-with-git-v2.11.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 91153fd02e62f2eaca8e6c140baa4f2abf39c40e Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail@eworm.de>
-Date: Wed, 30 Nov 2016 10:43:08 +0100
-Subject: git: update to v2.11.0
-
-Update to git version v2.11.0. Function write_archive()
-dropped argument (int setup_prefix).
----
-
- ui-snapshot.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ui-snapshot.c b/ui-snapshot.c
-index 08c6e80..9b8cddd 100644
---- a/ui-snapshot.c
-+++ b/ui-snapshot.c
-@@ -37,7 +37,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
- 	/* argv_array guarantees a trailing NULL entry. */
- 	memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
-
--	result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0);
-+	result = write_archive(argv.argc, nargv, NULL, NULL, 0);
- 	argv_array_clear(&argv);
- 	free(nargv);
- 	return result;
---
-cgit v1.1-3-g9641
diff --git a/cgit.changes b/cgit.changes
index c1eaa19..817f17b 100644
--- a/cgit.changes
+++ b/cgit.changes
@@ -7,6 +7,7 @@ Sun Aug  5 16:24:56 UTC 2018 - jengelh@inai.de
   * syntax-highlighting: replace invalid unicode with '?'
   * ui-repolist: properly sort by age
   * ui-patch: fix crash when using path limit
+- Remove cgit-built-with-git-v2.11.0.patch (merged upstream)
 
 -------------------------------------------------------------------
 Sat Feb 11 17:56:42 UTC 2017 - jengelh@inai.de
diff --git a/cgit.spec b/cgit.spec
index 42bd5f8..f01ac7a 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -30,8 +30,7 @@ Source2:        https://www.kernel.org/pub/software/scm/git/git-%git_version.tar
 Source3:        https://www.kernel.org/pub/software/scm/git/git-%git_version.tar.sign
 Source4:        %name.keyring
 Source9:        cgitrc
-Patch0:         cgit-optflags.diff
-Patch1:         cgit-built-with-git-v2.11.0.patch
+Patch1:         cgit-optflags.diff
 # Requirements for cgitrc man page generation
 BuildRequires:  asciidoc
 # Requirements for cgit
@@ -47,12 +46,13 @@ I/O pressure.
 
 %prep
 %setup -qa2
-%patch0 -p1
-%patch1 -p1
+%patch -P 1 -p1
 rm -rf git
 ln -s git-%git_version git
 
 %build
+perl -i -pe 's{^#!/usr/bin/env }{#!/usr/bin/}g' filters/email-gravatar.py \
+	filters/html-converters/md2html filters/syntax-highlighting.py
 make V=1 prefix="%_prefix" %{?_smp_mflags}
 
 %install