diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 6aa9043..62d6017 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -46,7 +46,7 @@ Requires: sles-release >= 12 %bcond_without ceph %global use_fsal_ceph %{on_off_switch ceph} -%bcond_with rgw +%bcond_without rgw %global use_fsal_rgw %{on_off_switch rgw} %bcond_without gluster @@ -76,7 +76,7 @@ Name: nfs-ganesha Version: 2.4.0 %global dev dev21 %global dash_dev_version 2.4-dev-21 -Release: 0.7%{?dev:%{dev}}%{?dist} +Release: 0.8%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -241,8 +241,7 @@ be used with NFS-Ganesha to support GPFS backend Summary: The NFS-GANESHA's CEPH FSAL Group: Applications/System Requires: nfs-ganesha = %{version}-%{release} -Requires: ceph >= 0.78 -BuildRequires: ceph-devel >= 0.78 +BuildRequires: libcephfs1-devel >= 10.2.0 %description ceph This package contains a FSAL shared object to @@ -255,8 +254,7 @@ be used with NFS-Ganesha to support CEPH Summary: The NFS-GANESHA's RGW FSAL Group: Applications/System Requires: nfs-ganesha = %{version}-%{release} -Requires: rgw >= 0.78 -BuildRequires: rgw-devel >= 0.78 +BuildRequires: librgw2-devel >= 10.2.0 %description rgw This package contains a FSAL shared object to @@ -351,6 +349,9 @@ install -m 755 scripts/nfs-ganesha-config.sh %{buildroot}%{_libexecdir}/ganesha install -m 755 tools/mount.9P %{buildroot}%{_sbindir}/mount.9P install -m 644 config_samples/vfs.conf %{buildroot}%{_sysconfdir}/ganesha +%if %{with rgw} +install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha +%endif %if %{with_systemd} mkdir -p %{buildroot}%{_unitdir} @@ -397,7 +398,6 @@ install -m 755 scripts/init.d/nfs-ganesha.gpfs %{buildroot}%{_sysconfdir}/init. make DESTDIR=%{buildroot} install -install -m 644 ChangeLog %{buildroot}%{_defaultdocdir}/ganesha %post %if ( 0%{?suse_version} ) @@ -446,7 +446,7 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %config(noreplace) %{_sysconfdir}/ganesha/ganesha.conf %dir %{_defaultdocdir}/ganesha/ %{_defaultdocdir}/ganesha/* -%doc %{_defaultdocdir}/ganesha/ChangeLog +%doc src/ChangeLog %dir %{_localstatedir}/run/ganesha %dir %{_libexecdir}/ganesha/ %{_libexecdir}/ganesha/nfs-ganesha-config.sh @@ -554,6 +554,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %endif %changelog +* Fri Jun 24 2016 Kaleb S. KEITHLEY 2.4.0-0.8dev21 +- 2.4-dev-21 w/ FSAL_RGW + * Mon Jun 20 2016 Kaleb S. KEITHLEY 2.4.0-0.7dev21 - 2.4-dev-21