From dd9d84739d9f535ae4a99ca988d8f1137d0c9b1b433682b33bf56361d68aa326 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 3 Jun 2022 13:20:44 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=100

---
 javapackages-tools.spec | 52 ++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index c254bee..1b50a47 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -30,6 +30,27 @@ 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 setuptools}
+BuildRequires:  python-rpm-macros
+BuildArch:      noarch
+%if 0%{?suse_version} > 1320
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module six}
+%endif
+%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
@@ -55,35 +76,14 @@ 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:  %{python_module lxml}
-%if 0%{?suse_version} > 1320
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module six}
-%endif
-BuildRequires:  %{python_module setuptools}
-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
+BuildRequires:  javapackages-filesystem
 %else
-%define python_sitelib %python3_sitelib
-%define python_files() -n python3-%{**}
-%endif
-%else
-Provides:       mvn(com.sun:tools) = SYSTEM
-Provides:       mvn(sun.jdk:jconsole) = SYSTEM
+Requires:       javapackages-filesystem = %{version}-%{release}
 %endif
 
 %description
@@ -123,7 +123,9 @@ allows artifact resolution using XMvn resolver.
 Summary:        Module for handling various files for Java packaging
 Group:          Development/Languages/Java
 Requires:       python-lxml
+%if 0%{?suse_version} > 1320
 Requires:       python-six
+%endif
 
 %description -n python-javapackages
 Module for handling, querying and manipulating of various files for Java
@@ -135,9 +137,11 @@ packaging in Linux distributions
 Summary:        Module for handling various files for Java packaging
 Group:          Development/Languages/Java
 Requires:       python3-lxml
-Requires:       python3-six
 Obsoletes:      python-javapackages < %{version}-%{release}
 Provides:       python-javapackages = %{version}-%{release}
+%if 0%{?suse_version} > 1320
+Requires:       python3-six
+%endif
 
 %description -n python3-javapackages
 Module for handling, querying and manipulating of various files for Java