From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 31 Jan 2017 19:16:36 +0000 (+0100)
Subject: - rel 2; disable dmapi on 32bit as it no longer builds with new dmapi-devel
X-Git-Tag: auto/th/samba-4.5.5-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fsamba.git;a=commitdiff_plain;h=ff9592a

- rel 2; disable dmapi on 32bit as it no longer builds with new dmapi-devel
---

diff --git a/samba.spec b/samba.spec
index d790da2..8c46a18 100644
--- a/samba.spec
+++ b/samba.spec
@@ -4,6 +4,7 @@
 %bcond_without	cups		# CUPS support
 %bcond_without	ldap		# LDAP support
 %bcond_without	avahi		# Avahi support
+%bcond_without	dmapi		# DMAPI support
 %bcond_without	systemd		# systemd integration
 %bcond_with	system_heimdal	# Use system Heimdal libraries (broken in samba 4.4.x)
 %bcond_without	system_libs	# system libraries (talloc,tdb,tevent,ldb,ntdb)
@@ -19,6 +20,11 @@
 %define		tevent_ver	0.9.28
 %endif
 
+# dmapi-devel forces largefile/64bit stuff that isn't detected properly
+%ifarch %{ix86}
+%undefine	with_dmapi
+%endif
+
 %include	/usr/lib/rpm/macros.perl
 
 # NOTE: packages order is: server + additions, common, clients, libs+devel, ldap
@@ -27,7 +33,7 @@ Summary:	Samba Active Directory and SMB server
 Summary(pl.UTF-8):	Serwer Samba Active Directory i SMB
 Name:		samba
 Version:	4.5.5
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v3
 Group:		Networking/Daemons
@@ -58,7 +64,7 @@ BuildRequires:	ceph-devel >= 0.73
 %{?with_cups:BuildRequires:	cups-devel >= 1:1.2.0}
 BuildRequires:	cyrus-sasl-devel >= 2
 BuildRequires:	dbus-devel
-BuildRequires:	dmapi-devel
+%{?with_dmapi:BuildRequires:	dmapi-devel}
 BuildRequires:	docbook-style-xsl
 # just FAM API
 BuildRequires:	gamin-devel
@@ -561,7 +567,7 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
 	--with%{!?with_ads:out}-ads \
 	%{?with_ctdb_pcp:--enable-pmda} \
 	--with-automount \
-	--with-dmapi \
+	--with%{!?with_dmapi:out}-dmapi \
 	--with-dnsupdate \
 	--with-iconv \
 	--with%{!?with_ldap:out}-ldap \