diff --git a/.gitignore b/.gitignore index dfa85a0..d759be1 100644 --- a/.gitignore +++ b/.gitignore @@ -295,3 +295,5 @@ samba-3.6.0pre1.tar.gz /samba-4.21.0.tar.xz /samba-4.21.1.tar.asc /samba-4.21.1.tar.xz +/samba-4.21.2.tar.asc +/samba-4.21.2.tar.xz diff --git a/samba.spec b/samba.spec index f2590fa..0ee0bcd 100644 --- a/samba.spec +++ b/samba.spec @@ -148,9 +148,7 @@ %bcond lmdb 0 %endif -%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.21.1 +%global samba_version 4.21.2 # The release field is extended: # [.][.]%%{?dist}[.] @@ -686,9 +684,7 @@ name server related details of Samba AD. Summary: Developer tools for Samba libraries Requires: %{name}-libs = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver} -%if %{with dc} Requires: %{name}-dc-libs = %{samba_depver} -%endif Requires: libnetapi = %{samba_depver} Provides: samba4-devel = %{samba_depver} @@ -1596,6 +1592,12 @@ cp -a lib/ldb/apidocs/man/* %{buildroot}%{_mandir} rm -f %{buildroot}%{_mandir}/man3/_* rm -f %{buildroot}%{_mandir}/man3/PyLdb* +# CTDB +%if %{with clustering} +touch %{buildroot}%{_libexecdir}/ctdb/statd_callout +#endif with clustering +%endif + %if %{with testsuite} %check # @@ -2652,6 +2654,7 @@ fi %{python3_sitearch}/samba/dcerpc/ntlmssp.*.so %{python3_sitearch}/samba/dcerpc/preg.*.so %{python3_sitearch}/samba/dcerpc/samr.*.so +%{python3_sitearch}/samba/dcerpc/schannel.*.so %{python3_sitearch}/samba/dcerpc/security.*.so %{python3_sitearch}/samba/dcerpc/server_id.*.so %{python3_sitearch}/samba/dcerpc/smb_acl.*.so @@ -3821,7 +3824,7 @@ fi %{_sysconfdir}/ctdb/functions %{_sysconfdir}/ctdb/nfs-linux-kernel-callout -%{_sysconfdir}/ctdb/statd-callout +%ghost %{_sysconfdir}/ctdb/statd-callout # CTDB scripts, no config files # script with executable bit means activated diff --git a/sources b/sources index 28e2450..8c97e7b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.21.1.tar.asc) = 2c1e4b347044e15a852ced8bb412a3f372fd2c2b5e0001b1a773f7283f2d8fa62942143b46cbc3f16b18882255cf0aac4426002453971361b0002357657484f1 -SHA512 (samba-4.21.1.tar.xz) = 182759820708c9df26fbcb09e755e81236ecacf543f3e18a05dbd0ea551ab072d338fe239eb99ff506f158ec45e981a893ce46eacdde6e073ee85ceb43e2669a +SHA512 (samba-4.21.2.tar.asc) = f3da123d2e86a7e07c4fcb83924edd29195d865091d80125f3531c463662a8a38ba6d8c467932af8cd065d0cc4467131c83a4e3783573b757f6ed9c2bde0befc +SHA512 (samba-4.21.2.tar.xz) = c26311a60d3994561aa12c36e54bc37d1161ec1063aa9876ea03dee24984e9c827e5836dc86bc392e37193010275a642b960e775b5a9e029246ba56ae1697682