kkeithle pushed to nfs-ganesha (f22). "2.2.0-0.9rc6"

[notifications at fedoraproject.org]

>From 25354fc66fe3b3c2500a388e90b7e63422463c8c Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle at redhat.com>
Date: Mon, 30 Mar 2015 07:45:15 -0400
Subject: 2.2.0-0.9rc6


diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 723815d..c46d78b 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -67,15 +67,18 @@
 %bcond_without utils
 %global use_utils %{on_off_switch utils}
 
-%global dev_version %{lua: extraver = string.gsub('-rc5', '%-', ''); print(extraver) }
+%bcond_without gui_utils
+%global use_gui_utils %{on_off_switch gui_utils}
+
+%global dev_version %{lua: extraver = string.gsub('-rc6', '%-', ''); print(extraver) }
 
 %global		ntirpcname	ntirpc
 %global		ntirpcvers	1.2.1
-%global		versiontag	2.2-rc5
+%global		versiontag	2.2-rc6
 
 Name:		nfs-ganesha
 Version:	2.2.0
-Release:	0.8%{?dev_version:%{dev_version}}%{?dist}
+Release:	0.9%{?dev_version:%{dev_version}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 Group:		Applications/System
 License:	LGPLv3+
@@ -102,6 +105,7 @@ BuildRequires:	libcap-devel
 BuildRequires:	libblkid-devel
 BuildRequires:	libuuid-devel
 Requires:	dbus
+Requires:	nfs-utils
 %if %{with_nfsidmap}
 BuildRequires:	libnfsidmap-devel
 %else
@@ -174,8 +178,10 @@ be used with NFS-Ganesha to support PROXY based filesystems
 %package utils
 Summary: The NFS-GANESHA's util scripts
 Group: Applications/System
+%if %{with gui_utils}
 BuildRequires:	PyQt4-devel
 Requires:	PyQt4
+%endif
 Requires: nfs-ganesha = %{version}-%{release}, python
 
 %description utils
@@ -338,6 +344,7 @@ mv %{ntirpcname}-%{ntirpcvers}/* src/libntirpc/
 	-DUSE_FSAL_LUSTRE_UP=%{use_lustre_up}		\
 	-DUSE_LTTNG=%{use_lttng}			\
 	-DUSE_ADMIN_TOOLS=%{use_utils}			\
+	-DUSE_GUI_ADMIN_TOOLS=%{use_gui_utils}		\
 	-DUSE_FSAL_VFS=ON				\
 	-DUSE_FSAL_PROXY=ON				\
 	-DUSE_DBUS=ON					\
@@ -551,11 +558,13 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
 %defattr(-,root,root,-)
 %{python2_sitelib}/Ganesha/*
 %{python2_sitelib}/ganeshactl-*-info
+%if %{with gui_utils}
 %{_bindir}/ganesha-admin
 %{_bindir}/manage_clients
 %{_bindir}/manage_exports
 %{_bindir}/manage_logger
 %{_bindir}/ganeshactl
+%endif
 %{_bindir}/fake_recall
 %{_bindir}/get_clientids
 %{_bindir}/grace_period
@@ -566,6 +575,9 @@ mv %{buildroot}/usr%{_sysconfdir}/ganesha/ganesha.conf %{buildroot}%{_sysconfdir
 %endif
 
 %changelog
+* Mon Mar 30 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.9rc6
+- 2.2.0-0.9rc6
+
 * Sun Mar 22 2015 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.2.0-0.8rc5
 - 2.2.0-0.8rc5
 
diff --git a/sources b/sources
index d993d8b..f7f4b8a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-923ba293f1c6168fb80aae0d607d1491  nfs-ganesha-2.2.0rc5.tar.gz
+66bb0eb1848172c91e5d46a169a08c95  nfs-ganesha-2.2.0rc6.tar.gz
 e46e22bf9b312a7e92684a177f1f46d7  ntirpc-1.2.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nfs-ganesha.git/commit/?h=f22&id=25354fc66fe3b3c2500a388e90b7e63422463c8c