summaryrefslogtreecommitdiffstats
path: root/ceph.spec.in
diff options
context:
space:
mode:
authorBoris Ranto <branto@redhat.com>2016-05-20 07:43:08 +0200
committerBoris Ranto <branto@redhat.com>2016-05-23 21:58:38 +0200
commitbef5ea7833cc5cb2a06033a381d593a4945f105c (patch)
tree3e0a02a0a78fcc4c993d696e48ee05df8cd25f12 /ceph.spec.in
parentMerge pull request #9249 from tchaikov/wip-cmake-ocf (diff)
downloadceph-bef5ea7833cc5cb2a06033a381d593a4945f105c.tar.xz
ceph-bef5ea7833cc5cb2a06033a381d593a4945f105c.zip
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>
Diffstat (limited to 'ceph.spec.in')
-rw-r--r--ceph.spec.in33
1 files changed, 22 insertions, 11 deletions
diff --git a/ceph.spec.in b/ceph.spec.in
index 9c843f5c8da..643a3f80dc6 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