diff --git a/python-html2text.changes b/python-html2text.changes
index 917b3ab..44013b0 100644
--- a/python-html2text.changes
+++ b/python-html2text.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 13 08:38:04 UTC 2018 - mcepl@suse.com
+
+- Remove dependency on unittetst2
+ Added remove_unittest2.patch to facilitate that
+
-------------------------------------------------------------------
Thu Apr 27 16:33:29 UTC 2017 - toddrme2178@gmail.com
diff --git a/python-html2text.spec b/python-html2text.spec
index 748456e..f4b4da1 100644
--- a/python-html2text.spec
+++ b/python-html2text.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-html2text
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,27 +16,26 @@
#
-%bcond_without tests
+#
+%define upname html2text
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name: python-html2text
+%bcond_without tests
+Name: python-%{upname}
Version: 2016.9.19
Release: 0
-Url: https://github.com/Alir3z4/html2text/
Summary: Turn HTML into equivalent Markdown-structured text
-License: GPL-3.0
+License: GPL-3.0-only
Group: Development/Languages/Python
-Source: https://files.pythonhosted.org/packages/source/h/html2text/html2text-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: fdupes
-BuildRequires: python-rpm-macros
+URL: https://github.com/Alir3z4/html2text/
+Source: https://files.pythonhosted.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz
+Patch0: remove_unittest2.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
-%if %{with tests}
-BuildRequires: python2-unittest2
-%endif
-Requires(post): update-alternatives
-Requires(preun): update-alternatives
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
BuildArch: noarch
%python_subpackages
@@ -46,9 +45,10 @@ easy-to-read plain ASCII text. Better yet, that ASCII also happens to
be valid Markdown (a text-to-HTML format).
%prep
-%setup -q -n html2text-%{version}
+%setup -q -n %{upname}-%{version}
+%patch0 -p1
# remove useless shebang
-sed -i '/^#!/d' html2text/__init__.py
+sed -i '/^#!/d' %{upname}/__init__.py
%build
%python_build
@@ -58,15 +58,18 @@ sed -i '/^#!/d' html2text/__init__.py
%python_expand %fdupes %{buildroot}%{$python_sitelib}
# To avoid conflicts with the rst2html5 package
-mv %{buildroot}%{_bindir}/html2text %{buildroot}%{_bindir}/html2text-python
-ln -s -f %{_sysconfdir}/alternatives/html2text %{buildroot}%{_bindir}/html2text
+mv %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/%{upname}-python
+ln -s -f %{_sysconfdir}/alternatives/%{upname} %{buildroot}%{_bindir}/%{upname}
+
+# remove executable bits from egg files
+%python_expand chmod -x %{buildroot}%{$python_sitelib}/%{upname}-*.egg-info/*
%post
-update-alternatives --install %{_bindir}/html2text html2text %{_bindir}/html2text-python 15
+update-alternatives --install %{_bindir}/%{upname} %{upname} %{_bindir}/%{upname}-python 15
%preun
-if [ ! -f %{_bindir}/html2text-python ] ; then
- update-alternatives --remove html2text %{_bindir}/html2text-python
+if [ ! -f %{_bindir}/%{upname}-python ] ; then
+ update-alternatives --remove %{upname} %{_bindir}/%{upname}-python
fi
%if %{with tests}
@@ -74,12 +77,12 @@ fi
%python_exec setup.py test
%endif
-%files %python_files
-%defattr(-,root,root,-)
-%doc COPYING README.md AUTHORS.rst ChangeLog.rst
-%python3_only %{_bindir}/html2text
-%python3_only %{_bindir}/html2text-python
-%python3_only %ghost %{_sysconfdir}/alternatives/html2text
+%files %{python_files}
+%license COPYING
+%doc README.md AUTHORS.rst ChangeLog.rst
+%python3_only %{_bindir}/%{upname}
+%python3_only %{_bindir}/%{upname}-python
+%python3_only %ghost %{_sysconfdir}/alternatives/%{upname}
%{python_sitelib}/*
%changelog
diff --git a/remove_unittest2.patch b/remove_unittest2.patch
new file mode 100644
index 0000000..8bf330c
--- /dev/null
+++ b/remove_unittest2.patch
@@ -0,0 +1,64 @@
+--- a/setup.py
++++ b/setup.py
+@@ -9,14 +9,7 @@ try:
+ except ImportError:
+ read_md = lambda f: open(f, 'r').read()
+
+-requires_list = []
+-try:
+- import unittest2 as unittest
+-except ImportError:
+- import unittest
+-else:
+- if sys.version_info <= (2, 6):
+- requires_list.append("unittest2")
++import unittest
+
+
+ class RunTests(Command):
+@@ -59,9 +52,6 @@ setup(
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 2',
+- 'Programming Language :: Python :: 2.4',
+- 'Programming Language :: Python :: 2.5',
+- 'Programming Language :: Python :: 2.6',
+ 'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3.0',
+@@ -75,7 +65,6 @@ setup(
+ html2text=html2text.cli:main
+ """,
+ license='GNU GPL 3',
+- requires=requires_list,
+ packages=find_packages(exclude=['test']),
+ include_package_data=True,
+ zip_safe=False,
+--- a/test/test_html2text.py
++++ b/test/test_html2text.py
+@@ -5,10 +5,7 @@ import re
+ import subprocess
+ import sys
+
+-if sys.version_info[:2] < (2, 7):
+- import unittest2 as unittest
+-else:
+- import unittest
++import unittest
+ import logging
+
+ logging.basicConfig(format='%(levelname)s:%(funcName)s:%(message)s',
+--- a/test/test_memleak.py
++++ b/test/test_memleak.py
+@@ -1,9 +1,7 @@
+ import sys
+-if sys.version_info[:2] < (2, 7):
+- import unittest2 as unittest
+-else:
+- import unittest
+ import logging
++import unittest
++
+ logging.basicConfig(format='%(levelname)s:%(funcName)s:%(message)s',
+ level=logging.DEBUG)
+