[python-textile] Update to 2.1.8.

[Thomas Moschny]

commit a8b237a25ed1f63154b5e4b22ffa3ec53d94ab92
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Fri Jun 13 12:55:21 2014 +0200

    Update to 2.1.8.
    
    - Update upstream URLs.
    - Provide a Python3 subpackage.

 .gitignore                        |    1 +
 README.textile                    |    6 ++-
 python-textile-2.1.5-pillow.patch |   34 --------------
 python-textile.spec               |   86 ++++++++++++++++++++++++++++++------
 sources                           |    2 +-
 5 files changed, 78 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f469f49..a053418 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 textile-2.1.4.tar.gz
 /textile-2.1.5.tar.gz
+/textile-2.1.8.tar.gz
diff --git a/README.textile b/README.textile
index d432683..8a374f3 100644
--- a/README.textile
+++ b/README.textile
@@ -4,7 +4,7 @@ python-textile is a Python port of Textile, Dean Allen's humane web text generat
 
 h2. Usage
 
-Install the 'textile' folder on your python path, or easy_install http://github.com/chrisdrackett/python-textile/tarball/master#egg=python-textile.
+Install the 'textile' folder on your python path, or @pip install https://github.com/ikirudennis/python-textile/archive/v2.1.8.tar.gz@
 
 <pre>
 <code>
@@ -31,3 +31,7 @@ Install the 'textile' folder on your python path, or easy_install http://github.
 >>> 
 </code>
 </pre>
+
+h3. Notes:
+
+* Active development supports Python 2.6 or later (including Python 3.3+).
diff --git a/python-textile.spec b/python-textile.spec
index d590062..4e07bd7 100644
--- a/python-textile.spec
+++ b/python-textile.spec
@@ -1,24 +1,33 @@
+%if 0%{?fedora}
+%global with_python3 1
+%endif
+
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %global srcname textile
 
 Name:           python-%{srcname}
-Version:        2.1.5
-Release:        4%{?dist}
+Version:        2.1.8
+Release:        1%{?dist}
 Summary:        A Humane Web Text Generator
 Group:          Development/Languages
 License:        BSD
-URL:            http://loopcore.com/python-textile
-Source0:        http://pypi.python.org/packages/source/t/%{srcname}/%{srcname}-%{version}.tar.gz
-Source1:        http://github.com/sebix/python-textile/raw/4554407d0a456e3a77403c998d4a724e8a523d54/README.textile
-Source2:        http://github.com/sebix/python-textile/raw/4554407d0a456e3a77403c998d4a724e8a523d54/LICENSE.txt
-# see https://github.com/sebix/python-textile/pull/10
-Patch0:         python-textile-2.1.5-pillow.patch
+URL:            https://pypi.python.org/pypi/%{srcname}
+Source0:        https://pypi.python.org/packages/source/t/%{srcname}/%{srcname}-%{version}.tar.gz
+Source1:        https://github.com/textile/python-textile/raw/v%{version}/README.textile
+Source2:        https://github.com/textile/python-textile/raw/v%{version}/LICENSE.txt
 BuildArch:      noarch
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools-devel
-#BuildRequires:  python-nose
-#BuildRequires:  python-coverage
+BuildRequires:  python-setuptools
+BuildRequires:  python-nose
+BuildRequires:  python-coverage
+%if 0%{?with_python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-nose
+BuildRequires:  python3-coverage
+%endif # with_python3
+
 
 %description
 Textile is a XHTML generator using a simple markup developed by Dean
@@ -26,38 +35,85 @@ Allen. This is a Python port with support for code validation, itex to
 MathML translation, Python code coloring and much more.
 
 
+%if 0%{?with_python3}
+%package -n python3-%{srcname}
+Summary:        A Humane Web Text Generator
+Group:          Development/Languages
+
+%description -n python3-%{srcname}
+Textile is a XHTML generator using a simple markup developed by Dean
+Allen. This is a Python port with support for code validation, itex to
+MathML translation, Python code coloring and much more.
+%endif # with_python3
+
+
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1
 cp -a %SOURCE1 .
 cp -a %SOURCE2 .
 
 # remove the shebang
 sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' textile/functions.py
 
+%if 0%{?with_python3}
+cp -a . %{py3dir}
+%endif # with_python3
+
 
 %build
 %{__python} setup.py build
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
+
 
 %install
 %{__python} setup.py install --skip-build --root %{buildroot}
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root %{buildroot}
+popd
+%endif # with_python3
+
 PYTHONPATH=%{buildroot}%{python_sitelib} %{__python} \
   -c 'import textile; import sys; print textile.textile(sys.stdin.read())' \
   < README.textile > README.html
 
 
-# disabled for now, see https://github.com/sebix/python-textile/pull/9
-#check
-#nosetests
+%check
+# run the testsuite and log results, but do not fail the build
+nosetests || :
+%if 0%{?with_python3}
+pushd %{py3dir}
+nosetests-%{python3_version} || :
+popd
+%endif # with_python3
 
 
 %files
 %doc README.* LICENSE.txt
 %{python_sitelib}/*
+%exclude %{python_sitelib}/%{srcname}/tests
+
+
+%if 0%{?with_python3}
+%files -n python3-%{srcname}
+%doc README.* LICENSE.txt
+%{python3_sitelib}/*
+%exclude %{python3_sitelib}/%{srcname}/tests
+%endif # with_python3
 
 
 %changelog
+* Fri Jun 13 2014 Thomas Moschny <thomas.moschny at gmx.de> - 2.1.8-1
+- Update to 2.1.8.
+- Update upstream URLs.
+- Provide a Python3 subpackage.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index b13b5eb..5b8314c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e030e112eca1dafa1be84cf5575560d  textile-2.1.5.tar.gz
+d71a42d4229d30110061704153c021bf  textile-2.1.8.tar.gz