From c91db5d305880da218f7f099cd9c58872ffe8c38 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 6 Jan 2023 04:13:16 +0000 Subject: [PATCH] import osbuild-75-1.el8 --- .gitignore | 2 +- .osbuild.metadata | 2 +- ...est-fscache-drop-PathLike-annotation.patch | 28 ------------------- SPECS/osbuild.spec | 10 +++---- 4 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 SOURCES/0001-test-fscache-drop-PathLike-annotation.patch diff --git a/.gitignore b/.gitignore index 4d15cd4..e758a6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-73.tar.gz +SOURCES/osbuild-75.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index d9559a9..c38c70c 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -f663b178905cdd2f0b239695c685f9e331e6c34a SOURCES/osbuild-73.tar.gz +db1edb543c25cd4c6e3faa14c9ae98d4ef7d16b1 SOURCES/osbuild-75.tar.gz diff --git a/SOURCES/0001-test-fscache-drop-PathLike-annotation.patch b/SOURCES/0001-test-fscache-drop-PathLike-annotation.patch deleted file mode 100644 index 858bf1a..0000000 --- a/SOURCES/0001-test-fscache-drop-PathLike-annotation.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 584b690..bab78ab 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 73 +Version: 75 %forgemeta @@ -18,9 +18,6 @@ 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 @@ -123,7 +120,7 @@ Contains additional tools and utilities for development of manifests and osbuild. %prep -%forgeautosetup -p1 +%forgesetup %build %py3_build @@ -254,6 +251,9 @@ fi %changelog +* Wed Jan 04 2023 imagebuilder-bot - 75-1 +- New upstream release + * Wed Dec 07 2022 imagebuilder-bot - 73-1 - New upstream release