2.4-dev-7
This commit is contained in:
Kaleb S KEITHLEY
parent
93eaadae64
commit
666c3cfa34
|
|
@ -0,0 +1,13 @@
|
|||
--- nfs-ganesha-2.4-dev-7/src/RPCAL/rpc_tools.c.orig 2016-02-05 04:11:00.005869468 -0500
|
||||
+++ nfs-ganesha-2.4-dev-7/src/RPCAL/rpc_tools.c 2016-02-05 04:19:04.300869468 -0500
|
||||
@@ -116,6 +116,10 @@
|
||||
return "sctp";
|
||||
case XPRT_RDMA:
|
||||
return "rdma";
|
||||
+ case XPRT_VSOCK:
|
||||
+ return "vsock";
|
||||
+ case XPRT_VSOCK_RENDEZVOUS:
|
||||
+ return "vsock rendezvous";
|
||||
}
|
||||
return "INVALID";
|
||||
}
|
||||
|
|
@ -76,17 +76,18 @@
|
|||
%bcond_without system_ntirpc
|
||||
%global use_system_ntirpc %{on_off_switch system_ntirpc}
|
||||
|
||||
%global dev_version %{lua: extraver = string.gsub('', '%-', '.'); print(extraver) }
|
||||
|
||||
Name: nfs-ganesha
|
||||
Version: 2.3.0
|
||||
Release: 3%{?dev_version:%{dev_version}}%{?dist}
|
||||
Version: 2.4.0
|
||||
%global dev dev7
|
||||
%global dash_dev_version 2.4-dev-7
|
||||
Release: 0%{?dev:%{dev}}%{?dist}
|
||||
Summary: NFS-Ganesha is a NFS Server running in user space
|
||||
Group: Applications/System
|
||||
License: LGPLv3+
|
||||
Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki
|
||||
|
||||
Source0: https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}%{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.4dev7-RPCAL-rpc_tools.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: bison
|
||||
|
|
@ -98,14 +99,14 @@ BuildRequires: libcap-devel
|
|||
BuildRequires: libblkid-devel
|
||||
BuildRequires: libuuid-devel
|
||||
%if %{with system_ntirpc}
|
||||
BuildRequires: libntirpc-devel >= 1.3.1
|
||||
BuildRequires: libntirpc-devel >= 1.4.0
|
||||
%endif
|
||||
Requires: dbus
|
||||
Requires: nfs-utils
|
||||
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
||||
Requires: rpcbind
|
||||
Requires: rpcbind
|
||||
%else
|
||||
Requires: portmap
|
||||
Requires: portmap
|
||||
%endif
|
||||
%if %{with_nfsidmap}
|
||||
BuildRequires: libnfsidmap-devel
|
||||
|
|
@ -327,8 +328,9 @@ be used with NFS-Ganesha to support Gluster
|
|||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{dev_version}
|
||||
%setup -q -n %{name}-%{dash_dev_version}
|
||||
rm -rf contrib/libzfswrapper
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \
|
||||
|
|
@ -370,9 +372,11 @@ mkdir -p %{buildroot}%{_bindir}
|
|||
mkdir -p %{buildroot}%{_sbindir}
|
||||
mkdir -p %{buildroot}%{_libdir}/ganesha
|
||||
mkdir -p %{buildroot}%{_localstatedir}/run/ganesha
|
||||
mkdir -p %{buildroot}%{_libexecdir}/ganesha
|
||||
cd src
|
||||
install -m 644 config_samples/logrotate_ganesha %{buildroot}%{_sysconfdir}/logrotate.d/ganesha
|
||||
install -m 644 scripts/ganeshactl/org.ganesha.nfsd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d
|
||||
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
|
||||
|
|
@ -381,6 +385,7 @@ install -m 644 config_samples/vfs.conf %{buildroot}%{_sysconfdir}/ganesha
|
|||
mkdir -p %{buildroot}%{_unitdir}
|
||||
install -m 644 scripts/systemd/nfs-ganesha.service %{buildroot}%{_unitdir}/nfs-ganesha.service
|
||||
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
|
||||
%else
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/init.d
|
||||
|
|
@ -430,7 +435,9 @@ install -m 644 ChangeLog %{buildroot}%{_defaultdocdir}/ganesha
|
|||
%if %{with_systemd}
|
||||
%systemd_post nfs-ganesha.service
|
||||
%systemd_post nfs-ganesha-lock.service
|
||||
%systemd_post nfs-ganesha-config.service
|
||||
%endif
|
||||
killall -SIGHUP dbus-daemon 2>&1 > /dev/null
|
||||
|
||||
%preun
|
||||
%if %{with_systemd}
|
||||
|
|
@ -446,8 +453,8 @@ install -m 644 ChangeLog %{buildroot}%{_defaultdocdir}/ganesha
|
|||
%license src/LICENSE.txt
|
||||
%{_bindir}/ganesha.nfsd
|
||||
%if ! %{with system_ntirpc}
|
||||
%{_libdir}/libntirpc.so.1.3.0
|
||||
%{_libdir}/libntirpc.so.1.3
|
||||
%{_libdir}/libntirpc.so.1.4.0
|
||||
%{_libdir}/libntirpc.so.1.4
|
||||
%{_libdir}/libntirpc.so
|
||||
%{_libdir}/pkgconfig/libntirpc.pc
|
||||
%{_includedir}/ntirpc/
|
||||
|
|
@ -461,10 +468,13 @@ install -m 644 ChangeLog %{buildroot}%{_defaultdocdir}/ganesha
|
|||
%{_defaultdocdir}/ganesha/*
|
||||
%doc %{_defaultdocdir}/ganesha/ChangeLog
|
||||
%dir %{_localstatedir}/run/ganesha
|
||||
%dir %{_libexecdir}/ganesha/
|
||||
%{_libexecdir}/ganesha/nfs-ganesha-config.sh
|
||||
|
||||
%if %{with_systemd}
|
||||
%{_unitdir}/nfs-ganesha.service
|
||||
%{_unitdir}/nfs-ganesha-lock.service
|
||||
%{_unitdir}/nfs-ganesha-config.service
|
||||
%else
|
||||
%{_sysconfdir}/init.d/nfs-ganesha
|
||||
%endif
|
||||
|
|
@ -572,6 +582,9 @@ install -m 644 ChangeLog %{buildroot}%{_defaultdocdir}/ganesha
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Feb 5 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0dev7
|
||||
- 2.4-dev-7
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue