From ca03ef29090592fce45475ca1945addb78573f22 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 9 Dec 2022 14:08:41 +0000 Subject: [PATCH] import osbuild-73-1.el8 --- .gitignore | 2 +- .osbuild.metadata | 2 +- ...est-fscache-drop-PathLike-annotation.patch | 28 +++++++++++++++++++ SPECS/osbuild.spec | 10 +++++-- 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 SOURCES/0001-test-fscache-drop-PathLike-annotation.patch diff --git a/.gitignore b/.gitignore index f2198a2..4d15cd4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-72.tar.gz +SOURCES/osbuild-73.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index 9d20199..d9559a9 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -8eef208ba6c01c46ae19ad58c2e7e48595e634b9 SOURCES/osbuild-72.tar.gz +f663b178905cdd2f0b239695c685f9e331e6c34a SOURCES/osbuild-73.tar.gz diff --git a/SOURCES/0001-test-fscache-drop-PathLike-annotation.patch b/SOURCES/0001-test-fscache-drop-PathLike-annotation.patch new file mode 100644 index 0000000..858bf1a --- /dev/null +++ b/SOURCES/0001-test-fscache-drop-PathLike-annotation.patch @@ -0,0 +1,28 @@ +From 8511add1695c49cc7f3df2220044a4eed17ba1a5 Mon Sep 17 00:00:00 2001 +From: David Rheinsberg +Date: Wed, 7 Dec 2022 13:44:57 +0100 +Subject: [PATCH] test/fscache: drop PathLike annotation + +Drop the PathLike annotation, since it is not compatible to py-3.6. + +Signed-off-by: David Rheinsberg +--- + test/mod/test_util_fscache.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/mod/test_util_fscache.py b/test/mod/test_util_fscache.py +index 4a3141b..1125abd 100644 +--- a/test/mod/test_util_fscache.py ++++ b/test/mod/test_util_fscache.py +@@ -39,7 +39,7 @@ def test_calculate_size(tmpdir): + assert fscache.FsCache._calculate_size(os.path.join(tmpdir, "dir")) == 6 + + +-def test_pathlike(tmpdir: os.PathLike[str]): ++def test_pathlike(tmpdir): + # + # Verify behavior of `__fspath__()`. + # +-- +2.38.1 + diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index 60ca105..584b690 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 72 +Version: 73 %forgemeta @@ -18,6 +18,9 @@ Source0: %{forgesource} BuildArch: noarch Summary: A build system for OS images +# https://github.com/osbuild/osbuild/pull/1196 +Patch0: 0001-test-fscache-drop-PathLike-annotation.patch + BuildRequires: make BuildRequires: python3-devel BuildRequires: python3-docutils @@ -120,7 +123,7 @@ Contains additional tools and utilities for development of manifests and osbuild. %prep -%forgesetup +%forgeautosetup -p1 %build %py3_build @@ -251,6 +254,9 @@ fi %changelog +* Wed Dec 07 2022 imagebuilder-bot - 73-1 +- New upstream release + * Wed Nov 23 2022 imagebuilder-bot - 72-1 - New upstream release