pool/javapackages-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=105

Browse Source
This commit is contained in:
Fridrich Strba 2022-06-05 20:06:16 +00:00 committed by Git OBS Bridge
parent eae6cfa726
commit 7505a39b5a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
javapackages-tools.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Jun 5 20:04:33 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Fix wrong conditioning of the python-six require.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 3 10:11:21 UTC 2022 - Fridrich Strba <fstrba@suse.com> Fri Jun 3 10:11:21 UTC 2022 - Fridrich Strba <fstrba@suse.com>

9
javapackages-tools.spec
View File

@ -68,9 +68,10 @@ Obsoletes: jpackage-utils < %{version}
BuildRequires: %{python_module lxml} BuildRequires: %{python_module lxml}
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} > 1320
BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytest}
%else
BuildRequires: %{python_module six}
%endif %endif
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six}
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildArch: noarch BuildArch: noarch
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
@ -123,7 +124,7 @@ allows artifact resolution using XMvn resolver.
Summary: Module for handling various files for Java packaging Summary: Module for handling various files for Java packaging
Group: Development/Languages/Java Group: Development/Languages/Java
Requires: python-lxml Requires: python-lxml
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} <= 1320
Requires: python-six Requires: python-six
%endif %endif
@ -139,7 +140,7 @@ Group: Development/Languages/Java
Requires: python3-lxml Requires: python3-lxml
Obsoletes: python-javapackages < %{version}-%{release} Obsoletes: python-javapackages < %{version}-%{release}
Provides: python-javapackages = %{version}-%{release} Provides: python-javapackages = %{version}-%{release}
%if 0%{?suse_version} > 1320 %if 0%{?suse_version} <= 1320
Requires: python3-six Requires: python3-six
%endif %endif
@ -167,7 +168,7 @@ This package provides non-essential macros and scripts to support Java packaging
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%if 0%{?suse_version} >= 1320 %if 0%{?suse_version} > 1320
%patch6 -p1 %patch6 -p1
%endif %endif