diff --git a/nfs-ganesha-2.4rc1-FSAL.patch b/nfs-ganesha-2.4rc1-FSAL.patch new file mode 100644 index 0000000..d0d470b --- /dev/null +++ b/nfs-ganesha-2.4rc1-FSAL.patch @@ -0,0 +1,60 @@ +--- nfs-ganesha-2.4-rc1/src/FSAL/FSAL_CEPH/handle.c.orig 2016-08-29 12:24:44.350041751 -0400 ++++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_CEPH/handle.c 2016-08-29 12:24:52.429041751 -0400 +@@ -31,9 +31,7 @@ + * fsal_obj_handle type. + */ + +-#ifdef LINUX + #include /* for makedev(3) */ +-#endif + #include + #include + #include "fsal.h" +--- nfs-ganesha-2.4-rc1/src/FSAL/FSAL_GLUSTER/handle.c.orig 2016-08-29 12:25:01.223041751 -0400 ++++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_GLUSTER/handle.c 2016-08-29 12:25:07.761041751 -0400 +@@ -21,9 +21,7 @@ + * ------------- + */ + +-#ifdef LINUX + #include /* for makedev(3) */ +-#endif + #include + #include "fsal.h" + #include "gluster_internal.h" +--- nfs-ganesha-2.4-rc1/src/FSAL/FSAL_VFS/handle.c.orig 2016-08-29 12:25:14.822041751 -0400 ++++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_VFS/handle.c 2016-08-29 12:25:21.980041751 -0400 +@@ -32,9 +32,7 @@ + + #include "config.h" + +-#ifdef LINUX + #include /* for makedev(3) */ +-#endif + #include /* used for 'dirname' */ + #include + #include +--- nfs-ganesha-2.4-rc1/src/FSAL/fsal_convert.c.orig 2016-08-29 12:24:12.086041751 -0400 ++++ nfs-ganesha-2.4-rc1/src/FSAL/fsal_convert.c 2016-08-29 12:25:41.084041751 -0400 +@@ -9,9 +9,7 @@ + */ + + #include "config.h" +-#ifdef LINUX + #include /* for major(3), minor(3) */ +-#endif + #include + #include + #include +--- nfs-ganesha-2.4-rc1/src/FSAL/commonlib.c.orig 2016-08-29 12:23:57.398041751 -0400 ++++ nfs-ganesha-2.4-rc1/src/FSAL/commonlib.c 2016-08-29 12:25:37.686041751 -0400 +@@ -41,9 +41,7 @@ + #include "config.h" + + #include /* avoid conflicts with sys/queue.h */ +-#ifdef LINUX + #include /* for major(3), minor(3) */ +-#endif + #include /* used for 'dirname' */ + #include + #include diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 583ddbc..ceeff07 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -74,17 +74,16 @@ Requires: sles-release >= 12 Name: nfs-ganesha Version: 2.4.0 -%global dev dev29 -%global dash_dev_version 2.4-dev-29 -Release: 0.16%{?dev:%{dev}}%{?dist} +%global dev rc1 +%global dash_dev_version 2.4-rc1 +Release: 0.17%{?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%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz -Patch0: nfs-ganesha-2.4dev29-FSAL.patch - +Patch0: nfs-ganesha-2.4rc1-FSAL.patch BuildRequires: cmake BuildRequires: bison @@ -549,6 +548,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %endif %changelog +* Mon Aug 29 2016 Kaleb S. KEITHLEY 2.4.0-0.17rc1 +- 2.4-rc1 + * Tue Aug 16 2016 Kaleb S. KEITHLEY 2.4.0-0.16dev29 - 2.4-dev-29, jemalloc off by default (conflicts with glusterfs-api) diff --git a/sources b/sources index ca83076..8b2e28a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5e2ceb06aebef6bf63eb86d845ec4b3 nfs-ganesha-2.4-dev-29.tar.gz +38ed1ef1be6fac0eeb51d280e9d7951a nfs-ganesha-2.4-rc1.tar.gz