From 4c9cd7feab1afe76e674fa09548b80f8d581ffc7 Mon Sep 17 00:00:00 2001
From: Mads Kiilerich <mads@kiilerich.com>
Date: Nov 17 2019 17:51:14 +0000
Subject: switch to Python 3 and re-enable curses UI


---

diff --git a/hgview.spec b/hgview.spec
index a47ac4d..6b24300 100644
--- a/hgview.spec
+++ b/hgview.spec
@@ -1,7 +1,7 @@
-%define curses 0
+%define curses 1
 Name:           hgview
 Version:        1.13.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Mercurial interactive Qt based history viewer
 
 License:        GPLv2+
@@ -14,17 +14,17 @@ Patch1:         hgview-man-path.patch
 Patch2:         pyqt4sip.patch
 
 BuildArch:      noarch
-BuildRequires:  python2-devel
-BuildRequires:  PyQt4-devel
+BuildRequires:  python3-devel
+BuildRequires:  python3-PyQt4-devel
 BuildRequires:  asciidoc
 BuildRequires:  xmlto
-BuildRequires:  mercurial
+BuildRequires:  mercurial-py3
 BuildRequires:  desktop-file-utils
 
 Requires:       %{name}-common = %{version}-%{release}
-Requires:       python2-docutils
+Requires:       python3-docutils
 Requires:       PyQt4
-Requires:       python2-qscintilla
+Requires:       python3-qscintilla
 
 %if %{curses}
 %else
@@ -46,7 +46,7 @@ A curses based UI is also available.
 %package -n %{name}-curses
 Summary:        Mercurial interactive curses based history viewer
 Requires:       %{name}-common = %{version}-%{release}
-Requires:       python2-urwid, python2-pygments, python2-inotify
+Requires:       python3-urwid, python3-pygments, python3-inotify
 
 %description -n %{name}-curses
 hgview is a simple tool aiming at visually navigating Mercurial repository
@@ -74,26 +74,26 @@ This package provides common files for the Qt and curses based UIs.
 %patch1
 %patch2 -p1
 
-sed -i '1,1s/python3/python2/g' bin/hgview
-
 
 %build
-%{__python2} setup.py build
+%{__python3} setup.py build
 
 
 %install
-%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 # Mercurial do not have a noarch hgext directory - storing the extension in
 # hgviewlib seems like the least bad option.
-mv $RPM_BUILD_ROOT%{python2_sitelib}/hgext3rd/hgview $RPM_BUILD_ROOT%{python2_sitelib}/hgviewlib/
-rm $RPM_BUILD_ROOT%{python2_sitelib}/hgext3rd/__init__.py*
+mv $RPM_BUILD_ROOT%{python3_sitelib}/hgext3rd/hgview $RPM_BUILD_ROOT%{python3_sitelib}/hgviewlib/
+rm $RPM_BUILD_ROOT%{python3_sitelib}/hgext3rd/__init__.py
+rm $RPM_BUILD_ROOT%{python3_sitelib}/hgext3rd/__pycache__/__init__.*.py*
+rmdir $RPM_BUILD_ROOT%{python3_sitelib}/hgext3rd/__pycache__
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/mercurial/hgrc.d/hgview.rc << EOT
 [extensions]
 # Enable hgview extension to be able to invoke hgview as 'hg hgview' or 'hg qv'.
-#hgview = %{python2_sitelib}/hgviewlib/hgview.py
+#hgview = %{python3_sitelib}/hgviewlib/hgview.py
 
 [hgview]
 # hgview will by default use the qt interface if available - set interface to
@@ -163,16 +163,16 @@ rm $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/examples/description.css
 
 
 %files
-%{python2_sitelib}/hgviewlib/qt4/
+%{python3_sitelib}/hgviewlib/qt4/
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 
 %if %{curses}
 %files -n %{name}-curses
-%{python2_sitelib}/hgviewlib/curses/
+%{python3_sitelib}/hgviewlib/curses/
 %else
-%exclude %{python2_sitelib}/hgviewlib/curses/
+%exclude %{python3_sitelib}/hgviewlib/curses/
 %endif
 
 %files -n %{name}-common
@@ -180,14 +180,18 @@ rm $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/examples/description.css
 %{_mandir}/man1/%{name}.1.*
 %config(noreplace) %{_sysconfdir}/mercurial/hgrc.d/hgview.rc
 %{_bindir}/%{name}
-%{python2_sitelib}/%{name}-*.egg-info
-%dir %{python2_sitelib}/hgviewlib/
-%{python2_sitelib}/hgviewlib/*.py*
-%{python2_sitelib}/hgviewlib/hgview/*.py*
-%{python2_sitelib}/hgviewlib/hgpatches
+%{python3_sitelib}/%{name}-*.egg-info
+%dir %{python3_sitelib}/hgviewlib/
+%{python3_sitelib}/hgviewlib/*.py
+%{python3_sitelib}/hgviewlib/__pycache__/
+%{python3_sitelib}/hgviewlib/hgview/
+%{python3_sitelib}/hgviewlib/hgpatches
 
 
 %changelog
+* Sun Nov 17 2019 Mads Kiilerich <mads@kiilerich.com> - 1.13.0-2
+- switch to Python 3 and re-enable curses UI
+
 * Sun Nov 17 2019 Mads Kiilerich <mads@kiilerich.com> - 1.13.0-1
 - hgview 1.13.0
 - workaround for sip module moving into PyQt4