From 2b9716f8a2f3e4a9fd72856bb4bbae056a4f2f59 Mon Sep 17 00:00:00 2001
From: Dan Horák <dan@danny.cz>
Date: Jun 05 2019 16:21:37 +0000
Subject: - updated to 0.19

- drop upstreamed patch
- switch to Python3

---

diff --git a/.gitignore b/.gitignore
index 0d334cb..a6fd5b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /stgit-0.18.tar.gz
+/stgit-0.19.tar.gz
diff --git a/sources b/sources
index ff987e1..e5ca00b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stgit-0.18.tar.gz) = 5820cc1a8cdd5183fbe309b4b80568098844ff57934c75a43263b5cfcdac4b64e015abc9ed6a53dd856236d76bd0ebeec31e87561bca0d0d82a6e5ec7a10745f
+SHA512 (stgit-0.19.tar.gz) = 6b4f184b91614961d759e8abd505856d74354e7d269d013a448e6795ecb35054277c319ee97f1df9bee3ed4861b70090133ed4f156c96908c2182ed4652304ba
diff --git a/stgit-0.16-tmpl.patch b/stgit-0.16-tmpl.patch
deleted file mode 100644
index fee55b9..0000000
--- a/stgit-0.16-tmpl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur stgit-0.16.orig/stgit/commands/common.py stgit-0.16/stgit/commands/common.py
---- stgit-0.16.orig/stgit/commands/common.py	2012-01-09 22:12:42.000000000 +0100
-+++ stgit-0.16/stgit/commands/common.py	2012-12-04 19:04:52.193722114 +0100
-@@ -23,7 +23,7 @@
- from stgit.utils import *
- from stgit.out import *
- from stgit.run import *
--from stgit import stack, git, basedir
-+from stgit import stack, git, basedir, templates
- from stgit.config import config, file_extensions
- from stgit.lib import stack as libstack
- from stgit.lib import git as libgit
-@@ -499,6 +499,9 @@
-     # Let user edit the commit message manually, unless
-     # --save-template or --message was specified.
-     if not getattr(options, 'save_template', None) and options.message is None:
-+        tmpl = templates.get_template('patchdescr.tmpl')
-+        if tmpl:
-+            cd = cd.set_message(cd.message + tmpl)
-         cd = cd.set_message(edit_string(cd.message, '.stgit-new.txt'))
- 
-     return cd
diff --git a/stgit.spec b/stgit.spec
index 67f976a..0aa079a 100644
--- a/stgit.spec
+++ b/stgit.spec
@@ -1,17 +1,14 @@
 Summary: Patch stack for Git repositories
 Name: stgit
-Version: 0.18
-Release: 5%{?dist}
+Version: 0.19
+Release: 1%{?dist}
 License: GPLv2
 URL: http://www.procode.org/stgit/
-Source: https://github.com/ctmarinas/%{name}/archive/%{name}-%{version}.tar.gz
-
-# resolves: #872651
-Patch0: stgit-0.16-tmpl.patch
+Source: https://github.com/ctmarinas/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 BuildArch: noarch
-BuildRequires: git-core, python2-devel, asciidoc, xmlto
-Requires: git-core, git-email, python2, vim-filesystem
+BuildRequires: git-core, python3-devel, asciidoc, xmlto
+Requires: git-core, git-email, python3, vim-filesystem
 
 %description
 StGit is a Python application providing similar functionality
@@ -26,14 +23,13 @@ either use plain Git commands or the Cogito tool.
 
 %prep
 %setup -q
-%patch0 -p1 -b .templ
 chmod -x contrib/stgbashprompt.sh
 
 %build
-make all doc prefix=%{_prefix} %{?_smp_mflags}
+# make install replicates the build steps, so do nothing
 
 %install
-make install install-doc DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}
+make install install-doc PYTHON=python3 DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix}
 
 # Install bash completion
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
@@ -48,7 +44,7 @@ install -m 644 -D contrib/vim/ftdetect/stg.vim $RPM_BUILD_ROOT%{_datadir}/vim/vi
 %files
 %doc AUTHORS COPYING README RELEASENOTES
 %{_bindir}/stg
-%{python2_sitelib}/*
+%{python3_sitelib}/*
 %{_mandir}/man1/stg*
 %{_sysconfdir}/bash_completion.d/
 %{_datadir}/stgit/
@@ -56,6 +52,11 @@ install -m 644 -D contrib/vim/ftdetect/stg.vim $RPM_BUILD_ROOT%{_datadir}/vim/vi
 %{_datadir}/vim/vimfiles/ftdetect/stg.vim
 
 %changelog
+* Wed Jun 05 2019 Dan Horák <dan[at]danny.cz> - 0.19-1
+- updated to 0.19
+- drop upstreamed patch
+- switch to Python3
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.18-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild