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

Merge remote-tracking branch 'origin' into f33

Browse Source
This commit is contained in:
Kaleb S. KEITHLEY 2021-06-16 09:42:37 -04:00
commit 68582c225e
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
0001-config_samples-log_rotate.patch Normal file
View File

@ -0,0 +1,16 @@
--- nfs-ganesha-3.5/src/config_samples/logrotate_ganesha.orig 2021-06-11 11:05:49.699522427 -0400
+++ nfs-ganesha-3.5/src/config_samples/logrotate_ganesha 2021-06-11 11:06:18.362010100 -0400
@@ -1,4 +1,5 @@
/var/log/ganesha/ganesha.log {
+ su ganesha ganesha
weekly
rotate 52
copytruncate
--- nfs-ganesha-3.5/src/config_samples/logrotate_fsal_gluster.orig 2021-06-11 11:05:59.857340860 -0400
+++ nfs-ganesha-3.5/src/config_samples/logrotate_fsal_gluster 2021-06-11 11:06:22.785931021 -0400
@@ -1,4 +1,5 @@
/var/log/ganesha/ganesha-gfapi.log {
+ su ganesha ganesha
weekly
rotate 52
copytruncate

25
nfs-ganesha.spec
View File

@ -115,12 +115,13 @@ Requires: openSUSE-release
Name: nfs-ganesha
Version: 3.5
Release: 1%{?dev:%{dev}}%{?dist}
Release: 6%{?dev:%{dev}}%{?dist}
Summary: NFS-Ganesha is a NFS Server running in user space
License: LGPLv3+
Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki
Source0: https://github.com/%{name}/%{name}/archive/V%{version}%{?dev:-%{dev}}/%{name}-%{version}%{?dev:-%{dev}}.tar.gz
Patch0001: 0001-config_samples-log_rotate.patch
BuildRequires: cmake
BuildRequires: make
@ -155,7 +156,7 @@ BuildRequires: libwbclient-devel
%endif
BuildRequires: gcc-c++
%if ( %{with_system_ntirpc} )
BuildRequires: libntirpc-devel = 3.4
BuildRequires: libntirpc-devel >= 3.4
%else
Requires: libntirpc = @NTIRPC_VERSION_EMBED@
%endif
@ -496,10 +497,12 @@ Development headers and auxiliary files for developing with %{name}.
%prep
%setup -q -n %{name}-%{version}%{?dev:-%{dev}}
%patch0001 -p1
%build
cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DBUILD_CONFIG=rpmbuild \
-DCMAKE_COLOR_MAKEFILE:BOOL=OFF \
-DUSE_FSAL_NULL=%{use_fsal_null} \
-DUSE_FSAL_MEM=%{use_fsal_mem} \
-DUSE_FSAL_XFS=%{use_fsal_xfs} \
@ -530,6 +533,7 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
%endif
export VERBOSE=1
export GCC_COLORS=
%cmake_build
%if ( 0%{?fedora} >= 30 || 0%{?rhel} >= 8 )
@ -860,6 +864,23 @@ exit 0
%endif
%changelog
* Wed June 16 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.5-6
- Rebuilt for libntirpc-3.5
- plus https://src.fedoraproject.org/rpms/nfs-ganesha/pull-request/2
* Tue Jun 8 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.5-5
- Rebuilt for userspace-rcu-0.13
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.5-4
- Rebuilt for Python 3.10
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.5-3
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Tue Feb 9 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.5-2
- NFS-Ganesha 3.5, rebuild with ceph-16
* Thu Jan 28 2021 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.5-1
- NFS-Ganesha 3.5 GA
- fix for compiling with Ceph-16 (pacific)