]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rpm/luarocks: simplify conditional and support Leap 15.3 39762/head
authorNathan Cutler <ncutler@suse.com>
Mon, 1 Mar 2021 17:35:11 +0000 (18:35 +0100)
committerNathan Cutler <ncutler@suse.com>
Mon, 1 Mar 2021 20:20:45 +0000 (21:20 +0100)
The luarocks conditional had gotten hard to read, and the openSUSE Leap 15.3
build needs lua53 as well.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
ceph.spec.in

index c12975f45492fe93668b1ce048cc4747a2c73278..906ae08c0185032b152524c09aa1f13cc839961a 100644 (file)
@@ -41,6 +41,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}
 %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
 %endif
 %endif
 
-%if 0%{?suse_version}
-%if !0%{?is_opensuse}
-# SLE does not support luarocks
-%bcond_with lua_packages
-%else
-%if 0%{?sle_version} == 150200
-%global luarocks_package_name lua53-luarocks
-%else
-%global luarocks_package_name lua54-luarocks
-%endif
-%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}