From bcf5d0d86d023c6b24d4f93740a0b1edb2911d29 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Sat, 17 Dec 2016 19:52:59 -0500
Subject: [PATCH] Update to 1.0.6 (#1257376).

Also,
* Mark LICENSE as the license.
* Drop declaration of the BuildRoot.
* Drop the use of 2to3.
---
 .gitignore       |  1 +
 python-mako.spec | 36 ++++++++++++++++++++++--------------
 sources          |  2 +-
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1722e5a..15dd231 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ Mako-0.4.0.tar.gz
 /Mako-1.0.0.tar.gz
 /Mako-1.0.1.tar.gz
 /Mako-1.0.3.tar.gz
+/rel_1_0_6.tar.bz2
diff --git a/python-mako.spec b/python-mako.spec
index 22a9de1..6b9c386 100644
--- a/python-mako.spec
+++ b/python-mako.spec
@@ -13,19 +13,20 @@
 %global upname Mako
 
 Name: python-mako
-Version: 1.0.3
-Release: 3%{?dist}
-Summary: Mako template library for Python
+Version: 1.0.6
+Release: 1%{?dist}
+BuildArch: noarch
 
-Group: Development/Languages
 # Mostly MIT, but _ast_util.py is Python licensed.
 # The documentation contains javascript for search licensed BSD or GPLv2
 License: (MIT and Python) and (BSD or GPLv2)
+Group: Development/Languages
+Summary: Mako template library for Python
 URL: http://www.makotemplates.org/
-Source0: https://pypi.python.org/packages/source/M/%{upname}/%{upname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+Source0: https://bitbucket.org/zzzeek/mako/get/rel_%(echo %{version} | sed "s/\./_/g").tar.bz2
+
 BuildRequires: python2-devel
+BuildRequires: python2-pytest
 BuildRequires: python-setuptools
 BuildRequires: python-markupsafe
 BuildRequires: python-beaker
@@ -36,6 +37,7 @@ Requires: python-beaker
 
 %if 0%{?with_python3}
 BuildRequires: python3-devel
+BuildRequires: python3-pytest
 BuildRequires: python3-setuptools
 BuildRequires: python3-markupsafe
 BuildRequires: python3-beaker
@@ -43,7 +45,6 @@ BuildRequires: python3-mock
 %if 0%{?fedora} > 14
 BuildRequires: python3-nose
 %endif
-BuildRequires: /usr/bin/2to3
 %endif # if with_python3
 
 %description
@@ -96,7 +97,7 @@ This package contains the mako module built for use with python3.
 %endif # with_python3
 
 %prep
-%setup -q -n Mako-%{version}
+%autosetup -n zzzeek-mako-8e83c7561e3c
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -108,7 +109,6 @@ cp -a . %{py3dir}
 
 %if 0%{?with_python3}
 pushd %{py3dir}
-2to3 --no-diffs -w mako test
 %{__python3} setup.py build
 popd
 %endif # with_python3
@@ -130,11 +130,11 @@ popd
 rm -rf doc/build
 
 %check
-PYTHONPATH=$(pwd) nosetests
+python2 setup.py test
 
 %if 0%{?with_python3} && 0%{?fedora} > 14
 pushd %{py3dir}
-PYTHONPATH=$(pwd) nosetests-%{python3_version}
+python3 setup.py test
 popd
 %endif
 
@@ -144,14 +144,16 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES LICENSE README.rst examples
+%license LICENSE
+%doc CHANGES README.rst examples
 %{_bindir}/mako-render
 %{python_sitelib}/*
 
 %if 0%{?with_python3}
 %files -n python3-mako
 %defattr(-,root,root,-)
-%doc CHANGES LICENSE README.rst examples
+%license LICENSE
+%doc CHANGES README.rst examples
 %{_bindir}/python3-mako-render
 %{python3_sitelib}/*
 %endif
@@ -161,6 +163,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Dec 17 2016 Randy Barlow <bowlofeggs@fedoraproject.org> - 1.0.6-1
+- Update to 1.0.6 (#1257376).
+- Mark LICENSE as the license.
+- Drop declaration of BuildRoot.
+- Drop use of 2to3 since upstream supports Python 3 now.
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.3-3
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
diff --git a/sources b/sources
index af7149d..02eb47e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a78f20f6366a8a0659ce5532f8614e53  Mako-1.0.3.tar.gz
+SHA512 (rel_1_0_6.tar.bz2) = 01db60f51485abec6dfbc81627be61b5cc44dee2a4dd21f0844c7b7e7ed48c05983adeb6b155c935b50768c1946ab19d355aa3761985ec1aa4c078578d377dee