diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index d71b4c6..0335652 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -27,26 +27,8 @@
 %{?!python_module:%define python_module() python3-%{**}}
 %define skip_python2 1
 Name:           javapackages-tools-%{flavor}
-%if 0%{?suse_version} >= 1550
-# TW: generate subpackages for every python3 flavor
-%define python_subpackage_only 1
-%else
-%python_subpackages
-%define python_sitelib %{python3_sitelib}
-%define python_files() -n python3-%{**}
-%endif
-BuildRequires:  %{python_module lxml}
-BuildRequires:  %{python_module setuptools}
-BuildRequires:  python-rpm-macros
-BuildArch:      noarch
-%if 0%{?suse_version} > 1320
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module six}
-%endif
 %else
 Name:           javapackages-tools
-Provides:       mvn(com.sun:tools) = SYSTEM
-Provides:       mvn(sun.jdk:jconsole) = SYSTEM
 %endif
 Version:        5.3.1
 Release:        0
@@ -67,20 +49,40 @@ Patch2:         suse-no-epoch.patch
 Patch3:         0001-Let-maven_depmap.py-generate-metadata-with-dependenc.patch
 Patch4:         0002-Do-not-try-to-construct-POM-from-maven-coordinate-st.patch
 Patch5:         0003-Fix-tests-after-the-recent-maven_depmap.py-changes.patch
-Patch6:         0004-Remove-dependency-on-Six-compatibility-library.patch
 BuildRequires:  asciidoc
 BuildRequires:  fdupes
 BuildRequires:  perl
 BuildRequires:  rpm
 BuildRequires:  xmlto
+%if %{with python}
+BuildRequires:  javapackages-filesystem
+%else
+Requires:       javapackages-filesystem = %{version}-%{release}
+%endif
 # Used on too many places
 Provides:       jpackage-utils = %{version}
 Obsoletes:      %{name}-doc
 Obsoletes:      jpackage-utils < %{version}
 %if %{with python}
-BuildRequires:  javapackages-filesystem
+BuildRequires:  %{python_module lxml}
+%if 0%{?suse_version} > 1320
+BuildRequires:  %{python_module pytest}
+%endif
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module six}
+BuildRequires:  python-rpm-macros
+BuildArch:      noarch
+%if 0%{?suse_version} >= 1550
+# TW: generate subpackages for every python3 flavor
+%define python_subpackage_only 1
+%python_subpackages
 %else
-Requires:       javapackages-filesystem = %{version}-%{release}
+%define python_sitelib %python3_sitelib
+%define python_files() -n python3-%{**}
+%endif
+%else
+Provides:       mvn(com.sun:tools) = SYSTEM
+Provides:       mvn(sun.jdk:jconsole) = SYSTEM
 %endif
 
 %description