install /etc/dbus-1/system.d/org.ganesha.nfsd.conf

- build and install admin tools

nfs-ganesha.spec

@@ -11,15 +11,21 @@
 
 # GlusterFS is not available in EPEL
 # RHEL currently 3.4.0 client, but nfs-ganesha needs 3.4.2.
-%if ( ! 0%{?rhel} )
 %global            with_glusterfs true
-%endif
 
 %global            with_cephfs true
 
+%global            with_admintools true
+
+# From https://fedoraproject.org/wiki/Packaging:Python#Macros
+%if ( 0%{?rhel} && 0%{?rhel} <= 5 )
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
 Name:              nfs-ganesha
 Version:           2.1.0
-Release:           7%{?prereltag:.%{prereltag}}%{?dist}
+Release:           8%{?prereltag:.%{prereltag}}%{?dist}
 Summary:           Ganesha NFS Server
 Group:             System Environment/Libraries
 License:           LGPLv3+
@@ -68,6 +74,9 @@ BuildRequires:     libnfsidmap-devel
 BuildRequires:     libwbclient-devel
 %endif
 BuildRequires:     libcap-devel
+%if ( 0%{?with_admintools:1} )
+BuildRequires:     PyQt4-devel
+%endif
 
 %if ( 0%{?_with_systemd:1} )
 Requires(post):    systemd
@@ -81,6 +90,9 @@ Requires(postun): /sbin/service
 %endif
 Requires:          dbus
 Requires:          jemalloc
+%if ( 0%{?with_admintools:1} )
+Requires:          PyQt
+%endif
 
 %description
 NFS-Ganesha is a user mode file server with support for both the
@@ -169,7 +181,10 @@ mv %{ntirpcname}-%{ntirpcvers}/* src/libntirpc/
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
 %global cmake %cmake28
 %endif
-%cmake -DCMAKE_BUILD_TYPE=Maintainer -DBUILD_CONFIG=everything -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr ./src
+%if ( 0%{?with_admintools:1} )
+%global config_admin -DUSE_ADMIN_TOOLS=ON
+%endif
+%cmake -DCMAKE_BUILD_TYPE=Maintainer -DBUILD_CONFIG=everything -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr %{config_admin} ./src
 # _smp_mflags elided due to random build errors (cmake related?)
 make VERBOSE=1
 
@@ -185,6 +200,7 @@ install -D -p -m 0744 %{SOURCE3} %{buildroot}%{_sysconfdir}/init.d/nfs-ganesha
 install -D -p -m 0744 %{SOURCE4} %{buildroot}%{_sbindir}/nfs_ganesha.sh
 %endif
 install -D -p -m 0644 src/scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_sysconfdir}/sysconfig/nfs-ganesha
+install -D -p -m 0644 src/scripts/ganeshactl/org.ganesha.nfsd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.ganesha.nfsd.conf
 
 %post
 /sbin/ldconfig
@@ -227,6 +243,10 @@ install -D -p -m 0644 src/scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_s
 %{_sbindir}/*
 %endif
 %{_sysconfdir}/sysconfig/*
+%{_sysconfdir}/dbus-1/system.d/*
+%if ( 0%{?with_admintools:1} )
+%{python_sitelib}/*
+%endif
 
 %if ( 0%{?with_glusterfs:1} )
 %files fsal-gluster
@@ -244,6 +264,10 @@ install -D -p -m 0644 src/scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_s
 %dir %{_pkgdocdir}
 
 %changelog
+* Thu Oct 2 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-8
+- install /etc/dbus-1/system.d/org.ganesha.nfsd.conf
+- build and install admin tools
+
 * Mon Sep 29 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-7
 - install /etc/sysconfig/nfs-ganesha file