From c761f78337078354ffeddb4783ae2a2cc61e3e62 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Fri, 19 Jun 2015 13:31:53 +0200
Subject: [PATCH] fix build for s390x and ppc64 (#1232650)

---
 dovecot-2.2.18-fixbuild.patch | 11 +++++++++++
 dovecot.spec                  |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 dovecot-2.2.18-fixbuild.patch

diff --git a/dovecot-2.2.18-fixbuild.patch b/dovecot-2.2.18-fixbuild.patch
new file mode 100644
index 0000000..0269d9f
--- /dev/null
+++ b/dovecot-2.2.18-fixbuild.patch
@@ -0,0 +1,11 @@
+--- dovecot-2.2.18/src/lib/test-net.c	2015-05-03 05:12:11.000000000 -0400
++++ dovecot-2.2.18/src/lib/test-net.c	2015-06-17 03:18:02.571420401 -0400
+@@ -56,7 +56,7 @@ static void test_net_ip2addr(void)
+ 	test_begin("net_ip2addr()");
+ 	test_assert(net_addr2ip("127.0.0.1", &ip) == 0 &&
+ 		    ip.family == AF_INET &&
+-		    ip.u.ip4.s_addr == (127 | (1 << 24)));
++		    ntohl(ip.u.ip4.s_addr) == (0x7f000001));
+ #ifdef HAVE_IPV6
+ 	test_assert(net_addr2ip("::5", &ip) == 0 &&
+ 		    ip.family == AF_INET6 &&
diff --git a/dovecot.spec b/dovecot.spec
index 4646f4f..c51dcfe 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -5,7 +5,7 @@ Name: dovecot
 Epoch: 1
 Version: 2.2.18
 %global prever %{nil}
-Release: 3%{?dist}
+Release: 4%{?dist}
 #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2
 License: MIT and LGPLv2
 Group: System Environment/Daemons
@@ -36,6 +36,7 @@ Patch5: dovecot-2.1-privatetmp.patch
 #wait for network
 Patch6: dovecot-2.1.10-waitonline.patch
 Patch7: dovecot-2.2.13-online.patch
+Patch8: dovecot-2.2.18-fixbuild.patch
 
 Source15: prestartscript
 
@@ -133,6 +134,7 @@ This package provides the development files for dovecot.
 %patch5 -p1 -b .privatetmp
 %patch6 -p1 -b .waitonline
 %patch7 -p1 -b .online
+%patch8 -p1 -b .fixbuild
 #pushd dovecot-2*2-pigeonhole-%{pigeonholever}
 #popd
 sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
@@ -495,6 +497,9 @@ make check
 %{_libdir}/%{name}/dict/libdriver_pgsql.so
 
 %changelog
+* Fri Jun 19 2015 Michal Hlavinka <mhlavink@redhat.com> - 1:2.2.18-4
+- fix build for s390x and ppc64 (#1232650)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.2.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild