diff --git a/.glusterfs.metadata b/.glusterfs.metadata index 8b5e5a8..1d0ad52 100644 --- a/.glusterfs.metadata +++ b/.glusterfs.metadata @@ -1 +1 @@ -4a8f06a5dd07caa8e930b11847cc8f2bcba619b8 SOURCES/glusterfs-9.0.tar.gz +ee55b1626e6b1805db2d6ff388afd70e8b2ebc8b SOURCES/glusterfs-9.1.tar.gz diff --git a/SPECS/glusterfs.spec b/SPECS/glusterfs.spec index a3109cf..4cf5236 100644 --- a/SPECS/glusterfs.spec +++ b/SPECS/glusterfs.spec @@ -53,6 +53,16 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with ipv6default %{?_with_ipv6default:%global _with_ipv6default --with-ipv6-default} +# linux-io_uring +# If you wish to compile an rpm without linux-io_uring support... +# rpmbuild -ta glusterfs-9.1.tar.gz --disable-linux-io_uring +%{?_without_linux_io_uring:%global _without_linux_io_uring --disable-linux-io_uring} + +# Disable linux-io_uring on unsupported distros. +%if ( 0%{?fedora} && 0%{?fedora} <= 32 ) || ( 0%{?rhel} && 0%{?rhel} <= 7 ) +%global _without_linux_io_uring --disable-linux-io_uring +%endif + # libtirpc # if you wish to compile an rpm without TIRPC (i.e. use legacy glibc rpc) # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without libtirpc @@ -135,6 +145,7 @@ %if ( 0%{?_without_server:1} ) %global _without_events --disable-events %global _without_georeplication --disable-georeplication +%global _without_linux_io_uring --disable-linux-io_uring %global _with_gnfs %{nil} %global _without_ocf --without-ocf %endif @@ -211,8 +222,8 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 9.0 -Release: 2%{?prereltag:.%{prereltag}}%{?dist} +Version: 9.1 +Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -253,7 +264,7 @@ BuildRequires: bison flex BuildRequires: gcc make libtool BuildRequires: ncurses-devel readline-devel BuildRequires: libxml2-devel openssl-devel -BuildRequires: libaio-devel libacl-devel liburing-devel +BuildRequires: libaio-devel libacl-devel BuildRequires: python%{_pythonver}-devel %if ( 0%{?rhel} && 0%{?rhel} < 8 ) BuildRequires: python-ctypes @@ -280,6 +291,10 @@ BuildRequires: libattr-devel BuildRequires: firewalld %endif +%if ( 0%{!?_without_linux_io_uring:1} ) +BuildRequires: liburing-devel +%endif + Obsoletes: %{name}-common < %{version}-%{release} Obsoletes: %{name}-core < %{version}-%{release} %if ( 0%{_for_fedora_koji_builds} ) @@ -849,6 +864,7 @@ done %{?_without_server} \ %{?_without_syslog} \ %{?_with_ipv6default} \ + %{?_without_linux_io_uring} \ %{?_without_libtirpc} # fix hardening and remove rpath in shlibs @@ -1635,6 +1651,10 @@ exit 0 %endif %changelog +* Tue Mar 30 2021 Niels de Vos - 9.1-1 +- GlusterFS 9.1 GA +- add liburing-devel as a requirement. + * Tue Feb 9 2021 Kaleb S. KEITHLEY - 9.0-2 - GlusterFS 9.0, w/ liburing