[nfs-ganesha/el6] nfs-ganesha-2.0.0-3, add glusterfs

Kaleb S. KEITHLEY kkeithle at fedoraproject.org
Sat Jan 4 16:22:17 UTC 2014


commit 6c1f1e7527a4e83f86ee929bf976b6e5d041f563
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Sat Jan 4 11:21:56 2014 -0500

    nfs-ganesha-2.0.0-3, add glusterfs

 nfs-ganesha.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index c1a29da..bb8cd1d 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -11,11 +11,16 @@
 %global           _with_systemd true
 %endif
 
+# GlusterFS is not available in EPEL
+%if ( ! 0%{?rhel} )
+%global           with_glusterfs true
+%endif
+
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:              nfs-ganesha
 Version:           %{version}
-Release:           2%{?prereltag:.%{prereltag}}%{?dist}
+Release:           3%{?prereltag:.%{prereltag}}%{?dist}
 Summary:           Ganesha NFS Server
 Group:             System Environment/Libraries
 License:           LGPLv3+
@@ -57,7 +62,9 @@ BuildRequires:     libnfsidmap-devel
 BuildRequires:     libwbclient-devel
 %endif
 BuildRequires:     libcap-devel
-# BuildRequires:     glusterfs-api-devel
+%if ( 0%{?with_glusterfs:1} )
+BuildRequires:     glusterfs-api-devel
+%endif
 
 %if ( 0%{?_with_systemd:1} )
 Requires(post):    systemd
@@ -71,7 +78,9 @@ Requires(postun): /sbin/service
 %endif
 Requires:          dbus
 Requires:          jemalloc
-# Requires:          glusterfs-api
+%if ( 0%{?with_glusterfs:1} )
+Requires:          glusterfs-api
+%endif
 
 %description
 NFS-Ganesha is a user mode file server with support for both the
@@ -174,6 +183,9 @@ install -D -p -m 0744 %{SOURCE4} %{buildroot}%{_sbindir}/nfs_ganesha.sh
 %dir %{_pkgdocdir}
 
 %changelog
+* Sat Jan 4 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-3
+- with glusterfs-api
+
 * Thu Jan 2 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.0.0-2
 - Build on RHEL6. Add sample init.d script
 


More information about the scm-commits mailing list