From c1dc434dbb135614acdedecf8d66db7a2c383790 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Jan 06 2017 17:57:26 +0000
Subject: firewalld fixes


---

diff --git a/glusterfs-3.9.0.configure.ac.patch b/glusterfs-3.9.0.configure.ac.patch
new file mode 100644
index 0000000..b5f4b81
--- /dev/null
+++ b/glusterfs-3.9.0.configure.ac.patch
@@ -0,0 +1,11 @@
+--- glusterfs-3.9.0/configure.ac.orig	2017-01-06 12:44:28.270940821 -0500
++++ glusterfs-3.9.0/configure.ac	2017-01-06 12:46:19.781940821 -0500
+@@ -810,7 +810,7 @@
+               [BUILD_FIREWALLD="${enableval}"], [BUILD_FIREWALLD="no"])
+ 
+ if test "x${BUILD_FIREWALLD}" = "xyes"; then
+-        if !(which firewalld 1>/dev/null 2>&1) ; then
++        if !(test -d /usr/lib/firewalld/services 1>/dev/null 2>&1) ; then
+                 BUILD_FIREWALLD="no (firewalld not installed)"
+         fi
+ fi
diff --git a/glusterfs.spec b/glusterfs.spec
index 11560a7..ee8dadb 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -168,7 +168,7 @@ Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.9.0
-Release:          1%{?prereltag:.%{prereltag}}%{?dist}
+Release:          2%{?prereltag:.%{prereltag}}%{?dist}
 Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
@@ -190,6 +190,7 @@ Source8:          glusterfsd.init
 Source0:          @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
 %endif
 Patch0:           glusterfs-3.9.0rc2.api.glfs_free.patch
+Patch1:           glusterfs-3.9.0.configure.ac.patch
 
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -234,7 +235,7 @@ BuildRequires:    libattr-devel
 %endif
 
 %if (0%{?_with_firewalld:1})
-BuildRequires:    firewalld
+BuildRequires:    firewalld-filesystem
 %endif
 
 Obsoletes:        hekafs
@@ -599,6 +600,10 @@ Requires(preun):  /sbin/service
 Requires(preun):  /sbin/chkconfig
 Requires(postun): /sbin/service
 %endif
+%if (0%{?_with_firewalld:1})
+# we install firewalld rules, so we need to have the directory owned
+Requires:         firewalld-filesystem
+%endif
 %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
 Requires:         rpcbind
 %else
@@ -627,6 +632,7 @@ This package provides the glusterfs server daemon.
 %prep
 %setup -q -n %{name}-%{version}%{?prereltag}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if ( 0%{?rhel} && 0%{?rhel} < 6 )
@@ -859,10 +865,7 @@ if [ -e /etc/ld.so.conf.d/glusterfs.conf ]; then
 fi
 
 %if (0%{?_with_firewalld:1})
-#reload service files if firewalld running
-if $(systemctl is-active firewalld 1>/dev/null 2>&1); then
-  #firewalld-filesystem is not available for rhel7, so command used for reload.
-  firewall-cmd  --reload 1>/dev/null 2>&1
+    %firewalld_reload
 fi
 %endif
 
@@ -945,10 +948,7 @@ exit 0
 %postun server
 /sbin/ldconfig
 %if (0%{?_with_firewalld:1})
-#reload service files if firewalld running
-if $(systemctl is-active firewalld 1>/dev/null 2>&1); then
-    firewall-cmd  --reload
-fi
+    %firewalld_reload
 %endif
 exit 0
 
@@ -1289,6 +1289,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Jan 6 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.9.0-2
+- firewalld fixes
+
 * Tue Nov 15 2016  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.9.0-1
 - 3.9.0 GA
 -  w/ glfs_free(), needed for nfs-ganesha-2.4.1 w/ patched FSAL_GLUSTER