From 128146fb4a7497982fdd7e15e4538e0e06bc6092 Mon Sep 17 00:00:00 2001
From: Josef Ridky <jridky@redhat.com>
Date: Jun 06 2018 07:57:08 +0000
Subject: Fix versioning, URL and Source labels to align with Fedora Packaging Guidelines


---

diff --git a/.gitignore b/.gitignore
index 88767e5..972f3fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 asciidoc-8.4.5.tar.gz
 /asciidoc-8.6.8.tar.gz
+/asciidoc-8.6.10.tar.gz
diff --git a/asciidoc.spec b/asciidoc.spec
index 1c4a082..199802f 100644
--- a/asciidoc.spec
+++ b/asciidoc.spec
@@ -1,15 +1,22 @@
 %global vimdir %{_datadir}/vim/vimfiles
+%global commit 986f99d743d0b6ddc2014bdc8dcfa991ab9b4863
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Summary: Text based document generation
 Name: asciidoc
-Version: 8.6.8
-Release: 16.986f99d%{?dist}
+Version: 8.6.10
+Release: 0.1.20180605git%{shortcommit}%{?dist}
 # The python code does not specify a version.
 # The javascript example code is GPLv2+.
 License: GPL+ and GPLv2+
 
-URL: http://www.methods.co.nz/asciidoc/
-Source: http://sourceforge.net/projects/asciidoc/files/%{name}/%{version}/%{name}-%{version}.tar.gz
+URL: http://asciidoc.org
+# Tarball name has to be modified, due github repo 
+# is called asciidoc-py3 instead of asciidoc
+# This solution is temporary, due upstream 
+# haven't released 8.6.10 version yet.
+# https://github.com/%%{name}/%%{name}-py3/archive/%%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
 
 Patch1: asciidoc-python3.patch
 
@@ -26,7 +33,7 @@ BuildRequires: vim-filesystem
 BuildRequires: symlinks
 BuildRequires: automake
 BuildRequires: autoconf
-BuildRequires: ImageMagick 
+BuildRequires: ImageMagick
 
 Requires: python3
 Requires: docbook-style-xsl
@@ -74,7 +81,7 @@ Requires: lilypond
 sed -i "s/\r//g" COPYRIGHT
 
 # Convert CHANGELOG and README to utf-8
-for file in CHANGELOG README.asciidoc; do
+for file in README.asciidoc; do
     iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
     touch -r $file $file.new && \
     mv $file.new $file
@@ -166,9 +173,10 @@ cd tests
 %{_sysconfdir}/asciidoc/filters/music/*.conf
 %{_sysconfdir}/asciidoc/filters/music/*.py
 
-
-
 %changelog
+* Wed Jun 06 2018 Josef Ridky <jridky@redhat.com> - 8.6.10-0.1.20180605git986f99d
+- Fix versioning, Source and Url label information to align with Fedora Packaging Guidelines
+
 * Tue Jun 05 2018 Josef Ridky <jridky@redhat.com> - 8.6.8-16.986f99d
 - New upstream version with Python3 support - asciidoc-py3 (commit 986f99d)
 
diff --git a/sources b/sources
index 4fe482b..56df5aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (asciidoc-8.6.8.tar.gz) = 70eb66e60da77f8fa63fd02c0b4da84fec74946d6eeaf42545ea7f2b63781a387ad1c0c2d0496a14ad7edf8d3ad15c216795049ea009264da87675dfeb6ea696
+SHA512 (asciidoc-8.6.10.tar.gz) = f195d9cf2a66a67b038c6ddb3207573ec3f4e3baa1b107a56f5dd26580c8d7f1fc92c20011a0193ff0781b4b04e7e22b1f7991c4b0046e47acc634c3d2cd3b98