From 2853f8d9239a857a818787550c6861c98f63f8de Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Thu, 1 Mar 2018 07:58:23 -0500
Subject: [PATCH] 4.0.0 RC1, python2-prettytable,
 .../rpms/glusterfs/pull-request/3

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 0001-libtirpc.patch | 30 ------------------------------
 glusterfs.spec      | 11 +++++++----
 2 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 0001-libtirpc.patch

diff --git a/0001-libtirpc.patch b/0001-libtirpc.patch
deleted file mode 100644
index a88e781..0000000
--- a/0001-libtirpc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 14fc0b826..0b48807f1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -293,6 +293,10 @@ else
-         CFLAGS="${CFLAGS} -g -rdynamic"
- fi
- 
-+AC_ARG_WITH([libtirpc],
-+        AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
-+        [], [with_libtirpc=no])
-+
- AC_ARG_WITH([ipv6-default], AC_HELP_STRING([--with-ipv6-default], [Set IPv6 as default.]))
- if test "x$with_ipv6_default" = "xyes"; then
-         IPV6_DEFAULT=yes
-@@ -1066,6 +1070,14 @@ AC_SUBST(GF_DISTRIBUTION)
- GF_HOST_OS=""
- GF_LDFLAGS="-rdynamic"
- 
-+dnl include tirpc for IPv6 builds
-+if test "x$with_libtirpc" = "xyes" || test "x$IPV6_DEFAULT" = "xyes" ; then
-+    PKG_CHECK_MODULES([TIRPC], [libtirpc],
-+       [GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
-+       [AC_MSG_ERROR([libtirpc requested or needed for IPv6 default but library not found])]
-+    )
-+fi
-+
- dnl include tirpc for IPv6 builds
- if test "x$IPV6_DEFAULT" = "xyes"; then
-         AC_CHECK_LIB([tirpc], [xdr_string], , AC_MSG_ERROR([libtirpc is required to build glusterfs with IPv6 default]))
diff --git a/glusterfs.spec b/glusterfs.spec
index f204578..3348c35 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -226,7 +226,7 @@ Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          4.0.0
-Release:          %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}
+Release:          %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
@@ -410,7 +410,7 @@ This package provides the development libraries and include files.
 %package events
 Summary:          GlusterFS Events
 Requires:         %{name}-server%{?_isa} = %{version}-%{release}
-Requires:         python2 python-prettytable
+Requires:         python2 python2-prettytable
 Requires:         python2-gluster = %{version}-%{release}
 %if ( 0%{?rhel} )
 Requires:         python-requests
@@ -488,7 +488,7 @@ Summary:          GlusterFS Geo-replication
 Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-server = %{version}-%{release}
 Requires:         python2
-Requires:         python-prettytable
+Requires:         python2-prettytable
 %if ( 0%{?rhel} && 0%{?rhel} <= 7 )
 BuildRequires:    python-ctypes
 %endif
@@ -1454,7 +1454,10 @@ exit 0
 %endif
 
 %changelog
-* Tue Feb 27 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0rc1-1
+* Thu Mar 1 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-0.2rc1
+- 4.0.0 RC1, python2-prettytable, .../rpms/glusterfs/pull-request/3
+
+* Tue Feb 27 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-0.1rc1
 - 4.0.0 RC1
 
 * Fri Feb 2 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0rc0-1