Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S KEITHLEY 2021-01-06 11:32:38 -05:00
parent 4ef17a069a
commit 634903cc7a
3 changed files with 126 additions and 119 deletions

View File

@ -1,12 +0,0 @@
--- glusterfs-8.0/rpc/rpc-lib/src/Makefile.am.orig 2020-07-22 08:09:31.315980869 -0400
+++ glusterfs-8.0/rpc/rpc-lib/src/Makefile.am 2020-07-22 08:10:12.203980869 -0400
@@ -2,8 +2,7 @@
libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \
rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \
- rpc-drc.c $(CONTRIBDIR)/sunrpc/xdr_sizeof.c rpc-clnt-ping.c \
- autoscale-threads.c mgmt-pmap.c
+ rpc-drc.c rpc-clnt-ping.c autoscale-threads.c mgmt-pmap.c
EXTRA_DIST = libgfrpc.sym

View File

@ -4,10 +4,10 @@
%global _for_fedora_koji_builds 1 %global _for_fedora_koji_builds 1
# uncomment and add '%' to use the %%dev for pre-releases # uncomment and add '%' to use the %%dev for pre-releases
# %%global dev rc0 %global prereltag rc0
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## All argument definitions should be placed here and keep them sorted ## All package definitions should be placed here in alphabetical order
## ##
# asan # asan
@ -108,9 +108,15 @@
%{?_with_valgrind:%global _with_valgrind --enable-valgrind} %{?_with_valgrind:%global _with_valgrind --enable-valgrind}
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## All %%global definitions should be placed here and keep them sorted ## All package definitions should be placed here in alphabetical order
## ##
# selinux booleans whose default value needs modification
# these booleans will be consumed by "%%selinux_set_booleans" macro.
%if ( 0%{?rhel} && 0%{?rhel} >= 8 )
%global selinuxbooleans rsync_full_access=1 rsync_client=1
%endif
%if ( 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} > 6 ) ) %if ( 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
%global _with_firewalld --enable-firewalld %global _with_firewalld --enable-firewalld
%endif %endif
@ -137,13 +143,6 @@
%global _pythonver 2 %global _pythonver 2
%endif %endif
# From https://fedoraproject.org/wiki/Packaging:Python#Macros
%if ( 0%{?rhel} && 0%{?rhel} < 7 )
%{!?python2_sitelib: %global python2_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python2_sitearch: %global python2_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%global _rundir %{_localstatedir}/run
%endif
%global service_start() /bin/systemctl --quiet start %1.service || : \ %global service_start() /bin/systemctl --quiet start %1.service || : \
%{nil} %{nil}
%global service_stop() /bin/systemctl --quiet stop %1.service || :\ %global service_stop() /bin/systemctl --quiet stop %1.service || :\
@ -177,13 +176,13 @@
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## All package definitions should be placed here and keep them sorted ## All package definitions should be placed here in alphabetical order
## ##
Summary: Distributed File System Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs Name: glusterfs
Version: 8.3 Version: 9.0
Release: 1%{?dev:%{dev}}%{?dist} Release: 0.1%{?prereltag:%{prereltag}}%{?dist}
%else %else
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
@ -192,7 +191,7 @@ Release: 0.@PACKAGE_RELEASE@%{?dist}.4
License: GPLv2 or LGPLv3+ License: GPLv2 or LGPLv3+
URL: http://docs.gluster.org/ URL: http://docs.gluster.org/
%if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{_for_fedora_koji_builds} )
Source0: http://download.gluster.org/pub/gluster/%{name}/LATEST/%{version}%{?dev}/%{name}-%{version}%{?dev}.tar.gz Source0: http://bits.gluster.org/pub/gluster/glusterfs/src/glusterfs-%{version}%{?prereltag}.tar.gz
Source1: glusterd.sysconfig Source1: glusterd.sysconfig
Source2: glusterfsd.sysconfig Source2: glusterfsd.sysconfig
Source7: glusterfsd.service Source7: glusterfsd.service
@ -200,7 +199,6 @@ Source8: glusterfsd.init
%else %else
Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
%endif %endif
Patch0002: 0002-rpc-rpc-lib-src-Makefile.am.patch
Requires(pre): shadow-utils Requires(pre): shadow-utils
BuildRequires: systemd BuildRequires: systemd
@ -384,7 +382,7 @@ It borrows a powerful concept called Translators from GNU Hurd kernel.
Much of the code in GlusterFS is in user space and easily manageable. Much of the code in GlusterFS is in user space and easily manageable.
This package provides support to FUSE based clients and includes the This package provides support to FUSE based clients and includes the
glusterfsd and glusterfs binaries. glusterfs and glusterfsd binaries.
%if ( 0%{!?_without_server:1} ) %if ( 0%{!?_without_server:1} )
%package ganesha %package ganesha
@ -438,7 +436,20 @@ Requires: %{name}-server = %{version}-%{release}
Requires: python%{_pythonver} Requires: python%{_pythonver}
Requires: python%{_pythonver}-prettytable Requires: python%{_pythonver}-prettytable
Requires: python%{_pythonver}-gluster = %{version}-%{release} Requires: python%{_pythonver}-gluster = %{version}-%{release}
Requires: rsync Requires: rsync
Requires: util-linux
%if ( 0%{?rhel} && ( ( 0%{?rhel} == 8 && 0%{?rhel_minor_version} >= 3 ) || 0%{?rhel} >= 9 ) )
Requires: tar
%endif
# required for setting selinux bools
%if ( 0%{?rhel} && 0%{?rhel} >= 8 )
Requires(post): policycoreutils-python-utils
Requires(postun): policycoreutils-python-utils
Requires: selinux-policy-targeted
Requires(post): selinux-policy-targeted
BuildRequires: selinux-policy-devel
%endif
%description geo-replication %description geo-replication
GlusterFS is a distributed file-system capable of scaling to several GlusterFS is a distributed file-system capable of scaling to several
@ -712,6 +723,9 @@ Requires: %{name} = %{version}-%{release}
Requires: libglusterfs0%{?_isa} = %{version}-%{release} Requires: libglusterfs0%{?_isa} = %{version}-%{release}
Requires: libgfchangelog0%{?_isa} = %{version}-%{release} Requires: libgfchangelog0%{?_isa} = %{version}-%{release}
Requires: %{name}-cli = %{version}-%{release} Requires: %{name}-cli = %{version}-%{release}
%if ( 0%{?fedora} && 0%{?fedora} >= 30 || ( 0%{?rhel} && 0%{?rhel} >= 8 ) )
# Requires: %%{name}-selinux >= 0.1.0-2
%endif
# some daemons (like quota) use a fuse-mount, glusterfsd is part of -fuse # some daemons (like quota) use a fuse-mount, glusterfsd is part of -fuse
Requires: %{name}-fuse = %{version}-%{release} Requires: %{name}-fuse = %{version}-%{release}
# self-heal daemon, rebalance, nfs-server etc. are actually clients # self-heal daemon, rebalance, nfs-server etc. are actually clients
@ -773,8 +787,7 @@ functionality, and also few other scripts required for setup.
This package provides the glusterfs thin-arbiter translator. This package provides the glusterfs thin-arbiter translator.
%prep %prep
%setup -q -n %{name}-%{version}%{?dev} %setup -q -n %{name}-%{version}%{?prereltag}
%patch0002 -p1
%if ( ! %{_usepython3} ) %if ( ! %{_usepython3} )
echo "fixing python shebangs..." echo "fixing python shebangs..."
for f in api events extras geo-replication libglusterfs tools xlators; do for f in api events extras geo-replication libglusterfs tools xlators; do
@ -855,7 +868,7 @@ head -50 ChangeLog > ChangeLog.head && mv ChangeLog.head ChangeLog
cat << EOM >> ChangeLog cat << EOM >> ChangeLog
More commit messages for this ChangeLog can be found at More commit messages for this ChangeLog can be found at
https://forge.gluster.org/glusterfs-core/glusterfs/commits/v%{version}%{?dev} https://forge.gluster.org/glusterfs-core/glusterfs/commits/v%{version}%{?prereltag}
EOM EOM
# Remove benchmarking and other unpackaged files # Remove benchmarking and other unpackaged files
@ -931,7 +944,7 @@ install -p -m 0755 -D extras/command-completion/gluster.bash \
%{buildroot}%{_sysconfdir}/bash_completion.d/gluster %{buildroot}%{_sysconfdir}/bash_completion.d/gluster
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## All %%post should be placed here and keep them sorted ## All package definitions should be placed here in alphabetical order
## ##
%post %post
%{?ldconfig} %{?ldconfig}
@ -971,6 +984,9 @@ exit 0
%if ( 0%{!?_without_georeplication:1} ) %if ( 0%{!?_without_georeplication:1} )
%post geo-replication %post geo-replication
%if ( 0%{?rhel} && 0%{?rhel} >= 8 )
%selinux_set_booleans %{selinuxbooleans}
%endif
if [ $1 -ge 1 ]; then if [ $1 -ge 1 ]; then
%systemd_postun_with_restart glusterd %systemd_postun_with_restart glusterd
fi fi
@ -1055,7 +1071,7 @@ exit 0
%endif %endif
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## All %%pre should be placed here and keep them sorted ## All package definitions should be placed here in alphabetical order
## ##
%pre %pre
getent group gluster > /dev/null || groupadd -r gluster getent group gluster > /dev/null || groupadd -r gluster
@ -1063,7 +1079,7 @@ getent passwd gluster > /dev/null || useradd -r -g gluster -d %{_rundir}/gluster
exit 0 exit 0
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## All %%preun should be placed here and keep them sorted ## All package definitions should be placed here in alphabetical order
## ##
%if ( 0%{!?_without_events:1} ) %if ( 0%{!?_without_events:1} )
%preun events %preun events
@ -1106,7 +1122,7 @@ if [ $1 -eq 0 ]; then
fi fi
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## All %%postun should be placed here and keep them sorted ## All package definitions should be placed here in alphabetical order
## ##
%postun %postun
%{?ldconfig} %{?ldconfig}
@ -1135,7 +1151,7 @@ exit 0
%endif %endif
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## All %%trigger should be placed here and keep them sorted ## All package definitions should be placed here in alphabetical order
## ##
%if ( 0%{!?_without_server:1} ) %if ( 0%{!?_without_server:1} )
%if ( 0%{?fedora} && 0%{?fedora} > 25 || ( 0%{?rhel} && 0%{?rhel} > 6 ) ) %if ( 0%{?fedora} && 0%{?fedora} > 25 || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
@ -1146,7 +1162,7 @@ exit 0
%endif %endif
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## All %%triggerun should be placed here and keep them sorted ## All package definitions should be placed here in alphabetical order
## ##
%if ( 0%{!?_without_server:1} ) %if ( 0%{!?_without_server:1} )
%if ( 0%{?fedora} && 0%{?fedora} > 25 || ( 0%{?rhel} && 0%{?rhel} > 6 ) ) %if ( 0%{?fedora} && 0%{?fedora} > 25 || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
@ -1157,7 +1173,7 @@ exit 0
%endif %endif
##----------------------------------------------------------------------------- ##-----------------------------------------------------------------------------
## All %%files should be placed here and keep them sorted by groups ## All package definitions should be placed here in alphabetical order
## ##
%files %files
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
@ -1176,46 +1192,46 @@ exit 0
%endif %endif
# xlators that are needed on the client- and on the server-side # xlators that are needed on the client- and on the server-side
%dir %{_libdir}/glusterfs %dir %{_libdir}/glusterfs
%dir %{_libdir}/glusterfs/%{version}%{?dev} %dir %{_libdir}/glusterfs/%{version}%{?prereltag}
%dir %{_libdir}/glusterfs/%{version}%{?dev}/auth %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/auth
%{_libdir}/glusterfs/%{version}%{?dev}/auth/addr.so %{_libdir}/glusterfs/%{version}%{?prereltag}/auth/addr.so
%{_libdir}/glusterfs/%{version}%{?dev}/auth/login.so %{_libdir}/glusterfs/%{version}%{?prereltag}/auth/login.so
%dir %{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport
%{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport/socket.so %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/socket.so
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/error-gen.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/error-gen.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/delay-gen.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/delay-gen.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/io-stats.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/io-stats.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/sink.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/sink.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/trace.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/trace.so
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/access-control.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/access-control.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/barrier.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/barrier.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/cdc.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cdc.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/changelog.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changelog.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/utime.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/utime.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/gfid-access.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/gfid-access.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/namespace.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/namespace.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/read-only.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/read-only.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/shard.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/shard.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/snapview-client.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-client.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/worm.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/worm.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/cloudsync.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cloudsync.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/meta.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/meta.so
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/io-cache.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-cache.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/io-threads.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-threads.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/md-cache.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/md-cache.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/open-behind.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/open-behind.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/quick-read.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/quick-read.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/read-ahead.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/read-ahead.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/readdir-ahead.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/readdir-ahead.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/stat-prefetch.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/stat-prefetch.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/write-behind.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/write-behind.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/nl-cache.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/nl-cache.so
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/system %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/system/posix-acl.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so
%dir %attr(0775,gluster,gluster) %{_rundir}/gluster %dir %attr(0775,gluster,gluster) %{_rundir}/gluster
%dir %attr(0775,gluster,gluster) %{_rundir}/gluster/metrics %dir %attr(0775,gluster,gluster) %{_rundir}/gluster/metrics
%if 0%{?_tmpfilesdir:1} && 0%{!?_without_server:1} %if 0%{?_tmpfilesdir:1} && 0%{!?_without_server:1}
@ -1235,15 +1251,15 @@ exit 0
%{_sysconfdir}/bash_completion.d/gluster %{_sysconfdir}/bash_completion.d/gluster
%files client-xlators %files client-xlators
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/cluster %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/cluster/*.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol/client.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so
%files cloudsync-plugins %files cloudsync-plugins
%dir %{_libdir}/glusterfs/%{version}%{?dev}/cloudsync-plugins %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins
%{_libdir}/glusterfs/%{version}%{?dev}/cloudsync-plugins/cloudsyncs3.so %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins/cloudsyncs3.so
%{_libdir}/glusterfs/%{version}%{?dev}/cloudsync-plugins/cloudsynccvlt.so %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins/cloudsynccvlt.so
%files -n libglusterfs-devel %files -n libglusterfs-devel
%dir %{_includedir}/glusterfs %dir %{_includedir}/glusterfs
@ -1289,18 +1305,18 @@ exit 0
%endif %endif
%files extra-xlators %files extra-xlators
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/quiesce.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/playground %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/playground
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/playground/template.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/playground/template.so
%files fuse %files fuse
# glusterfs is a symlink to glusterfsd, -server depends on -fuse. # glusterfs is a symlink to glusterfsd, -server depends on -fuse.
%{_sbindir}/glusterfs %{_sbindir}/glusterfs
%{_sbindir}/glusterfsd %{_sbindir}/glusterfsd
%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mount %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/mount/fuse.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse.so
/sbin/mount.glusterfs /sbin/mount.glusterfs
%if ( 0%{!?_without_fusermount:1} ) %if ( 0%{!?_without_fusermount:1} )
%{_bindir}/fusermount-glusterfs %{_bindir}/fusermount-glusterfs
@ -1308,8 +1324,8 @@ exit 0
%if ( 0%{?_with_gnfs:1} && 0%{!?_without_server:1} ) %if ( 0%{?_with_gnfs:1} && 0%{!?_without_server:1} )
%files gnfs %files gnfs
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/nfs %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/nfs/* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs/*
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs
%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
@ -1426,7 +1442,7 @@ exit 0
%exclude %{_sharedstatedir}/glusterd/nfs/nfs-server.vol %exclude %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
%exclude %{_sharedstatedir}/glusterd/nfs/run/nfs.pid %exclude %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
%if ( 0%{?_with_gnfs:1} ) %if ( 0%{?_with_gnfs:1} )
%exclude %{_libdir}/glusterfs/%{version}%{?dev}/xlator/nfs/* %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs/*
%endif %endif
%config(noreplace) %{_sysconfdir}/sysconfig/glusterd %config(noreplace) %{_sysconfdir}/sysconfig/glusterd
%if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{_for_fedora_koji_builds} )
@ -1452,27 +1468,27 @@ exit 0
# Manpages # Manpages
%{_mandir}/man8/gluster-setgfid2path.8* %{_mandir}/man8/gluster-setgfid2path.8*
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/arbiter.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/bit-rot.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/bitrot-stub.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/sdfs.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/sdfs.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/index.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/index.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/locks.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/locks.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/posix* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix*
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/snapview-server.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-server.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/marker.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/quota* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota*
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/selinux.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/selinux.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/trash.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/upcall.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/upcall.so
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/leases.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/leases.so
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mgmt %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/mgmt/glusterd.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt/glusterd.so
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol/server.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/storage %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/storage/posix.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so
# snap_scheduler # snap_scheduler
%{_sbindir}/snap_scheduler.py %{_sbindir}/snap_scheduler.py
@ -1566,15 +1582,18 @@ exit 0
%endif %endif
%files thin-arbiter %files thin-arbiter
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
%{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/thin-arbiter.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/thin-arbiter.so
%dir %{_datadir}/glusterfs/scripts %dir %{_datadir}/glusterfs/scripts
%{_datadir}/glusterfs/scripts/setup-thin-arbiter.sh %{_datadir}/glusterfs/scripts/setup-thin-arbiter.sh
%config %{_sysconfdir}/glusterfs/thin-arbiter.vol %config %{_sysconfdir}/glusterfs/thin-arbiter.vol
%{_unitdir}/gluster-ta-volume.service %{_unitdir}/gluster-ta-volume.service
%changelog %changelog
* Wed Jan 6 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 9.0-0.1
- 9.0 RC0
* Tue Dec 1 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 8.3-1 * Tue Dec 1 2020 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 8.3-1
- 8.3 GA - 8.3 GA

View File

@ -1 +1 @@
SHA512 (glusterfs-8.3.tar.gz) = 7ca9d3d8938eb27a7347461a07457e90d1ee6e8d5417970e38245c819cf09bf2ecf9de3954b75edf5cf14816e1059fb381b95935ae1f973ebd14ee7531322aa9 SHA512 (glusterfs-9.0rc0.tar.gz) = f2dcb0f53cd0a8729734f8f980cba32a9b3c5d6add4f27bc35ceb09122b6bac016279eeb0e0c00b2d10f5590f3dac06f9f8470835c111e8b52849ede415a835e