From 6368c27d68510b97d14269ea5d5ee1a23303128c Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: May 08 2017 10:44:21 +0000 Subject: nfs-ganesha 2.5rc4 --- diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 54754a7..78cac9b 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -75,12 +75,12 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -%global dev rc3 -%global dash_dev_version 2.5-rc3 +%global dev rc4 +%global dash_dev_version 2.5-rc4 Name: nfs-ganesha Version: 2.5.0 -Release: 0.2%{?dev:%{dev}}%{?dist} +Release: 0.3%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -143,6 +143,7 @@ Requires(postun): systemd BuildRequires: initscripts %endif Requires(post): psmisc +Requires(pre): shadow-utils # Use CMake variables @@ -379,6 +380,11 @@ install -m 644 scripts/systemd/nfs-ganesha.service %{buildroot}%{_unitdir}/nfs-g install -m 644 scripts/systemd/nfs-ganesha-lock.service %{buildroot}%{_unitdir}/nfs-ganesha-lock.service install -m 644 scripts/systemd/nfs-ganesha-config.service %{buildroot}%{_unitdir}/nfs-ganesha-config.service install -m 644 scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_sysconfdir}/sysconfig/ganesha +%if 0%{?_tmpfilesdir:1} +mkdir -p %{buildroot}%{_tmpfilesdir} +install -m 644 scripts/systemd/tmpfiles.d/ganesha.conf %{buildroot}%{_tmpfilesdir} +%endif +mkdir -p %{buildroot}%{_localstatedir}/log/ganesha %else mkdir -p %{buildroot}%{_sysconfdir}/init.d install -m 755 scripts/init.d/nfs-ganesha.el6 %{buildroot}%{_sysconfdir}/init.d/nfs-ganesha @@ -430,6 +436,11 @@ make DESTDIR=%{buildroot} install %endif killall -SIGHUP dbus-daemon >/dev/null 2>&1 || : +%pre +getent group ganesha > /dev/null || groupadd -r ganesha +getent passwd ganesha > /dev/null || useradd -r -g ganesha -d /var/run/ganesha -s /sbin/nologin -c "NFS-Ganesha Daemon" ganesha +exit 0 + %preun %if ( 0%{?suse_version} ) %service_del_preun nfs-ganesha-lock.service @@ -469,11 +480,15 @@ killall -SIGHUP dbus-daemon >/dev/null 2>&1 || : %dir %{_localstatedir}/run/ganesha %dir %{_libexecdir}/ganesha/ %{_libexecdir}/ganesha/nfs-ganesha-config.sh +%dir %attr(0755,ganesha,ganesha) %{_localstatedir}/log/ganesha %if %{with_systemd} %{_unitdir}/nfs-ganesha.service %{_unitdir}/nfs-ganesha-lock.service %{_unitdir}/nfs-ganesha-config.service +%if 0%{?_tmpfilesdir:1} +%{_tmpfilesdir}/ganesha.conf +%endif %else %{_sysconfdir}/init.d/nfs-ganesha %endif @@ -582,6 +597,9 @@ killall -SIGHUP dbus-daemon >/dev/null 2>&1 || : %endif %changelog +* Mon May 8 2017 Kaleb S. KEITHLEY 2.5.0-0.1rc4 +- nfs-ganesha 2.5rc4 + * Mon May 1 2017 Kaleb S. KEITHLEY 2.5.0-0.1rc3 - nfs-ganesha 2.5rc3 diff --git a/sources b/sources index f69018e..17c670e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (nfs-ganesha-2.5-rc3.tar.gz) = 9da03c168e3afdd02abda38a56892e5394c63f1ffbfbb2f97c6131dcf8c2dfea0343916e4134cdbf6629620c977110e2e6330a56e40fb887a826b3d29645b1c1 +SHA512 (nfs-ganesha-2.5-rc4.tar.gz) = c8132bc701e3bce550f1c65068bcf0e69beabcbc80783fc469f771f71b3e8d22494a386c956765b41f7cf3e926fe894cbef4ae59cfedaef29c2daec3f23a7fb1