From 1f92b0314b9ccb44d1aee3f87126b3c8e3ed5b29 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Thu, 19 Jan 2023 18:26:52 +1100 Subject: [PATCH] ceph.spec.in: Replace %usrmerged macro with regular version check %usrmerged is deprecated in favour of %if 0%{?suse_version} < 1550 (see https://en.opensuse.org/openSUSE:Usr_merge for details) Fixes: https://tracker.ceph.com/issues/58501 Signed-off-by: Tim Serong --- ceph.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index b0e0e1d548d5..e5030bc2b60a 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -1489,7 +1489,7 @@ touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys # firewall templates and /sbin/mount.ceph symlink -%if 0%{?suse_version} && !0%{?usrmerged} +%if 0%{?suse_version} && 0%{?suse_version} < 1550 mkdir -p %{buildroot}/sbin ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph %endif @@ -1670,7 +1670,7 @@ exit 0 %{_bindir}/rbd-replay-many %{_bindir}/rbdmap %{_sbindir}/mount.ceph -%if 0%{?suse_version} && !0%{?usrmerged} +%if 0%{?suse_version} && 0%{?suse_version} < 1550 /sbin/mount.ceph %endif %if %{with lttng} -- 2.47.3