From fee29178fd55991297db8cccc2e986439be4a563 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 26 Nov 2012 15:02:00 -0500 Subject: [PATCH] glusterfs-3.3.1-3, add Requires: rpcbind and better logic for preserving /etc/glusterd --- glusterfs.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 1a7e59f..dd48fca 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -32,7 +32,7 @@ Summary: Cluster File System Name: glusterfs Version: 3.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ and (GPLv2 or LGPLv3+) Group: System Environment/Base Vendor: Red Hat @@ -191,6 +191,7 @@ License: GPLv3+ Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} Requires: %{name}-fuse = %{version}-%{release} +Requires: rpcbind %description server 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 # in gluster.org RPMs.) Be careful to copy them on the off chance that # /etc and /var/lib are on separate file systems -if [ -d /etc/glusterd ]; then - %{__mkdir_p} /var/lib - cp -a /etc/glusterd /var/lib +if [ -d /etc/glusterd -a ! -h /var/lib/glusterd ]; then + %{__mkdir_p} /var/lib/glusterd + cp -a /etc/glusterd /var/lib/glusterd rm -rf /etc/glusterd ln -sf /var/lib/glusterd /etc/glusterd fi @@ -985,6 +986,11 @@ fi %changelog +* Mon Nov 16 2012 Kaleb S. KEITHLEY - 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 - 3.3.1-2 - Synchronize with openstack-swift-1.4.8 packaging changes, including systemd .service files and align with the matching sets of patches