From 2f030add8d173cf23a72c47a1c8f7e8c87c44f9d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 23 Jan 2023 15:12:38 +0100 Subject: [PATCH] Use python3-dateutil instead of python3-iso8601 We don't have iso8601 in third_party/ anymore. --- samba.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/samba.spec b/samba.spec index 7ab5ada..7d4e43c 100644 --- a/samba.spec +++ b/samba.spec @@ -352,9 +352,6 @@ BuildRequires: python3-etcd %endif %if %{with dc} || %{with testsuite} -# Add python3-iso8601 to avoid that the -# version in Samba is being packaged -BuildRequires: python3-iso8601 BuildRequires: python3-pyasn1 >= 0.4.8 BuildRequires: bind @@ -392,6 +389,11 @@ BuildRequires: lmdb-devel %if %{with dc} || %{with testsuite} BuildRequires: bind BuildRequires: krb5-server >= %{required_mit_krb5} +%if 0%{?fedora} || 0%{rhel} >= 9 +BuildRequires: python3-dateutil +%else +BuildRequires: python3-iso8601 +%endif BuildRequires: python3-gpg BuildRequires: python3-markdown BuildRequires: python3-setproctitle @@ -1457,12 +1459,6 @@ for i in \ %{python3_sitearch}/samba/remove_dc.py \ %{python3_sitearch}/samba/samdb.py \ %{python3_sitearch}/samba/schema.py \ - %{python3_sitearch}/samba/third_party/iso8601/__init__.py \ - %{python3_sitearch}/samba/third_party/iso8601/__pycache__/__init__.*.pyc \ - %{python3_sitearch}/samba/third_party/iso8601/__pycache__/iso8601.*.pyc \ - %{python3_sitearch}/samba/third_party/iso8601/__pycache__/test_iso8601.*.pyc \ - %{python3_sitearch}/samba/third_party/iso8601/iso8601.py \ - %{python3_sitearch}/samba/third_party/iso8601/test_iso8601.py \ %{python3_sitearch}/samba/uptodateness.py \ %{_sbindir}/samba-gpupdate \ ; do