From: Neal Gompa <ngompa13@gmail.com>
Date: Mon, 8 Jun 2020 16:56:04 +0000 (-0400)
Subject: rpm: Drop override on %_libexecdir
X-Git-Tag: v16.1.0~2091^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed6552d5067c9f1d34c426f9ae18b0c37f2a9d29;p=ceph.git

rpm: Drop override on %_libexecdir

We no longer need it, as distributions are converging on /usr/libexec
since FHS 3.0 has specified it as the acceptable path for libexecdir.

Fedora has been using /usr/libexec since the beginning, and
openSUSE has accepted software installed into /usr/libexec since
September 2019 in openSUSE:Factory. openSUSE Leap 15.x still uses
/usr/lib for %_libexecdir, but the rest of the spec should handle the
change gracefully.

Signed-off-by: Neal Gompa <ngompa13@gmail.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 35de67371f2d..c725b1a75328 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -88,8 +88,6 @@
 %if 0%{?rhel} == 7
 %define __python %{__python3}
 %endif
-# unify libexec for all targets
-%global _libexecdir %{_exec_prefix}/lib
 
 # disable dwz which compresses the debuginfo
 %global _find_debuginfo_dwz_opts %{nil}