From 94edf1ea698e50151ea2fdbe6bdc4e73fc4bfb24 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 1 Mar 2021 18:35:11 +0100 Subject: [PATCH] rpm/luarocks: simplify conditional and support Leap 15.3 The luarocks conditional had gotten hard to read, and the openSUSE Leap 15.3 build needs lua53 as well. Signed-off-by: Nathan Cutler (cherry picked from commit f27484e84ca251be7e91bc026a35b650318fd82a) Conflicts: ceph.spec.in - in current master, the conditional being replaced had gotten more complicated than it was back when pacific was split off from master --- ceph.spec.in | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index abac1ec19d99f..2bac4044c575e 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -49,6 +49,8 @@ %bcond_without lttng %bcond_without libradosstriper %bcond_without ocf +%global luarocks_package_name luarocks +%bcond_without lua_packages %global _remote_tarball_prefix https://download.ceph.com/tarballs/ %endif %if 0%{?suse_version} @@ -73,6 +75,21 @@ %if ! %{defined _fillupdir} %global _fillupdir /var/adm/fillup-templates %endif +#luarocks +%if 0%{?is_opensuse} +# openSUSE +%bcond_without lua_packages +%if 0%{?sle_version} +# openSUSE Leap +%global luarocks_package_name lua53-luarocks +%else +# openSUSE Tumbleweed +%global luarocks_package_name lua54-luarocks +%endif +%else +# SLE +%bcond_with lua_packages +%endif %endif %bcond_with seastar %bcond_with jaeger @@ -96,19 +113,6 @@ %endif %endif -%if 0%{?suse_version} -%if !0%{?is_opensuse} -# SLE does not support luarocks -%bcond_with lua_packages -%else -%global luarocks_package_name lua53-luarocks -%bcond_without lua_packages -%endif -%else -%global luarocks_package_name luarocks -%bcond_without lua_packages -%endif - %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} %{!?python3_pkgversion: %global python3_pkgversion 3} -- 2.39.5