glusterfs-3.3.1-3, add Requires: rpcbind and better logic for preserving

/etc/glusterd
This commit is contained in:
Kaleb S. KEITHLEY 2012-11-26 15:02:00 -05:00
parent 785159bb46
commit fee29178fd

View File

@ -32,7 +32,7 @@
Summary: Cluster File System Summary: Cluster File System
Name: glusterfs Name: glusterfs
Version: 3.3.1 Version: 3.3.1
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv3+ and (GPLv2 or LGPLv3+) License: GPLv3+ and (GPLv2 or LGPLv3+)
Group: System Environment/Base Group: System Environment/Base
Vendor: Red Hat Vendor: Red Hat
@ -191,6 +191,7 @@ License: GPLv3+
Group: System Environment/Daemons Group: System Environment/Daemons
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name}-fuse = %{version}-%{release} Requires: %{name}-fuse = %{version}-%{release}
Requires: rpcbind
%description server %description server
GlusterFS is a clustered file-system capable of scaling to several GlusterFS is a clustered file-system capable of scaling to several
@ -821,9 +822,9 @@ fi
# to /var/lib. (N.B. Starting with 3.3.0 all gluster files are in /var/lib # to /var/lib. (N.B. Starting with 3.3.0 all gluster files are in /var/lib
# in gluster.org RPMs.) Be careful to copy them on the off chance that # in gluster.org RPMs.) Be careful to copy them on the off chance that
# /etc and /var/lib are on separate file systems # /etc and /var/lib are on separate file systems
if [ -d /etc/glusterd ]; then if [ -d /etc/glusterd -a ! -h /var/lib/glusterd ]; then
%{__mkdir_p} /var/lib %{__mkdir_p} /var/lib/glusterd
cp -a /etc/glusterd /var/lib cp -a /etc/glusterd /var/lib/glusterd
rm -rf /etc/glusterd rm -rf /etc/glusterd
ln -sf /var/lib/glusterd /etc/glusterd ln -sf /var/lib/glusterd /etc/glusterd
fi fi
@ -985,6 +986,11 @@ fi
%changelog %changelog
* Mon Nov 16 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-3
- add Requires: rpcbind for minimum install systems where rpcbind isn't
installed; usually this is a no-op.
- Better logic to preserve contents of /etc/glusterd
* Wed Oct 31 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-2 * Wed Oct 31 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-2
- Synchronize with openstack-swift-1.4.8 packaging changes, including - Synchronize with openstack-swift-1.4.8 packaging changes, including
systemd .service files and align with the matching sets of patches systemd .service files and align with the matching sets of patches