From: Boris Ranto <branto@redhat.com>
Date: Fri, 20 May 2016 05:43:08 +0000 (+0200)
Subject: Revert "rpm: put /sbin/ldconfig into -p"
X-Git-Tag: v11.0.0~437^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bef5ea7833cc5cb2a06033a381d593a4945f105c;p=ceph.git

Revert "rpm: put /sbin/ldconfig into -p"

This reverts commit a53d932fc4a77a1fac33c4f650f2bf629a2f1234.

If the interpret is passed to postun script, everything until the next
rpm section gets interpreted as the input for the interpret (in this
case ldconfig). This results in warnings like

/sbin/ldconfig: relative path `0' used to build cache

when removing the packages that pass the interpret because we use
several '#' characters to separate the subpackage sections and these get
passed to the ldconfig.

Using the default interpret (bash) fixes the warning. I'm also doing the
same to %post script for consistency.

Signed-off-by: Boris Ranto <branto@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 9c843f5c8dab..643a3f80dc63 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1222,9 +1222,11 @@ fi
 %{_libdir}/librados_tp.so.*
 %endif
 
-%post -n librados2 -p /sbin/ldconfig
+%post -n librados2
+/sbin/ldconfig
 
-%postun -n librados2 -p /sbin/ldconfig
+%postun -n librados2
+/sbin/ldconfig
 
 #################################################################################
 %files -n librados2-devel
@@ -1257,9 +1259,11 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/libradosstriper.so.*
 
-%post -n libradosstriper1 -p /sbin/ldconfig
+%post -n libradosstriper1
+/sbin/ldconfig
 
-%postun -n libradosstriper1 -p /sbin/ldconfig
+%postun -n libradosstriper1
+/sbin/ldconfig
 
 #################################################################################
 %files -n libradosstriper1-devel
@@ -1282,7 +1286,8 @@ fi
 mkdir -p /usr/lib64/qemu/
 ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 
-%postun -n librbd1 -p /sbin/ldconfig
+%postun -n librbd1
+/sbin/ldconfig
 
 #################################################################################
 %files -n librbd1-devel
@@ -1301,9 +1306,11 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %defattr(-,root,root,-)
 %{_libdir}/librgw.so.*
 
-%post -n librgw2 -p /sbin/ldconfig
+%post -n librgw2
+/sbin/ldconfig
 
-%postun -n librgw2 -p /sbin/ldconfig
+%postun -n librgw2
+/sbin/ldconfig
 
 #################################################################################
 %files -n librgw2-devel
@@ -1324,9 +1331,11 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %defattr(-,root,root,-)
 %{_libdir}/libcephfs.so.*
 
-%post -n libcephfs1 -p /sbin/ldconfig
+%post -n libcephfs1
+/sbin/ldconfig
 
-%postun -n libcephfs1 -p /sbin/ldconfig
+%postun -n libcephfs1
+/sbin/ldconfig
 
 #################################################################################
 %files -n libcephfs1-devel
@@ -1385,9 +1394,11 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %defattr(-,root,root,-)
 %{_libdir}/libcephfs_jni.so.*
 
-%post -n libcephfs_jni1 -p /sbin/ldconfig
+%post -n libcephfs_jni1
+/sbin/ldconfig
 
-%postun -n libcephfs_jni1 -p /sbin/ldconfig
+%postun -n libcephfs_jni1
+/sbin/ldconfig
 
 #################################################################################
 %files -n libcephfs_jni1-devel