Hello community, here is the log from the commit of package javapackages-tools for openSUSE:Factory checked in at 2020-11-26 23:12:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old) and /work/SRC/openSUSE:Factory/.javapackages-tools.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools" Thu Nov 26 23:12:10 2020 rev:25 rq:850199 version:5.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes 2020-09-08 22:55:25.147756246 +0200 +++ /work/SRC/openSUSE:Factory/.javapackages-tools.new.5913/javapackages-tools.changes 2020-11-26 23:13:06.208964299 +0100 @@ -1,0 +2,13 @@ +Sun Nov 22 00:23:21 UTC 2020 - Benjamin Greiner <[email protected]> + +- Fix the python subpackage generation + gh#openSUSE/python-rpm-macros#79 + +------------------------------------------------------------------- +Sat Nov 21 13:05:38 UTC 2020 - Benjamin Greiner <[email protected]> + +- Support python subpackages for each flavor + gh#openSUSE/python-rpm-macros#66 +- Replace old nose with pytest gh#fedora-java/javapackages#86 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javapackages-tools.spec ++++++ --- /var/tmp/diff_new_pack.7wE1AE/_old 2020-11-26 23:13:08.140965910 +0100 +++ /var/tmp/diff_new_pack.7wE1AE/_new 2020-11-26 23:13:08.144965911 +0100 @@ -24,6 +24,8 @@ %bcond_with python %endif %if %{with python} +%{?!python_module:%define python_module() python3-%{**}} +%define skip_python2 1 Name: javapackages-tools-%{flavor} %else Name: javapackages-tools @@ -58,11 +60,20 @@ Obsoletes: %{name}-doc Obsoletes: jpackage-utils < %{version} %if %{with python} -BuildRequires: python3-lxml -BuildRequires: python3-nose -BuildRequires: python3-setuptools -BuildRequires: python3-six +BuildRequires: %{python_module lxml} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six} +BuildRequires: python-rpm-macros BuildArch: noarch +%if 0%{?python38_version_nodots} +# if python multiflavor is in place yet, use it to generate subpackages +%define python_subpackage_only 1 +%python_subpackages +%else +%define python_sitearch %python3_sitearch +%define python_files() -n python3-%{**} +%endif %else Provides: mvn(com.sun:tools) = SYSTEM Provides: mvn(sun.jdk:jconsole) = SYSTEM @@ -101,6 +112,18 @@ This package contains files needed by local mode fow Apache Ivy, which allows artifact resolution using XMvn resolver. +%if 0%{?python_subpackage_only} +%package -n python-javapackages +Summary: Module for handling various files for Java packaging +Group: Development/Languages/Java +Requires: python-lxml +Requires: python-six + +%description -n python-javapackages +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 @@ -112,6 +135,7 @@ %description -n python3-javapackages Module for handling, querying and manipulating of various files for Java packaging in Linux distributions +%endif %package -n javapackages-local Summary: Non-essential macros and scripts for Java packaging support @@ -142,7 +166,7 @@ ./build %if %{with python} pushd python -python3 setup.py build +%python_build popd %endif @@ -152,7 +176,7 @@ %if %{with python} pushd python -python3 setup.py install --root %{buildroot} +%python_install popd # kill all the common files files=" @@ -193,7 +217,22 @@ %fdupes %{buildroot}/%{_prefix} %check -./check +# reference: ./check, but we don't want to check coverage and don't need old nose +( +. ./config.status +for test in test/java-functions/*_test.sh; do + echo "`basename $test`:" + sh $test +done +) +%if %{with python} +pushd ./python +%pytest +popd +pushd ./test +%pytest +popd +%endif %if !%{with python} %files -f files-tools @@ -211,9 +250,9 @@ %files -n javapackages-ivy -f files-ivy %dir %{_sysconfdir}/ant.d -%files -n python3-javapackages +%files %{python_files javapackages} %license LICENSE -%{python3_sitelib}/javapackages* +%{python_sitelib}/javapackages* %endif %changelog _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
