|
|
12a457 |
From 604db733ae2a8689685768907ac7e76486d59d48 Mon Sep 17 00:00:00 2001
|
|
|
12a457 |
From: Milind Changire <mchangir@redhat.com>
|
|
|
12a457 |
Date: Fri, 13 May 2016 01:51:07 +0530
|
|
|
12a457 |
Subject: [PATCH 144/158] packaging: %postun libs ldconfig: relative path `1' used to build cache
|
|
|
12a457 |
|
|
|
12a457 |
Remove the -p /sbin/ldconfig from %post{un} {api|libs} and move the
|
|
|
12a457 |
/sbin/ldconfig invokation to separate line.
|
|
|
12a457 |
|
|
|
12a457 |
See mainline:
|
|
|
12a457 |
>> Change-Id: I8a4c3879afcb7cea08d4b303a2524432d2ffec06
|
|
|
12a457 |
>> BUG: 1330583
|
|
|
12a457 |
>> http://review.gluster.org/14312
|
|
|
12a457 |
|
|
|
12a457 |
Change-Id: I865e1db77c63e5a14e72ffce20ea6670618f6d5e
|
|
|
12a457 |
BUG: 1328194
|
|
|
12a457 |
Signed-off-by: Milind Changire <mchangir@redhat.com>
|
|
|
12a457 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/74231
|
|
|
12a457 |
Reviewed-by: Kaleb Keithley <kkeithle@redhat.com>
|
|
|
12a457 |
---
|
|
|
12a457 |
glusterfs.spec.in | 12 ++++++++----
|
|
|
12a457 |
1 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
12a457 |
|
|
|
12a457 |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
12a457 |
index c77754d..b49e7dd 100644
|
|
|
12a457 |
--- a/glusterfs.spec.in
|
|
|
12a457 |
+++ b/glusterfs.spec.in
|
|
|
12a457 |
@@ -814,7 +814,8 @@ rm -rf %{buildroot}
|
|
|
12a457 |
%endif
|
|
|
12a457 |
exit 0
|
|
|
12a457 |
|
|
|
12a457 |
-%post api -p /sbin/ldconfig
|
|
|
12a457 |
+%post api
|
|
|
12a457 |
+/sbin/ldconfig
|
|
|
12a457 |
|
|
|
12a457 |
%if ( 0%{?rhel} == 5 )
|
|
|
12a457 |
%post fuse
|
|
|
12a457 |
@@ -832,7 +833,8 @@ exit 0
|
|
|
12a457 |
%endif
|
|
|
12a457 |
%endif
|
|
|
12a457 |
|
|
|
12a457 |
-%post libs -p /sbin/ldconfig
|
|
|
12a457 |
+%post libs
|
|
|
12a457 |
+/sbin/ldconfig
|
|
|
12a457 |
|
|
|
12a457 |
%if ( 0%{?_build_server} )
|
|
|
12a457 |
%post server
|
|
|
12a457 |
@@ -949,7 +951,8 @@ fi
|
|
|
12a457 |
%endif
|
|
|
12a457 |
%endif
|
|
|
12a457 |
|
|
|
12a457 |
-%postun api -p /sbin/ldconfig
|
|
|
12a457 |
+%postun api
|
|
|
12a457 |
+/sbin/ldconfig
|
|
|
12a457 |
|
|
|
12a457 |
%if ( 0%{?_build_server} )
|
|
|
12a457 |
%postun server
|
|
|
12a457 |
@@ -964,7 +967,8 @@ exit 0
|
|
|
12a457 |
exit 0
|
|
|
12a457 |
%endif
|
|
|
12a457 |
|
|
|
12a457 |
-%postun libs -p /sbin/ldconfig
|
|
|
12a457 |
+%postun libs
|
|
|
12a457 |
+/sbin/ldconfig
|
|
|
12a457 |
|
|
|
12a457 |
##-----------------------------------------------------------------------------
|
|
|
12a457 |
## All %%files should be placed here and keep them grouped
|
|
|
12a457 |
--
|
|
|
12a457 |
1.7.1
|
|
|
12a457 |
|