From 49796290c9772ce49e5a1666cc2f3cc875e59e49 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Tue, 26 Apr 2016 10:10:05 -0400 Subject: packaging: %postun libs ldconfig: relative path `1' used to build cache %postun libs isn't 'closed' by the following %postun server on RHEL6 due to the %ifdef...%endif But -server has /usr/lib*/libgfdb.so.x, so we should be running /sbin/ldconfig! Which conveniently fixes the closing issue. Change-Id: Icc365eefc5453c40e02b59288a4e8023b82baa7b BUG: 1330583 Signed-off-by: Kaleb S KEITHLEY Reviewed-on: http://review.gluster.org/14081 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos --- glusterfs.spec.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 6b06355c406..6332ef2d8f1 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -723,9 +723,9 @@ rm -rf %{buildroot} %if ( 0%{!?_without_syslog:1} ) %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) %_init_restart rsyslog -exit 0 %endif %endif +exit 0 %post api -p /sbin/ldconfig @@ -858,14 +858,15 @@ exit 0 %postun libs -p /sbin/ldconfig -%if (0%{?_with_firewalld:1}) %postun server +/sbin/ldconfig +%if (0%{?_with_firewalld:1}) #reload service files if firewalld running if $(systemctl is-active firewalld 1>/dev/null 2>&1); then firewall-cmd --reload fi -exit 0 %endif +exit 0 ##----------------------------------------------------------------------------- ## All %%files should be placed here and keep them grouped @@ -1178,6 +1179,9 @@ exit 0 %{_sbindir}/gf_recon %changelog +* Tue Apr 26 2016 Kaleb S. KEITHLEY +- %%postun libs w/o firewalld on RHEL6 (#1330583) + * Tue Apr 12 2016 Kaleb S. KEITHLEY - additional dirs and files in /var/lib/glusterd/... (#1326410) -- cgit