Update to 1.2

Remove extra '/' from git source URL.

3 files changed, 9 insertions, 72 deletions

diff --git a/0001-Makefile-drive-asciidoc-directly-for-HTML-output.patch b/0001-Makefile-drive-asciidoc-directly-for-HTML-output.patch
deleted file mode 100644
index ed8e67f..0000000
--- a/0001-Makefile-drive-asciidoc-directly-for-HTML-output.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 717418aab9314931fcfb3dfd7d31000321d854b1 Mon Sep 17 00:00:00 2001
-From: John Keeping <john@keeping.me.uk>
-Date: Sat, 16 Jun 2018 13:11:09 +0100
-Subject: [PATCH] Makefile: drive asciidoc directly for HTML output
-
-This is mostly taken from Git's doc/Makefile, although simplified for
-our use.  The output now uses Asciidoc's default CSS which I think looks
-a bit nicer than the Docbook formatting; as a result of this we no
-longer need our custom .css file.
-
-A side effect of this change is that temporary files generated from the
-HTML output no longer conflict with the manpage output format (because
-any temporary HTML output files use names derived from the output
-filename which includes .html).
-
-Signed-off-by: John Keeping <john@keeping.me.uk>
----
- Makefile     | 9 ++++++++-
- cgit-doc.css | 3 ---
- 2 files changed, 8 insertions(+), 4 deletions(-)
- delete mode 100644 cgit-doc.css
-
-diff --git a/Makefile b/Makefile
-index 1ab2905..a678a14 100644
---- a/Makefile
-+++ b/Makefile
-@@ -24,6 +24,12 @@ DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
- DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
- DOC_PDF  = $(patsubst %.txt,%.pdf,$(MAN_TXT))
- 
-+ASCIIDOC = asciidoc
-+ASCIIDOC_EXTRA =
-+ASCIIDOC_HTML = xhtml11
-+ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA)
-+TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
-+
- # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
- # do not support the 'size specifiers' introduced by C99, namely ll, hh,
- # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
-@@ -134,7 +140,8 @@ doc-pdf: $(DOC_PDF)
- 	a2x -f manpage $<
- 
- $(DOC_HTML): %.html : %.txt
--	a2x -f xhtml --stylesheet=cgit-doc.css $<
-+	$(TXT_TO_HTML) -o $@+ $< && \
-+	mv $@+ $@
- 
- $(DOC_PDF): %.pdf : %.txt
- 	a2x -f pdf cgitrc.5.txt
-diff --git a/cgit-doc.css b/cgit-doc.css
-deleted file mode 100644
-index 5a399b6..0000000
---- a/cgit-doc.css
-+++ /dev/null
-@@ -1,3 +0,0 @@
--div.variablelist dt {
--	margin-top: 1em;
--}
--- 
-2.18.0.rc2
-
diff --git a/cgit.spec b/cgit.spec
index 41f98bc..8a1f74e 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -1,7 +1,7 @@
 # Review bug: https://bugzilla.redhat.com/479723
 
 # Defaults
-%global gitver      2.10.2
+%global gitver      2.18.0
 %global cachedir    %{_localstatedir}/cache/%{name}
 %global filterdir   %{_libexecdir}/%{name}/filters
 %global scriptdir   %{_localstatedir}/www/cgi-bin
@@ -33,25 +33,20 @@
 %endif
 
 Name:           cgit
-Version:        1.1
-Release:        12%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        A fast web interface for git
 
 License:        GPLv2
 URL:            https://git.zx2c4.com/cgit/
 Source0:        https://git.zx2c4.com/cgit/snapshot/%{name}-%{version}.tar.xz
-Source1:        https://www.kernel.org/pub/software/scm/git//git-%{gitver}.tar.xz
+Source1:        https://www.kernel.org/pub/software/scm/git/git-%{gitver}.tar.xz
 Source2:        cgitrc
 Source3:        README.SELinux
 
 # All supported releases use highlight version 3.
 Patch0:         cgit-0.9.1-highlightv3.patch
 
-# fix parallel make issues in docs
-# https://git.zx2c4.com/cgit/patch/?id=48f1750
-# https://lists.zx2c4.com/pipermail/cgit/2018-June/003861.html
-Patch1:         0001-Makefile-drive-asciidoc-directly-for-HTML-output.patch
-
 # Security guys might try to repoquery for this.
 Provides:       bundled(git) = %gitver
 
@@ -176,6 +171,9 @@ make test
 
 
 %changelog
+* Fri Jul 13 2018 Todd Zullinger <tmz@pobox.com> - 1.2-1
+- Update to 1.2
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 5cb7672..21799ab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (git-2.10.2.tar.xz) = 0ab09de481dbb31c3304382afaa5d3fc9f861115c9954c65b11a8a1c34b939118c7ed3ff60ac329145888596388e3e4d2b2fb677fe109d33a57206d531b5ee6a
-SHA512 (cgit-1.1.tar.xz) = 8f2ec418716d7a6f0880a713b622f2ee41217dc2d5462903841d59d978a021a8bc2be667ca65c25baee2b9dcd4a76bddd0c813bda0486109cc694e7610827051
+SHA512 (cgit-1.2.tar.xz) = efcc99aa49851c4373065d1e5a01b9eb1df1f2f7cbf8bdfede2d8b76787735e94f157589a8dfe57eaf3057ad53a1b4ada2fb2f69332df2a3496a21825dac9329
+SHA512 (git-2.18.0.tar.xz) = db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46