diff --git a/README.md b/README.md index 8e4112f..b179926 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,9 @@ Build the src.rpm with: $ rpmbuild -bs \ --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \ - --define "dist .el7" SPECS/nfs-ganesha.spec + --define "dist .el8" SPECS/nfs-ganesha.spec And the packages with - $ cbs build storage7-nfsganesha-30-el7 nfs-ganesha*.el7.src.rpm + $ cbs build storage8-nfsganesha-3-el8 nfs-ganesha*.el8.src.rpm diff --git a/SPECS/nfs-ganesha.spec b/SPECS/nfs-ganesha.spec index b978759..21904c4 100644 --- a/SPECS/nfs-ganesha.spec +++ b/SPECS/nfs-ganesha.spec @@ -55,18 +55,18 @@ Requires: openSUSE-release %bcond_with lustre %global use_fsal_lustre %{on_off_switch lustre} -%ifnarch i686 armv7hl -%bcond_without ceph -#else +#%%ifnarch i686 armv7hl +#%%bcond_without ceph +#%%else %bcond_with ceph -%endif +#%%endif %global use_fsal_ceph %{on_off_switch ceph} -%ifnarch i686 armv7hl -%bcond_with rgw -%else +#%%ifnarch i686 armv7hl +#%%bcond_with rgw +#%%else %bcond_with rgw -%endif +#%%endif %global use_fsal_rgw %{on_off_switch rgw} %bcond_without gluster @@ -95,25 +95,21 @@ Requires: openSUSE-release %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -%if ( %{?use_system_ntirpc} ) -%global system_ntirpc_prefix -DNTIRPC_PREFIX=/usr/include/ntirpc -%endif - %bcond_without man_page %global use_man_page %{on_off_switch man_page} -%ifnarch i686 armv7hl -%bcond_without rados_recov -%else +#%%ifnarch i686 armv7hl +#%%bcond_without rados_recov +#%%else %bcond_with rados_recov -%endif +#%%endif %global use_rados_recov %{on_off_switch rados_recov} -%ifnarch i686 armv7hl -%bcond_without rados_urls -%else +#%%ifnarch i686 armv7hl +#%%bcond_without rados_urls +#%%else %bcond_with rados_urls -%endif +#%%endif %global use_rados_urls %{on_off_switch rados_urls} %bcond_without rpcbind @@ -131,17 +127,15 @@ Requires: openSUSE-release %global dev_version %{lua: s = string.gsub('@GANESHA_EXTRA_VERSION@', '^%-', ''); s2 = string.gsub(s, '%-', '.'); print((s2 ~= nil and s2 ~= '') and s2 or "0.1") } # %%global dev rc5 -# %%global dash_dev_version 3.0-rc5 Name: nfs-ganesha Version: 3.2 -Release: 3%{?dev:-%{dev}}%{?dist} +Release: 1%{?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}/%{name}-%{version}.tar.gz -Patch0001: 0001.python.patch +Source0: https://github.com/%{name}/%{name}/archive/V%{version}%{?dev:-%{dev}}/%{name}-%{version}%{?dev:-%{dev}}.tar.gz BuildRequires: cmake BuildRequires: bison @@ -175,7 +169,7 @@ BuildRequires: libwbclient-devel %endif BuildRequires: gcc-c++ %if ( %{with_system_ntirpc} ) -BuildRequires: libntirpc-devel >= 3.2 +BuildRequires: libntirpc-devel = 3.2 %else Requires: libntirpc = @NTIRPC_VERSION_EMBED@ %endif @@ -285,12 +279,13 @@ Summary: The NFS-GANESHA util scripts Requires: dbus-python, pygobject2, pyparsing BuildRequires: python-devel %else +Requires: python3-gobject, python3-pyparsing +BuildRequires: python3-devel +%endif %if ( 0%{?suse_version} ) Requires: dbus-1-python %else -Requires: python3-gobject, python3-pyparsing, python3-dbus -BuildRequires: python3-devel -%endif +Requires: python3-dbus %endif %if %{with gui_utils} @@ -298,7 +293,7 @@ BuildRequires: python3-devel BuildRequires: python-qt5-devel %else %if ( 0%{?fedora} >= 31 || 0%{?rhel} >= 8 ) -BuildRequires: PyQt5-devel +BuildRequires: python3-qt5-devel %else BuildRequires: PyQt4-devel %endif @@ -446,7 +441,7 @@ be used with NFS-Ganesha to support PANFS %package gluster Summary: The NFS-GANESHA GLUSTER FSAL Requires: nfs-ganesha = %{version}-%{release} -BuildRequires: glusterfs-api-devel >= 7.0 +BuildRequires: glusterfs-api-devel >= 6.0 BuildRequires: libattr-devel, libacl-devel %description gluster @@ -519,8 +514,7 @@ Development headers and auxiliary files for developing with %{name}. %endif %prep -%setup -q -n %{name}-%{version} -%patch0001 -p1 +%setup -q -n %{name}-%{version}%{?dev:-%{dev}} %build cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -550,9 +544,6 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DRPCBIND=%{use_rpcbind} \ -D_MSPAC_SUPPORT=%{use_mspac_support} \ -DSANITIZE_ADDRESS=%{use_sanitize_address} \ -%if ( %{?use_system_ntirpc} ) - %{system_ntirpc_prefix} \ -%endif %if %{with jemalloc} -DALLOCATOR=jemalloc %endif @@ -900,55 +891,80 @@ exit 0 %endif %changelog -* Mon Jan 27 2020 Kaleb S. KEITHLEY - 3.2-3 -- nfs-ganesha 3.2, no PyQt5 - -* Tue Jan 14 2020 Kaleb S. KEITHLEY - 3.2-2 -- nfs-ganesha 3.2, python-dbus dependency - * Sun Dec 22 2019 Kaleb S. KEITHLEY - 3.2-1 -- nfs-ganesha 3.2 GA +- NFS-Ganesha 3.2 GA - 3.1 was not built -* Tue Nov 12 2019 Kaleb S. KEITHLEY - 3.0-1 -- nfs-ganesha 3.0 GA +* Mon Nov 11 2019 Kaleb S. KEITHLEY - 3.0-1 +- NFS-Ganesha 3.0 GA -* Tue Nov 5 2019 Kaleb S. KEITHLEY - 3.0-0.3rc5 -- nfs-ganesha 3.0 RC5, nfs4_recovery.c +* Wed Nov 6 2019 Kaleb S. KEITHLEY - 3.0-0.3rc5 +- nfs-ganesha 3.0 RC5, rebuild w/ libntirpc-3.0 GA * Tue Nov 5 2019 Kaleb S. KEITHLEY - 3.0-0.2rc5 -- nfs-ganesha 3.0 RC5, w/ fsal_mem +- nfs-ganesha 3.0 RC5, enable fsal_mem (again) * Sun Nov 3 2019 Kaleb S. KEITHLEY - 3.0-0.1rc5 - nfs-ganesha 3.0 RC5 -* Mon Oct 28 2019 Kaleb S. KEITHLEY - 2.8.2-3 -- nfs-ganesha 2.8.2, -utils gpfs.nfs-ganesha -> nfs-ganesha-gpfs +* Wed Sep 25 2019 Kaleb S. KEITHLEY - 2.8.2-4 +- PyQt4 -> PyQt5 + +* Mon Aug 19 2019 Miro Hrončok - 2.8.2-3 +- Rebuilt for Python 3.8 + +* Mon Aug 19 2019 Miro Hrončok - 2.8.2-2 +- Rebuilt for Python 3.8 + +* Wed Aug 14 2019 Kaleb S. KEITHLEY - 2.8.2-1 +- nfs-ganesha 2.8.2 (f32/rawhide) + +* Wed Aug 14 2019 Kaleb S. KEITHLEY - 2.8.2-4 +- nfs-ganesha 2.8.2, #1741023 -* Tue Oct 8 2019 Kaleb S. KEITHLEY - 2.8.2-2 -- nfs-ganesha 2.8.2, enable FSAL_MEM +* Thu Jul 25 2019 Fedora Release Engineering - 2.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Tue Jul 23 2019 Kaleb S. KEITHLEY - 2.8.2-1 +* Tue Jul 23 2019 Kaleb S. KEITHLEY - 2.8.2-2 - nfs-ganesha 2.8.2 GA -* Wed Jul 3 2019 Kaleb S. KEITHLEY - 2.8.1-1 +* Tue Jul 2 2019 Kaleb S. KEITHLEY - 2.8.1-1 - nfs-ganesha 2.8.1 GA -* Mon Jul 1 2019 Kaleb S. KEITHLEY - 2.8.0-3 -- nfs-ganesha 2.8.0.3 +* Mon Jul 1 2019 Kaleb S. KEITHLEY - 2.8.0-4 +- nfs-ganesha 2.8.0, 2.8.0.3 -* Thu Jun 20 2019 Kaleb S. KEITHLEY - 2.8.0-2 -- nfs-ganesha 2.8.0.2 +* Sun Jun 16 2019 Kaleb S. KEITHLEY - 2.8.0-3 +- nfs-ganesha 2.8.0, 2.8.0.2 -* Fri Jun 7 2019 Kaleb S. KEITHLEY - 2.8.0-1 -- nfs-ganesha 2.8.0 GA, 2.8.0.1 +* Tue Jun 11 2019 Kaleb S. KEITHLEY - 2.8.0-2 +- nfs-ganesha 2.8.0, 2.8.0.1 -* Wed Jun 5 2019 Kaleb S. KEITHLEY - 2.7.4-1 -- nfs-ganesha 2.7.4 GA +* Fri May 31 2019 Kaleb S. KEITHLEY - 2.8.0-1 +- nfs-ganesha 2.8.0 GA -* Wed Apr 10 2019 Kaleb S. KEITHLEY - 2.7.3-1 +* Fri May 31 2019 Kaleb S. KEITHLEY - 2.8.0-0.2rc1 +- nfs-ganesha 2.8.0 RC1, utils and gui_utils enabled + +* Thu May 30 2019 Kaleb S. KEITHLEY - 2.8.0-0.1rc1 +- nfs-ganesha 2.8.0 RC1, utils and gui_utils disabled until the python + byte_compile problems can be resolved + +* Fri May 17 2019 Miro Hrončok - 2.7.3-4 +- Avoid unversioned Python requires + +* Thu May 16 2019 Kaleb S. KEITHLEY - 2.7.3-3 +- nfs-ganesha 2.7.3, enable utils w/ python2 on f30 and up + +* Fri May 10 2019 Kaleb S. KEITHLEY - 2.7.3-2 +- nfs-ganesha 2.7.3, selinux bz#1706462 + +* Fri Apr 5 2019 Kaleb S. KEITHLEY - 2.7.3-1 - nfs-ganesha 2.7.3 GA +* Mon Mar 11 2019 Kaleb S. KEITHLEY - 2.7.2-2 +- nfs-ganesha 2.7.2 reenable ceph, rgw, rados from bad merge + * Wed Feb 27 2019 Kaleb S. KEITHLEY - 2.7.2-1 - nfs-ganesha 2.7.2 GA