From b95f9f982a14fe51f9bbc455ec686d18cff8f61c Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Dec 20 2020 12:25:40 +0000
Subject: Update to 1.5.2, switch to Python 3, enable tests


Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1737930
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1909452

---

diff --git a/.gitignore b/.gitignore
index 77df086..02e4b66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ Trac-0.11.7.tar.gz
 /Trac-1.4.tar.gz
 /Trac-1.4.1.tar.gz
 /Trac-1.5.1.tar.gz
+/Trac-1.5.2.tar.gz
diff --git a/sources b/sources
index b18a275..f3e80e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Trac-1.5.1.tar.gz) = 07e80cade17c7365516184407bd7cda19c7a539e0741b9d17164a6dcb61d2241b057d315fe1ce68e8aa0642d41c762899a8db94ce9843de3e117a4ee0ec9a332
+SHA512 (Trac-1.5.2.tar.gz) = 0ec13f94240e982fbf7e58a0d2bd0f79d541f889fa67d176f601275784ccc081e72b523bd83a1ce2ab5e63bc2a9dc41d0fe23e918046e99252703dc98e24cb6b
diff --git a/trac.spec b/trac.spec
index c76d5d2..9c76708 100644
--- a/trac.spec
+++ b/trac.spec
@@ -1,6 +1,6 @@
 Name:           trac
-Version:        1.5.1
-Release:        2%{?dist}
+Version:        1.5.2
+Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 License:        BSD
 URL:            http://trac.edgewall.com/
@@ -11,27 +11,23 @@ Source3:        trac.ini-environment_sample
 Source4:        %{name}-README.fedora
 Source5:        trac.wsgi
 BuildArch:      noarch
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-genshi >= 0.7
-BuildRequires:  python2-jinja2
-Requires:       python2-setuptools
-Requires:       python2-genshi >= 0.7
-Requires:       python2-jinja2
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-jinja2
 
 # optional packages to ensure we run all Trac tests (if one of these are not
 # installed the test would be skipped)
-#BuildRequires:  git
-#BuildRequires:  php
-#BuildRequires:  python2-configobj
-#BuildRequires:  python2-docutils
-#BuildRequires:  python2-lxml
-# running the functional tests with twill doesn't work presumably because
-# Fedora's twill behaves differently due to unbundled libraries.
-# twill 1.8 is incompatible with Trac: http://trac.edgewall.org/ticket/11642
-# BuildRequires:  python-twill < 1.8
-#BuildRequires:  python2-pygments
-#BuildRequires:  python2-subversion
+BuildRequires:  python3-docutils
+BuildRequires:  python3-pygments
+BuildRequires:  python3-textile
+BuildRequires:  python3-subversion
+BuildRequires:  /usr/bin/git
+BuildRequires:  /usr/bin/svnadmin
+# No geckodriver in Fedora, hence we skip the selenium tests
+#  BuildRequires:  python3-selenium
+#  BuildRequires:  /usr/bin/geckodriver
+# No tidylib in Fedora either
+#  BuildRequires:  python3-tidylib
 
 %description
 Trac is an integrated system for managing software projects, an
@@ -49,16 +45,13 @@ development more streamlined and effective.
 find contrib -type f -exec chmod -x '{}' \;
 # don't package windows specific files
 rm -f contrib/trac-post-commit-hook.cmd
-%{__cp} -a %{SOURCE4} README.fedora
+cp -a %{SOURCE4} README.fedora
 
 %build
-%py2_build
-
-#%check
-#PYTHONPATH=$(pwd) %{__python2} setup.py test
+%py3_build
 
 %install
-%py2_install
+%py3_install
 
 install -dm 755 $RPM_BUILD_ROOT%{_var}/www/cgi-bin
 #mv cgi-bin/trac.*cgi $RPM_BUILD_ROOT%{_var}/www/cgi-bin
@@ -77,12 +70,15 @@ find sample-plugins/ -type f -name '*.ini*' -exec install -pm 644 '{}' $RPM_BUIL
 install -dm 755 $RPM_BUILD_ROOT%{_sbindir}
 mv $RPM_BUILD_ROOT{%{_bindir}/tracd,%{_sbindir}/tracd}
 
+%check
+PYTHONPATH=$(pwd) %{python3} setup.py test
+
 %files
 %license COPYING
 %doc AUTHORS ChangeLog INSTALL* README* RELEASE* THANKS UPGRADE* contrib/
 %{_bindir}/trac-admin
 %{_sbindir}/tracd
-%{python2_sitelib}/*
+%{python3_sitelib}/[Tt]rac*/
 #%%config(noreplace) /etc/httpd/conf.d/trac.conf
 %dir /etc/trac
 %config(noreplace) /etc/trac/*
@@ -91,6 +87,10 @@ mv $RPM_BUILD_ROOT{%{_bindir}/tracd,%{_sbindir}/tracd}
 #%%{_var}/www/cgi-bin/trac.wsgi
 
 %changelog
+* Sun Dec 20 2020 Miro Hrončok <mhroncok@redhat.com> - 1.5.2-1
+- Update to 1.5.2
+- Switch to Python 3
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild