From a7e701aacf645e72f69cb34eaabcb816104ff2bd Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 30 Jan 2012 17:57:20 +0100 Subject: Add temporary ldb fix. --- samba4-ldb-configure.patch | 17 +++++++++++++++++ samba4.spec | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 samba4-ldb-configure.patch diff --git a/samba4-ldb-configure.patch b/samba4-ldb-configure.patch new file mode 100644 index 0000000..60c92b5 --- /dev/null +++ b/samba4-ldb-configure.patch @@ -0,0 +1,17 @@ +Index: samba-4.0.0/lib/ldb/wscript +=================================================================== +--- samba-4.0.0.orig/lib/ldb/wscript ++++ samba-4.0.0/lib/ldb/wscript +@@ -29,11 +29,10 @@ def set_options(opt): + opt.tool_options('python') # options for disabling pyc or pyo compilation + + def configure(conf): +- conf.RECURSE('lib/tdb_compat') ++ conf.RECURSE('lib/tdb') + conf.RECURSE('lib/tevent') + conf.RECURSE('lib/popt') + conf.RECURSE('lib/replace') +- conf.RECURSE('lib/tdb_compat') + conf.find_program('python', var='PYTHON') + conf.find_program('xsltproc', var='XSLTPROC') + conf.check_tool('python') diff --git a/samba4.spec b/samba4.spec index 63f0fe1..f46d958 100644 --- a/samba4.spec +++ b/samba4.spec @@ -45,6 +45,7 @@ Source6: samba.pamd #Source7: smbprint Patch1: samba4-libpdb-soversion.patch +Patch2: samba4-ldb-configure.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -328,6 +329,7 @@ The samba-dc package provides AD Domain Controller functionality %setup -q -n samba-%{version} %patch1 -p1 -b .waf +%patch2 -p1 -b .ldb %build %define talloc_lib %nil -- cgit