|
 |
12a457 |
From 29f2c5ac0e0abfa07816e1edcdd9706beb8cdead Mon Sep 17 00:00:00 2001
|
|
|
12a457 |
From: Kaleb S KEITHLEY <kkeithle@redhat.com>
|
|
|
12a457 |
Date: Fri, 29 Apr 2016 15:30:50 -0400
|
|
|
12a457 |
Subject: [PATCH 112/139] packaging: %postun libs ldconfig: relative path `1' used to build cache
|
|
|
12a457 |
|
|
|
12a457 |
%postun libs isn't 'closed' by the following %postun server on RHEL6
|
|
|
12a457 |
due to the %ifdef...%endif
|
|
|
12a457 |
|
|
|
12a457 |
But -server has /usr/lib*/libgfdb.so.x, so we should be running
|
|
|
12a457 |
/sbin/ldconfig! Which conveniently fixes the closing issue.
|
|
|
12a457 |
|
|
|
12a457 |
See mainline:
|
|
|
12a457 |
>> Change-Id: Icc365eefc5453c40e02b59288a4e8023b82baa7b
|
|
|
12a457 |
>> BUG: 1330583
|
|
|
12a457 |
>> http://review.gluster.org/14081
|
|
|
12a457 |
release-3.7:
|
|
|
12a457 |
> Change-Id: I7c2daf1408aaee6340e6983cfaba207c5d13f5a1
|
|
|
12a457 |
> BUG: 1328836
|
|
|
12a457 |
> http://review.gluster.org/14082
|
|
|
12a457 |
|
|
|
12a457 |
Change-Id: Ib9ba2808a9c4c4bc0418f16c6247ec36dad39546
|
|
|
12a457 |
BUG: 1328194
|
|
|
12a457 |
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
|
|
|
12a457 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/73366
|
|
|
12a457 |
Reviewed-by: Milind Changire <mchangir@redhat.com>
|
|
|
12a457 |
Tested-by: Milind Changire <mchangir@redhat.com>
|
|
|
12a457 |
---
|
|
|
12a457 |
glusterfs.spec.in | 18 +++++++++++++-----
|
|
|
12a457 |
1 files changed, 13 insertions(+), 5 deletions(-)
|
|
|
12a457 |
|
|
|
12a457 |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
12a457 |
index 89037aa..9455cb0 100644
|
|
|
12a457 |
--- a/glusterfs.spec.in
|
|
|
12a457 |
+++ b/glusterfs.spec.in
|
|
|
12a457 |
@@ -806,9 +806,9 @@ rm -rf %{buildroot}
|
|
|
12a457 |
%if ( 0%{!?_without_syslog:1} )
|
|
|
12a457 |
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
|
|
|
12a457 |
%_init_restart rsyslog
|
|
|
12a457 |
-exit 0
|
|
|
12a457 |
%endif
|
|
|
12a457 |
%endif
|
|
|
12a457 |
+exit 0
|
|
|
12a457 |
|
|
|
12a457 |
%post api -p /sbin/ldconfig
|
|
|
12a457 |
|
|
|
12a457 |
@@ -932,7 +932,10 @@ fi
|
|
|
12a457 |
%endif
|
|
|
12a457 |
|
|
|
12a457 |
##-----------------------------------------------------------------------------
|
|
|
12a457 |
-## All %%postun should be placed here and keep them sorted
|
|
|
12a457 |
+## All %%postun should be placed here and keep them sorted as best we can
|
|
|
12a457 |
+## making sure to "close" each one to avoid
|
|
|
12a457 |
+## ldconfig: relative path `1' used to build cache
|
|
|
12a457 |
+## errors
|
|
|
12a457 |
##
|
|
|
12a457 |
%postun
|
|
|
12a457 |
/sbin/ldconfig
|
|
|
12a457 |
@@ -944,19 +947,21 @@ fi
|
|
|
12a457 |
|
|
|
12a457 |
%postun api -p /sbin/ldconfig
|
|
|
12a457 |
|
|
|
12a457 |
-%postun libs -p /sbin/ldconfig
|
|
|
12a457 |
-
|
|
|
12a457 |
%if ( 0%{?_build_server} )
|
|
|
12a457 |
-%if (0%{?_with_firewalld:1})
|
|
|
12a457 |
%postun server
|
|
|
12a457 |
+/sbin/ldconfig
|
|
|
12a457 |
+%if (0%{?_with_firewalld:1})
|
|
|
12a457 |
#reload service files if firewalld running
|
|
|
12a457 |
if $(systemctl is-active firewalld 1>/dev/null 2>&1;; then
|
|
|
12a457 |
firewall-cmd --reload
|
|
|
12a457 |
fi
|
|
|
12a457 |
exit 0
|
|
|
12a457 |
%endif
|
|
|
12a457 |
+exit 0
|
|
|
12a457 |
%endif
|
|
|
12a457 |
|
|
|
12a457 |
+%postun libs -p /sbin/ldconfig
|
|
|
12a457 |
+
|
|
|
12a457 |
##-----------------------------------------------------------------------------
|
|
|
12a457 |
## All %%files should be placed here and keep them grouped
|
|
|
12a457 |
##
|
|
|
12a457 |
@@ -1937,6 +1942,9 @@ end
|
|
|
12a457 |
|
|
|
12a457 |
|
|
|
12a457 |
%changelog
|
|
|
12a457 |
+* Fri Apr 29 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
12a457 |
+- %%pre, %%post etc. scriptlet cleanup again, (#1331844)
|
|
|
12a457 |
+
|
|
|
12a457 |
* Tue Apr 12 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
12a457 |
- pacemaker dependencies on RHEL6 (#1292034)
|
|
|
12a457 |
|
|
|
12a457 |
--
|
|
|
12a457 |
1.7.1
|
|
|
12a457 |
|