diff --git a/python-blockdiag.spec b/python-blockdiag.spec
index 1262f23..67b2c27 100644
--- a/python-blockdiag.spec
+++ b/python-blockdiag.spec
@@ -26,7 +26,8 @@ License:        Apache-2.0
 Group:          Development/Languages/Python
 URL:            http://blockdiag.com/
 Source:         https://files.pythonhosted.org/packages/source/b/blockdiag/blockdiag-%{version}.tar.gz
-# https://github.com/blockdiag/blockdiag/pull/131
+# PATCH-FIX-UPSTREAM denose.patch gh#blockdiag/blockdiag#131 pgajdos@suse.com
+# Remove the last silly dependency on nose
 Patch0:         python-blockdiag-nose-to-pytest.patch
 BuildRequires:  %{python_module Pillow >= 2.2.1}
 BuildRequires:  %{python_module funcparserlib >= 0.3.6}
@@ -47,7 +48,7 @@ BuildRequires:  %{python_module pep8 >= 1.3}
 BuildRequires:  %{python_module pip >= 1.4.1}
 BuildRequires:  %{python_module pytest}
 # /SECTION
-%if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24
+%if 0%{?suse_version} || 0%{?fedora_version} >= 24
 Recommends:     ghostscript
 Recommends:     python-Wand
 Recommends:     python-reportlab
@@ -59,8 +60,7 @@ The blockdiag package generates block-diagram image files
 from spec-text files.
 
 %prep
-%setup -q -n blockdiag-%{version}
-%patch0 -p1
+%autosetup -p1 -n blockdiag-%{version}
 
 %build
 %python_build
@@ -73,7 +73,7 @@ from spec-text files.
 %post
 %python_install_alternative blockdiag
 
-%preun
+%postun
 %python_uninstall_alternative blockdiag
 
 %check
@@ -89,6 +89,7 @@ popd
 %license LICENSE
 %doc CHANGES.rst README.rst
 %python_alternative %{_bindir}/blockdiag
-%{python_sitelib}/*
+%{python_sitelib}/blockdiag*
+%pycache_only %{python_sitelib}/__pycache__/blockdiag*
 
 %changelog