diff --git a/javapackages-tools.changes b/javapackages-tools.changes index d9ca2a6..7b7e14a 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun May 28 19:15:09 UTC 2023 - Fridrich Strba + +- Enable the tests also for older distributions +- Require python3-xml (python-xml for distributions that use + versioned modules), since module xml needed by some scripts. + ------------------------------------------------------------------- Wed Nov 9 08:50:08 UTC 2022 - Fridrich Strba diff --git a/javapackages-tools.spec b/javapackages-tools.spec index ee2f21b..4ba5d35 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -63,9 +63,7 @@ Obsoletes: %{name}-doc Obsoletes: jpackage-utils < %{version} %if %{with python} BuildRequires: %{python_module lxml} -%if 0%{?suse_version} > 1320 BuildRequires: %{python_module pytest} -%endif BuildRequires: %{python_module setuptools} BuildRequires: python-rpm-macros BuildArch: noarch @@ -109,6 +107,7 @@ allows artifact resolution using XMvn resolver. Summary: Module for handling various files for Java packaging Group: Development/Languages/Java Requires: python-lxml +Requires: python-xml %description -n python-javapackages Module for handling, querying and manipulating of various files for Java @@ -120,6 +119,7 @@ packaging in Linux distributions Summary: Module for handling various files for Java packaging Group: Development/Languages/Java Requires: python3-lxml +Requires: python3-xml Obsoletes: python-javapackages < %{version}-%{release} Provides: python-javapackages = %{version}-%{release} @@ -210,7 +210,6 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/ %fdupes %{buildroot}/%{_prefix} -%if 0%{?suse_version} > 1320 %check # reference: ./check, but we don't want to check coverage and don't need old nose ( @@ -228,7 +227,6 @@ pushd ./test %pytest popd %endif -%endif %if !%{with python} %files -f files-tools