diff --git a/0001-make-glob-pattern-work-with-python3.10.patch b/0001-make-glob-pattern-work-with-python3.10.patch new file mode 100644 index 0000000000000000000000000000000000000000..4d4dfd14e93e5915a8a5ddb794c91ef58686c356 --- /dev/null +++ b/0001-make-glob-pattern-work-with-python3.10.patch @@ -0,0 +1,24 @@ +From 245030d5b245b348ccc4304f7e1c54991e1427a1 Mon Sep 17 00:00:00 2001 +From: baizg1107 +Date: Fri, 11 Feb 2022 11:13:49 +0800 +Subject: [PATCH] make glob pattern work with python3.10 + +--- + install | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/install b/install +index 9a5f108..3b2c350 100755 +--- a/install ++++ b/install +@@ -256,5 +256,5 @@ inst_data target/gradle_build.7 "${mandir}/man7" + + exec >files-python + (cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2 +-echo "${prefix}/lib/python?.?/site-packages/javapackages" +-echo "${prefix}/lib/python?.?/site-packages/javapackages-*.egg-info" ++echo "${prefix}/lib/python*/site-packages/javapackages" ++echo "${prefix}/lib/python*/site-packages/javapackages-*.egg-info" +-- +2.27.0 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index dcc7e2b02952ad0fe9012e8e1abca092c1cd3a73..22b61a053bb252e977ae77e22b728e42a2186d51 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -3,15 +3,16 @@ Name: javapackages-tools Version: 5.3.0 -Release: 3 +Release: 4 Summary: Support for Java packaging with macros and scripts License: BSD URL: https://github.com/fedora-java/javapackages Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz Patch0000: 0001-Support-threads-and-skipTests-params.patch +Patch0001: 0001-make-glob-pattern-work-with-python3.10.patch BuildArch: noarch BuildRequires: coreutils which make asciidoc xmlto python3-devel python3-lxml -BuildRequires: python3-setuptools python3-nose python3-six +BuildRequires: python3-setuptools python3-six Requires: javapackages-filesystem = %{version}-%{release} coreutils Requires: findutils which java-1.8.0-openjdk-headless Provides: jpackage-utils = %{version}-%{release} mvn(com.sun:tools) = SYSTEM @@ -96,7 +97,11 @@ Java packaging. sed -e 's/.[17]$/&*/' -i files-* %check -./check +. ./config.status +for test in test/java-functions/*_test.sh; do + echo "`basename $test`:" + sh $test +done %files -f files-tools @@ -114,6 +119,9 @@ sed -e 's/.[17]$/&*/' -i files-* %license LICENSE %changelog +* Fri Feb 11 2022 baizhonggui - 5.3.0-4 +- Deprecate python-nose and fix python version not recognized + * Fri Apr 16 2021 maminjie - 5.3.0-3 - Support threads and skipTests params