diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index d8b4b3f..76e3a50 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package javapackages-tools
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,25 +30,6 @@ Name:           javapackages-tools-%{flavor}
 %else
 Name:           javapackages-tools
 %endif
-%if %{with python}
-%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 pytest}
-BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module six}
-BuildRequires:  python-rpm-macros
-BuildArch:      noarch
-%else
-Provides:       mvn(com.sun:tools) = SYSTEM
-Provides:       mvn(sun.jdk:jconsole) = SYSTEM
-%endif
 Version:        5.3.1
 Release:        0
 Summary:        Macros and scripts for Java packaging support
@@ -69,14 +50,33 @@ 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}
+BuildRequires:  %{python_module pytest}
+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
@@ -101,6 +101,7 @@ Requires:       javapackages-tools = %{version}
 This package contains files needed by local mode for Gradle, which
 allows artifact resolution using XMvn resolver.
 
+
 %package -n javapackages-ivy
 Summary:        Local mode for Apache Ivy (files)
 Group:          Development/Languages/Java
@@ -123,7 +124,6 @@ Module for handling, querying and manipulating of various files for Java
 packaging in Linux distributions
 
 %else
-
 %package -n python3-javapackages
 Summary:        Module for handling various files for Java packaging
 Group:          Development/Languages/Java
@@ -241,7 +241,6 @@ popd
 %files -n javapackages-filesystem -f files-filesystem
 
 %else
-
 %files -n javapackages-local -f files-local
 %dir %{_datadir}/java-utils