diff --git a/samba.spec b/samba.spec index f58f071..4d8ffe8 100644 --- a/samba.spec +++ b/samba.spec @@ -6,7 +6,7 @@ # ctdb is enabled by default, you can disable it with: --without clustering %bcond_without clustering -%define main_release 4 +%define main_release 5 %define samba_version 4.10.0 %define talloc_version 2.1.16 @@ -118,6 +118,8 @@ Source14: samba.pamd Source201: README.downgrade +Patch0: v4.10_build_fix.patch + Requires(pre): /usr/sbin/groupadd Requires(post): systemd Requires(preun): systemd @@ -3405,6 +3407,9 @@ fi %endif # with_clustering_support %changelog +* Wed Mar 20 2019 Guenther Deschner - 4.10.0-5 +- Fix build failure (duplication during install) + * Tue Mar 19 2019 Guenther Deschner - 4.10.0-4 - Update to Samba 4.10.0 diff --git a/v4.10_build_fix.patch b/v4.10_build_fix.patch new file mode 100644 index 0000000..cafd0c1 --- /dev/null +++ b/v4.10_build_fix.patch @@ -0,0 +1,39 @@ +From 739ac46f26e72a601405a0a59747b27584238b3e Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Wed, 20 Mar 2019 11:09:21 +0100 +Subject: [PATCH] s4:librpc: Fix installation of Samba + +This breaks installation of Samba 4.10 on Fedora. + +https://bugzilla.samba.org/show_bug.cgi?id=13847 + +Signed-off-by: Andreas Schneider +Reviewed-by: Alexander Bokovoy + +(cherry picked from commit bf469343f577e2d78df0e38d80e7976b351eaf0d) +--- + source4/librpc/wscript_build | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build +index f00571e4bc3..d9b7743c9d1 100644 +--- a/source4/librpc/wscript_build ++++ b/source4/librpc/wscript_build +@@ -412,14 +412,6 @@ for env in bld.gen_python_environments(): + cflags_end=gen_cflags + ) + +- bld.SAMBA_PYTHON('python_idmap', +- source='../../librpc/gen_ndr/py_idmap.c', +- deps='NDR_IDMAP %s %s' % (pytalloc_util, pyrpc_util), +- realname='samba/dcerpc/idmap.so', +- cflags_end=gen_cflags +- ) +- +- + bld.SAMBA_PYTHON('python_drsuapi', + source='../../librpc/gen_ndr/py_drsuapi.c', + deps='RPC_NDR_DRSUAPI %s %s' % (pytalloc_util, pyrpc_util), +-- +2.21.0 +