diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 76c4c58..6aa9043 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -13,6 +13,14 @@ %global with_systemd 0 %endif +%if ( 0%{?suse_version} ) +BuildRequires: sles-release >= 12 +Requires: sles-release >= 12 + +%global with_systemd 1 +%global with_nfsidmap 1 +%endif + # Conditionally enable some FSALs, disable others. # # 1. rpmbuild accepts these options (gpfs as example): @@ -41,32 +49,17 @@ %bcond_with rgw %global use_fsal_rgw %{on_off_switch rgw} -%bcond_with lustre -%global use_fsal_lustre %{on_off_switch lustre} - -%bcond_with shook -%global use_fsal_shook %{on_off_switch shook} - %bcond_without gluster %global use_fsal_gluster %{on_off_switch gluster} -%bcond_with hpss -%global use_fsal_hpss %{on_off_switch hpss} - %bcond_with panfs %global use_fsal_panfs %{on_off_switch panfs} -%bcond_with pt -%global use_fsal_pt %{on_off_switch pt} - %bcond_with rdma %global use_rdma %{on_off_switch rdma} %bcond_without jemalloc -%bcond_with lustre_up -%global use_lustre_up %{on_off_switch lustre_up} - %bcond_with lttng %global use_lttng %{on_off_switch lttng} @@ -81,9 +74,9 @@ Name: nfs-ganesha Version: 2.4.0 -%global dev dev19 -%global dash_dev_version 2.4-dev-19 -Release: 0.6%{?dev:%{dev}}%{?dist} +%global dev dev21 +%global dash_dev_version 2.4-dev-21 +Release: 0.7%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -92,27 +85,40 @@ 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.4dev19-FSAL-FSAL_CEPH-handle.patch + BuildRequires: cmake BuildRequires: bison BuildRequires: flex BuildRequires: pkgconfig BuildRequires: krb5-devel +%if ( 0%{?suse_version} ) +BuildRequires: dbus-1-devel +Requires: dbus-1 +%else BuildRequires: dbus-devel +Requires: dbus +%endif +%if ( 0%{?suse_version} ) +BuildRequires: systemd-rpm-macros +%endif BuildRequires: libcap-devel BuildRequires: libblkid-devel BuildRequires: libuuid-devel %if %{with system_ntirpc} BuildRequires: libntirpc-devel >= 1.4.0 %endif -Requires: dbus Requires: nfs-utils -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) || ( 0%{?suse_version} ) Requires: rpcbind %else Requires: portmap %endif %if %{with_nfsidmap} +%if ( 0%{?suse_version} ) +BuildRequires: nfsidmap-devel +%else BuildRequires: libnfsidmap-devel +%endif %else BuildRequires: nfs-utils-lib-devel %endif @@ -122,9 +128,6 @@ BuildRequires: libmooshika-devel >= 0.6-0 %if %{with jemalloc} BuildRequires: jemalloc-devel %endif -%if %{with lustre_up} -BuildRequires: lcap-devel >= 0.1-0 -%endif %if %{with_systemd} BuildRequires: systemd Requires(post): systemd @@ -173,11 +176,20 @@ be used with NFS-Ganesha to support PROXY based filesystems %package utils Summary: The NFS-GANESHA's util scripts Group: Applications/System +%if ( 0%{?suse_version} ) +Requires: dbus-1-python, python-gobject2 +%else Requires: dbus-python, pygobject2 +%endif %if %{with gui_utils} +%if ( 0%{?suse_version} ) +BuildRequires: python-qt4-devel +Requires: python-qt4 +%else BuildRequires: PyQt4-devel Requires: PyQt4 %endif +%endif Requires: nfs-ganesha = %{version}-%{release}, python %description utils @@ -196,7 +208,7 @@ This package contains the libganesha_trace.so library. When preloaded to the ganesha.nfsd server, it makes it possible to trace using LTTng. %endif -# Option packages start here. use "rpmbuild --with lustre" (or equivalent) +# Option packages start here. use "rpmbuild --with gpfs" (or equivalent) # for activating this part of the spec file # NULL @@ -237,20 +249,6 @@ This package contains a FSAL shared object to be used with NFS-Ganesha to support CEPH %endif -# LUSTRE -%if %{with lustre} -%package lustre -Summary: The NFS-GANESHA's LUSTRE FSAL -Group: Applications/System -Requires: nfs-ganesha = %{version}-%{release} -Requires: lustre -BuildRequires: libattr-devel lustre - -%description lustre -This package contains a FSAL shared object to -be used with NFS-Ganesha to support LUSTRE -%endif - # RGW %if %{with rgw} %package rgw @@ -265,20 +263,6 @@ This package contains a FSAL shared object to be used with NFS-Ganesha to support RGW %endif -# SHOOK -%if %{with shook} -%package shook -Summary: The NFS-GANESHA's LUSTRE/SHOOK FSAL -Group: Applications/System -Requires: nfs-ganesha = %{version}-%{release} -Requires: lustre shook-client -BuildRequires: libattr-devel lustre shook-devel - -%description shook -This package contains a FSAL shared object to -be used with NFS-Ganesha to support LUSTRE via SHOOK -%endif - # XFS %if %{with xfs} %package xfs @@ -292,19 +276,6 @@ This package contains a shared object to be used with FSAL_VFS to support XFS correctly %endif -# HPSS -%if %{with hpss} -%package hpss -Summary: The NFS-GANESHA's HPSS FSAL -Group: Applications/System -Requires: nfs-ganesha = %{version}-%{release} -#BuildRequires: hpssfs - -%description hpss -This package contains a FSAL shared object to -be used with NFS-Ganesha to support HPSS -%endif - # PANFS %if %{with panfs} %package panfs @@ -317,19 +288,6 @@ This package contains a FSAL shared object to be used with NFS-Ganesha to support PANFS %endif -# PT -%if %{with pt} -%package pt -Summary: The NFS-GANESHA's PT FSAL -Group: Applications/System -Requires: nfs-ganesha = %{version}-%{release} - - -%description pt -This package contains a FSAL shared object to -be used with NFS-Ganesha to support PT -%endif - # GLUSTER %if %{with gluster} %package gluster @@ -356,17 +314,12 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \ -DUSE_FSAL_ZFS=NO \ -DUSE_FSAL_XFS=%{use_fsal_xfs} \ -DUSE_FSAL_CEPH=%{use_fsal_ceph} \ - -DUSE_FSAL_RGW=%{use_fsal_rgw} \ - -DUSE_FSAL_LUSTRE=%{use_fsal_lustre} \ - -DUSE_FSAL_SHOOK=%{use_fsal_shook} \ + -DUSE_FSAL_RGW=%{use_fsal_rgw} \ -DUSE_FSAL_GPFS=%{use_fsal_gpfs} \ - -DUSE_FSAL_HPSS=%{use_fsal_hpss} \ -DUSE_FSAL_PANFS=%{use_fsal_panfs} \ - -DUSE_FSAL_PT=%{use_fsal_pt} \ -DUSE_FSAL_GLUSTER=%{use_fsal_gluster} \ -DUSE_SYSTEM_NTIRPC=%{use_system_ntirpc} \ -DUSE_9P_RDMA=%{use_rdma} \ - -DUSE_FSAL_LUSTRE_UP=%{use_lustre_up} \ -DUSE_LTTNG=%{use_lttng} \ -DUSE_ADMIN_TOOLS=%{use_utils} \ -DUSE_GUI_ADMIN_TOOLS=%{use_gui_utils} \ @@ -417,10 +370,6 @@ install -m 644 scripts/init.d/sysconfig/ganesha %{buildroot}%{_sysconfdir}/sysc %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif -%if %{with pt} -install -m 644 config_samples/pt.conf %{buildroot}%{_sysconfdir}/ganesha -%endif - %if %{with xfs} install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha %endif @@ -429,10 +378,6 @@ install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha %endif -%if %{with lustre} -install -m 755 config_samples/lustre.conf %{buildroot}%{_sysconfdir}/ganesha -%endif - %if %{with gluster} install -m 644 config_samples/logrotate_fsal_gluster %{buildroot}%{_sysconfdir}/logrotate.d/ganesha-gfapi %endif @@ -455,22 +400,34 @@ make DESTDIR=%{buildroot} install install -m 644 ChangeLog %{buildroot}%{_defaultdocdir}/ganesha %post +%if ( 0%{?suse_version} ) +%service_add_post nfs-ganesha.service nfs-ganesha-lock.service nfs-ganesha-config.service +%else %if %{with_systemd} %systemd_post nfs-ganesha.service %systemd_post nfs-ganesha-lock.service %systemd_post nfs-ganesha-config.service %endif +%endif killall -SIGHUP dbus-daemon 2>&1 > /dev/null %preun +%if ( 0%{?suse_version} ) +%service_del_preun nfs-ganesha-lock.service +%else %if %{with_systemd} %systemd_preun nfs-ganesha-lock.service %endif +%endif %postun +%if ( 0%{?suse_version} ) +%service_del_postun nfs-ganesha-lock.service +%else %if %{with_systemd} %systemd_postun_with_restart nfs-ganesha-lock.service %endif +%endif %files %license src/LICENSE.txt @@ -553,39 +510,17 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %config(noreplace) %{_sysconfdir}/ganesha/rgw.conf %endif -%if %{with lustre} -%files lustre -%config(noreplace) %{_sysconfdir}/ganesha/lustre.conf -%{_libdir}/ganesha/libfsallustre* -%endif - -%if %{with shook} -%files shook -%{_libdir}/ganesha/libfsalshook* -%endif - %if %{with gluster} %files gluster %config(noreplace) %{_sysconfdir}/logrotate.d/ganesha-gfapi %{_libdir}/ganesha/libfsalgluster* %endif -%if %{with hpss} -%files hpss -%{_libdir}/ganesha/libfsalhpss* -%endif - %if %{with panfs} %files panfs %{_libdir}/ganesha/libfsalpanfs* %endif -%if %{with pt} -%files pt -%{_libdir}/ganesha/libfsalpt* -%config(noreplace) %{_sysconfdir}/ganesha/pt.conf -%endif - %if %{with lttng} %files lttng %{_libdir}/ganesha/libganesha_trace* @@ -593,8 +528,13 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %if %{with utils} %files utils +%if ( 0%{?suse_version} || 0%{?fedora} ) +%{python_sitelib}/Ganesha/* +%{python_sitelib}/ganeshactl-*-info +%else %{python2_sitelib}/Ganesha/* %{python2_sitelib}/ganeshactl-*-info +%endif %if %{with gui_utils} %{_bindir}/ganesha-admin %{_bindir}/manage_clients @@ -614,6 +554,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null %endif %changelog +* Mon Jun 20 2016 Kaleb S. KEITHLEY 2.4.0-0.7dev21 +- 2.4-dev-21 + * Mon May 30 2016 Kaleb S. KEITHLEY 2.4.0-0.6dev19 - 2.4-dev-19 diff --git a/sources b/sources index 5cb4fc3..702a403 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7958c34a61ba8cf17983e0f7470e5f90 nfs-ganesha-2.4-dev-19.tar.gz +3aac1106799e48e65e4e332c8ad676bb nfs-ganesha-2.4-dev-21.tar.gz