summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2012-01-30 17:57:20 +0100
committerAndreas Schneider <asn@cryptomilk.org>2012-01-30 17:57:20 +0100
commita7e701aacf645e72f69cb34eaabcb816104ff2bd (patch)
tree91bf1aa79b23d687767cc77f7a903883141d8540
parente5bf2f114e80abd7f46d2fd41decc4146fdff65b (diff)
downloadsamba4-a7e701aacf645e72f69cb34eaabcb816104ff2bd.tar.gz
samba4-a7e701aacf645e72f69cb34eaabcb816104ff2bd.tar.xz
samba4-a7e701aacf645e72f69cb34eaabcb816104ff2bd.zip
Add temporary ldb fix.
-rw-r--r--samba4-ldb-configure.patch17
-rw-r--r--samba4.spec2
2 files changed, 19 insertions, 0 deletions
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