diff --git a/.gitignore b/.gitignore index f774227..64aee81 100644 --- a/.gitignore +++ b/.gitignore @@ -269,3 +269,5 @@ samba-3.6.0pre1.tar.gz /samba-4.17.2.tar.xz /samba-4.17.4.tar.asc /samba-4.17.4.tar.xz +/samba-4.17.5.tar.asc +/samba-4.17.5.tar.xz diff --git a/samba.spec b/samba.spec index 5435122..824d453 100644 --- a/samba.spec +++ b/samba.spec @@ -134,8 +134,8 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") -%global samba_version 4.17.4 -%global baserelease 102 +%global samba_version 4.17.5 +%global baserelease 100 # This should be rc1 or %%nil %global pre_release %nil @@ -306,8 +306,10 @@ BuildRequires: perl-generators BuildRequires: perl(Archive::Tar) BuildRequires: perl(Test::More) BuildRequires: popt-devel +BuildRequires: python3-cryptography BuildRequires: python3-devel BuildRequires: python3-dns +BuildRequires: python3-requests BuildRequires: python3-setuptools BuildRequires: quota-devel BuildRequires: readline-devel @@ -347,17 +349,6 @@ BuildRequires: librados-devel 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 -BuildRequires: krb5-server >= %{required_mit_krb5} -#endif with dc -%endif - # pidl requirements BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(FindBin) @@ -388,10 +379,15 @@ 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-pyasn1 >= 0.4.8 BuildRequires: python3-setproctitle -BuildRequires: python3-cryptography %if %{without includelibs} BuildRequires: tdb-tools @@ -840,11 +836,13 @@ Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} Requires: %{name}-dc-libs = %{samba_depver} -Requires: python3-talloc -Requires: python3-tevent -Requires: python3-tdb -Requires: python3-ldb +Requires: python3-cryptography Requires: python3-dns +Requires: python3-ldb +Requires: python3-requests +Requires: python3-talloc +Requires: python3-tdb +Requires: python3-tevent %if %{with libsmbclient} Requires: libsmbclient = %{samba_depver} %endif @@ -1448,12 +1446,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 @@ -4340,6 +4332,9 @@ fi %endif %changelog +* Fri Jan 27 2023 Pavel Filipenský - 4.17.5-100 +- related: rhbz#2131993 - Update to version 4.17.5 + * Thu Dec 22 2022 Pavel Filipenský - 4.17.4-102 - related: rhbz#2131993 - Create package dc-libs also for 'non-dc build' diff --git a/sources b/sources index 9f06860..79fbd29 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.17.4.tar.asc) = f69613c148453c57e83ba2bae45a316c19f80f9cceeab81a099d896e2dc578536175aa2278f85cf9e4899c8310a4eafeb1bfe365da16dd63195ffd099d6b6a6c -SHA512 (samba-4.17.4.tar.xz) = ffbde223ae324b6c0c779df75c926b09b77289f0ea4a6b6668d1bd758b621b3ed8ccdc4d101e6b153d1359c185b46d4baef5a7854dbc3864debbfa4696fa6bc8 +SHA512 (samba-4.17.5.tar.asc) = fbc95da49245d38db431b960cfd0c3fd84dba499e4f3648e1aec613999909243688f33d259126cb7a16f507dd490e8c7e53d5e32c3b92d83a335dc14f65e53a9 +SHA512 (samba-4.17.5.tar.xz) = 74245bdbd5c575d54a6278fca7eacaf9807030024288286f560a0c03c3fbb16f72c2c2b7a58241d5880388fbf1917e8240f94ee53d781bc827b9d4271916172a