rpms/nfs-ganesha
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into f24

Browse Source
This commit is contained in:
Kaleb S KEITHLEY 2016-05-30 09:12:12 -04:00
commit 6f59480bc3
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch Normal file
View File

@ -0,0 +1,11 @@
--- nfs-ganesha-2.4-dev-19/src/FSAL/FSAL_CEPH/handle.c.orig 2016-05-30 08:54:35.653769734 -0400
+++ nfs-ganesha-2.4-dev-19/src/FSAL/FSAL_CEPH/handle.c 2016-05-30 08:55:35.314769734 -0400
@@ -233,7 +233,7 @@
}
LogFullDebug(COMPONENT_FSAL,
- "Created %s inode %lu Inode %p",
+ "Created %s inode %" PRIu64 " Inode %p",
name, st.st_ino, i);
construct_handle(&st, i, export, &obj);

13
nfs-ganesha.spec
View File

@ -81,16 +81,16 @@
Name: nfs-ganesha Name: nfs-ganesha
Version: 2.4.0 Version: 2.4.0
%global dev dev17 %global dev dev19
%global dash_dev_version 2.4-dev-17 %global dash_dev_version 2.4-dev-19
Release: 0.5%{?dev:%{dev}}%{?dist} Release: 0.6%{?dev:%{dev}}%{?dist}
Summary: NFS-Ganesha is a NFS Server running in user space Summary: NFS-Ganesha is a NFS Server running in user space
Group: Applications/System Group: Applications/System
License: LGPLv3+ License: LGPLv3+
Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki
Source0: https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz Source0: https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
Patch0: nfs-ganesha-2.4dev17-FSAL-fsal_helper.patch Patch0: nfs-ganesha-2.4dev19-FSAL-FSAL_CEPH-handle.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: bison BuildRequires: bison
@ -407,7 +407,7 @@ install -m 644 scripts/systemd/nfs-ganesha-config.service %{buildroot}%{_unitdir
install -m 644 scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_sysconfdir}/sysconfig/ganesha install -m 644 scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_sysconfdir}/sysconfig/ganesha
%else %else
mkdir -p %{buildroot}%{_sysconfdir}/init.d mkdir -p %{buildroot}%{_sysconfdir}/init.d
install -m 755 scripts/init.d/nfs-ganesha %{buildroot}%{_sysconfdir}/init.d/nfs-ganesha install -m 755 scripts/init.d/nfs-ganesha.el6 %{buildroot}%{_sysconfdir}/init.d/nfs-ganesha
install -m 644 scripts/init.d/sysconfig/ganesha %{buildroot}%{_sysconfdir}/sysconfig/ganesha install -m 644 scripts/init.d/sysconfig/ganesha %{buildroot}%{_sysconfdir}/sysconfig/ganesha
%endif %endif
@ -614,6 +614,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null
%endif %endif
%changelog %changelog
* Mon May 30 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.6dev19
- 2.4-dev-19
* Tue May 10 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.5dev17 * Tue May 10 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.5dev17
- 2.4-dev-17 - 2.4-dev-17

2
sources
View File

@ -1 +1 @@
26b8c5411c131e33a273afd828680d76 nfs-ganesha-2.4-dev-17.tar.gz 7958c34a61ba8cf17983e0f7470e5f90 nfs-ganesha-2.4-dev-19.tar.gz