diff --git a/python-pyudev.changes b/python-pyudev.changes
index 4ae58d9..557ac96 100644
--- a/python-pyudev.changes
+++ b/python-pyudev.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 24 13:52:57 UTC 2017 - jmatejek@suse.com
+
+- singlespec auto-conversion
+
 -------------------------------------------------------------------
 Mon May 23 16:12:57 UTC 2016 - tbechtold@suse.com
 
@@ -201,3 +206,4 @@ Sun Aug 28 19:28:06 UTC 2011 - asterios.dramis@gmail.com
 Tue Feb  8 13:18:25 UTC 2011 - tittiatcoke@gmail.com
 
 - Initial Package (version 0.8).
+
diff --git a/python-pyudev.spec b/python-pyudev.spec
index 18d52bf..c283c8d 100644
--- a/python-pyudev.spec
+++ b/python-pyudev.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pyudev
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,35 +16,41 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_with     test
 Name:           python-pyudev
-Version:        0.20.0
+Version:        0.21.0
 Release:        0
 Summary:        Udev bindings for Python
 License:        LGPL-2.1+
 Group:          Development/Libraries/Python
 Url:            http://pyudev.readthedocs.org/
-Source0:        https://pypi.python.org/packages/78/6a/2fc9ed0ffbcdb480a026274ca221b959de6c549a67753ff4b3c790db0d8a/pyudev-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/source/p/pyudev/pyudev-%{version}.tar.gz
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module six}
+BuildRequires:  fdupes
 BuildRequires:  libudev-devel
 BuildRequires:  libudev1
-BuildRequires:  python-Sphinx
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-# Testsuite BuildRequires:
-BuildRequires:  python-mock
-BuildRequires:  python-nose
-BuildRequires:  python-py
-BuildRequires:  python-pytest
-Requires:       libudev1
+BuildRequires:  python-rpm-macros
+%if %{with test}
+BuildRequires:  %{python_module docutils}
+BuildRequires:  %{python_module mock}
+BuildRequires:  %{python_module hypothesis}
+BuildRequires:  %{python_module nose}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module py}
+%endif
+Requires:       udev
 Requires:       python-six
+%ifpython2
 # pyudev was last used in KDE:Unstable:Playground (pyudev-0.8)
 Provides:       pyudev = %{version}
 Obsoletes:      pyudev < %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
-BuildArch:      noarch
 %endif
+BuildArch:      noarch
+
+%python_subpackages
 
 %description
 A Python binding to libudev, the hardware management library and service found
@@ -56,20 +62,20 @@ in modern linux systems.
 sed -i -e "s|'sphinx.ext.intersphinx',\\?||" -e "s|'sphinxcontrib.issuetracker',\\?||" doc/conf.py
 
 %build
-python setup.py build
-PYTHONPATH=src/ python setup.py build_sphinx
-rm build/sphinx/html/.buildinfo
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-#TODO: fix
-#%%check
-#nosetests
+%if %{with test}
+%check
+%python_expand nosetests-%{$python_bin_suffix}
+%endif
 
-%files
+%files %{python_files}
 %defattr(-,root,root,-)
-%doc CHANGES.rst COPYING README.rst build/sphinx/html/
+%doc CHANGES.rst COPYING README.rst
 %{python_sitelib}/*
 
 %changelog
diff --git a/pyudev-0.20.0.tar.gz b/pyudev-0.20.0.tar.gz
deleted file mode 100644
index e6bc8ef..0000000
--- a/pyudev-0.20.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14d85bc9611dbf798732996cb7107858f58a3a1b9d246e4063c7a20ade65842a
-size 93217
diff --git a/pyudev-0.21.0.tar.gz b/pyudev-0.21.0.tar.gz
new file mode 100644
index 0000000..b680eba
--- /dev/null
+++ b/pyudev-0.21.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:094b7a100150114748aaa3b70663485dd360457a709bfaaafe5a977371033f2b
+size 89469