From f770f0cd9c0c4005c871c7bcd15a15e751ad4be3 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Tue, 21 Feb 2017 22:39:08 -0500
Subject: [PATCH] 3.10.0 RC1

---
 glusterfs.spec | 23 +++++++++++++++++------
 sources        |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/glusterfs.spec b/glusterfs.spec
index 93cd2c0..79ae704 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -3,7 +3,7 @@
 %global _for_fedora_koji_builds 1
 
 # uncomment and add '%' to use the prereltag for pre-releases
-%global prereltag rc0
+%global prereltag rc1
 
 ##-----------------------------------------------------------------------------
 ## All argument definitions should be placed here and keep them sorted
@@ -168,7 +168,7 @@ Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.10.0
-Release:          0.1%{?prereltag:.%{prereltag}}%{?dist}
+Release:          0.2%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
@@ -357,10 +357,14 @@ This package provides the development libraries and include files.
 Summary:          GlusterFS Events
 Group:            Applications/File
 Requires:         %{name}-server%{?_isa} = %{version}-%{release}
-Requires:         python2 python2-requests
-Requires:         python-prettytable
+Requires:         python2 python-prettytable
 Requires:         python2-gluster = %{version}-%{release}
-%if ( 0%{?rhel} && 0%{?rhel} <= 6 )
+%if ( 0%{?rhel} )
+Requires:         python-requests
+%else
+Requires:         python2-requests
+%endif
+%if ( 0%{?rhel} && 0%{?rhel} < 7 )
 Requires:         python-argparse
 %endif
 %if ( 0%{?_with_systemd:1} )
@@ -523,6 +527,8 @@ Summary:          GlusterFS python library
 Group:            Development/Tools
 %{?python_provide:%python_provide python2-gluster}
 Requires:         python2
+Provides:         python-gluster = %{version}-%{release}
+Obsoletes:        python-gluster < 3.10
 
 %description -n python2-gluster %{_python_gluster_description}
 
@@ -1074,7 +1080,6 @@ exit 0
 # glusterfs is a symlink to glusterfsd, -server depends on -fuse.
 %{_sbindir}/glusterfs
 %{_sbindir}/glusterfsd
-%{_sbindir}/gf_attach
 %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse.so
 /sbin/mount.glusterfs
@@ -1090,6 +1095,7 @@ exit 0
 %files ganesha
 %{_sysconfdir}/ganesha/*
 %{_libexecdir}/ganesha/*
+%{_prefix}/lib/ocf/resource.d/heartbeat/*
 %{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh
 
 %if ( 0%{!?_without_georeplication:1} )
@@ -1180,6 +1186,7 @@ exit 0
 # binaries
 %{_sbindir}/glusterd
 %{_sbindir}/glfsheal
+%{_sbindir}/gf_attach
 # {_sbindir}/glusterfsd is the actual binary, but glusterfs (client) is a
 # symlink. The binary itself (and symlink) are part of the glusterfs-fuse
 # package, because glusterfs-server depends on that anyway.
@@ -1218,6 +1225,7 @@ exit 0
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/bitd
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/groups
             %attr(0644,-,-) %{_sharedstatedir}/glusterd/groups/virt
+            %attr(0644,-,-) %{_sharedstatedir}/glusterd/groups/metadata-cache
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glusterfind
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glusterfind/.keys
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd
@@ -1301,6 +1309,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Feb 21 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.0-0.2rc1
+- 3.10.0 RC1
+
 * Tue Feb 7 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.0-0.1rc0
 - 3.10.0 RC0
 
diff --git a/sources b/sources
index 7000c8c..545ac73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-3.10.0rc0.tar.gz) = 5df13a5e791f92de203c82c345cc88d0472cd06c45b078b924d97a4ae954b4028b125b7a2100800797763b08b3e619ada205cc423ff29e71925171b31591b4ef
+SHA512 (glusterfs-3.10.0rc1.tar.gz) = 85b76c6e53f63949575c084f9505e4d1272ca4ca289047dac45dec5ce2c624080ffe14cb902b6b4f84d9bf818c5118c8e65e7ba5c1d9ccff4a0cf6ee1cee47d3