[rpms/nfs-ganesha] rawhide: NFS-Ganesha 15.3 GA (again)

[rpms/nfs-ganesha] rawhide: NFS-Ganesha 15.3 GA (again)

[Kaleb S. KEITHLEY]

A new commit has been pushed.

Repo   : rpms/nfs-ganesha
Branch : rawhide
Commit : 448b7fb103abe260aacf90de954f71e9ed1d40f7
Author : Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date   : 2026-09-04T11:39:41-04:00
Stats  : +32/-15 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/nfs-ganesha/c/448b7fb103abe260aacf90de954f71e9ed1d40f7?branch=rawhide

Log:
NFS-Ganesha 15.3 GA (again)

---
diff --git a/0003-src-monitoring-prometheus_exposer.cc.patch b/0003-src-monitoring-prometheus_exposer.cc.patch
index 11fe066..610facc 100644
--- a/0003-src-monitoring-prometheus_exposer.cc.patch
+++ b/0003-src-monitoring-prometheus_exposer.cc.patch
@@ -1,18 +1,3 @@
---- nfs-ganesha-15.3/src/monitoring/prometheus_exposer.cc.orig	2026-09-04 07:50:02.845744222 -0400
-+++ nfs-ganesha-15.3/src/monitoring/prometheus_exposer.cc	2026-09-04 07:50:31.319045108 -0400
-@@ -35,12 +35,10 @@
- #include <streambuf>
- #include <mutex>
- 
--extern "C" {
- #include "fsal.h"
- #include "nfs_core.h"
- #include "gsh_config.h"
- #include "log.h"
--}
- 
- #include <vector>
- #include <map>
 --- nfs-ganesha-15.3/src/include/fsal_api.h.orig	2026-09-04 07:52:20.458497713 -0400
 +++ nfs-ganesha-15.3/src/include/fsal_api.h	2026-09-04 07:53:11.401666074 -0400
 @@ -42,6 +42,11 @@
@@ -66,3 +51,31 @@
  
  #include "fsal_api.h"
  #include "nfs23.h"
+--- nfs-ganesha-15.3/src/monitoring/prometheus_exposer.cc.orig	2026-09-03 13:41:52.000000000 -0400
++++ nfs-ganesha-15.3/src/monitoring/prometheus_exposer.cc	2026-09-04 10:55:02.630149296 -0400
+@@ -35,12 +35,10 @@
+ #include <streambuf>
+ #include <mutex>
+ 
+-extern "C" {
+ #include "fsal.h"
+ #include "nfs_core.h"
+ #include "gsh_config.h"
+ #include "log.h"
+-}
+ 
+ #include <vector>
+ #include <map>
+@@ -500,8 +498,10 @@
+ 	LogFullDebug(
+ 		COMPONENT_FSAL,
+ 		"dynamic_metrics_export_info details :"
+-		" dynamic_info.total_bytes %ld dynamic_info.avail_bytes  %ld"
+-		" dynamic_info.total_files %ld dynamic_info.avail_files %ld",
++		" dynamic_info.total_bytes %" PRIu64
++		" dynamic_info.avail_bytes %" PRIu64
++		" dynamic_info.total_files %" PRIu64
++		" dynamic_info.avail_files %" PRIu64,
+ 		dynamic_info.total_bytes, dynamic_info.avail_bytes,
+ 		dynamic_info.total_files, dynamic_info.avail_files);
+ 	dynamic_metrics_export_info(path, dynamic_info.total_bytes,

diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index 2f2694a..74c793f 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -152,7 +152,11 @@ Requires: openSUSE-release
 
 %bcond_without rpc_rdma
 
+%ifarch i686
+%bcond_with ceph_fscrypt
+%else
 %bcond_without ceph_fscrypt
+%endif
 
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
 %global _rundir %{_localstatedir}/run