summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S KEITHLEY <kkeithle@redhat.com>2016-04-26 10:33:54 -0400
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-04-29 03:09:37 -0700
commit6659ff9b81ba0f47e7dd85f947cb8ed5bb41ac26 (patch)
tree937f64db8f43d0d08200340cdd5cafcbe890f241
parentc8e5d078ce8b02f1ce0a4692a1170cd760fbb260 (diff)
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. See: > Change-Id: Icc365eefc5453c40e02b59288a4e8023b82baa7b > BUG: 1330583 > http://review.gluster.org/14081 Change-Id: I7c2daf1408aaee6340e6983cfaba207c5d13f5a1 BUG: 1328836 Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/14082 Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
-rw-r--r--glusterfs.spec.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 9748b39d9c4..d3464a80fea 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -764,9 +764,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
@@ -899,14 +899,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
@@ -1217,6 +1218,9 @@ exit 0
%changelog
+* Tue Apr 26 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com>
+- %%postun libs w/o firewalld on RHEL6 (#1328836)
+
* Tue Apr 12 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com>
- additional dirs and files in /var/lib/glusterd/... (#1326413)