From 718b82bf01069950d1fdf56de1326ea668633a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 1 Aug 2023 09:58:26 +0200 Subject: [PATCH 1/2] rpm spec: bump copyright year --- package/python-kiwi-spec-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-kiwi-spec-template b/package/python-kiwi-spec-template index ade0085c159..67b691f87f8 100644 --- a/package/python-kiwi-spec-template +++ b/package/python-kiwi-spec-template @@ -1,7 +1,7 @@ # # spec file for package kiwi # -# Copyright (c) 2020 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 From 210ab23c2d1555abdc79ce960747add529e05543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 1 Aug 2023 09:58:44 +0200 Subject: [PATCH 2/2] rpm spec: add missing requires of typing_extensions for python < 3.8 --- package/python-kiwi-spec-template | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/python-kiwi-spec-template b/package/python-kiwi-spec-template index 67b691f87f8..d6082445bbc 100644 --- a/package/python-kiwi-spec-template +++ b/package/python-kiwi-spec-template @@ -366,6 +366,7 @@ Requires: screen Requires: python%{python3_pkgversion} >= 3.6 %if 0%{?ubuntu} || 0%{?debian} Requires: python%{python3_pkgversion}-yaml +Requires: python%{python3_pkgversion}-typing-extensions %else Requires: python%{python3_pkgversion}-PyYAML %endif @@ -374,6 +375,12 @@ Requires: python%{python3_pkgversion}-docopt Requires: python%{python3_pkgversion}-lxml Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-setuptools +%if 0%{?rhel} || 0%{?fedora} +Requires: (python%{python3_pkgversion}-typing-extensions if python%{python3_pkgversion} < 3.8) +%endif +%if 0%{?suse_version} +Requires: (python%{python3_pkgversion}-typing_extensions if python%{python3_pkgversion} < 3.8) +%endif %if ! (0%{?rhel} && 0%{?rhel} < 8) Recommends: kiwi-man-pages %endif