From 72c6b922393a77bfa598244a8aa30dac0d5ecedfcb5d6929343215b79eaa13cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Wed, 8 May 2024 12:59:40 +0000 Subject: [PATCH] - Fix spec file Require docopt-ng for Fedora 41+ OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=249 --- PKGBUILD | 2 +- python-kiwi.changes | 7 +++++++ python-kiwi.spec | 8 ++++++++ python-kiwi.tar.gz | 4 ++-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 449f0e8..d9cb448 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ makedepends=(make gcc python-build python-docopt python-installer python-lxml py provides=(kiwi-ng kiwi) source=("${pkgname}.tar.gz") changelog="${pkgname}.changes" -md5sums=('e7c3b49a965fe2d842197ab25f84521b') +md5sums=('16585c1d596368fcddf095046b9fa384') build() { diff --git a/python-kiwi.changes b/python-kiwi.changes index 3a9ce3c..b4ac9bb 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 08 10:48:57 CEST 2024 - Marcus Schäfer + +- Fix spec file + + Require docopt-ng for Fedora 41+ + ------------------------------------------------------------------- Tue May 07 16:18:28 CEST 2024 - Marcus Schäfer diff --git a/python-kiwi.spec b/python-kiwi.spec index cc240d4..dc5a46f 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -76,7 +76,11 @@ BuildRequires: python%{python3_pkgversion}-installer BuildRequires: python%{python3_pkgversion}-poetry-core >= 1.2.0 BuildRequires: python%{python3_pkgversion}-wheel # doc build requirements +%if ! (0%{?fedora} >= 41 || 0%{?rhel} >= 10) BuildRequires: python%{python3_pkgversion}-docopt >= 0.6.2 +%else +BuildRequires: python%{python3_pkgversion}-docopt-ng +%endif BuildRequires: python%{python3_pkgversion}-lxml BuildRequires: python%{python3_pkgversion}-requests BuildRequires: python%{python3_pkgversion}-setuptools @@ -396,7 +400,11 @@ Requires: python%{python3_pkgversion}-yaml Requires: python%{python3_pkgversion}-PyYAML %endif Requires: python%{python3_pkgversion}-simplejson +%if ! (0%{?fedora} >= 41 || 0%{?rhel} >= 10) Requires: python%{python3_pkgversion}-docopt +%else +Requires: python%{python3_pkgversion}-docopt-ng +%endif Requires: python%{python3_pkgversion}-lxml Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-setuptools diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 8bd958d..3be9872 100644 --- a/python-kiwi.tar.gz +++ b/python-kiwi.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e34cfbbed5baaa95d3e99ca34512b419379207f7a6b3b1d39165348e2073f2c2 -size 1016295 +oid sha256:efed58a0171964457d52cc5a15a010980c039aec23c2549cd331e5b92631385d +size 1016334