From 35f7121f4cec67401f672be91bfc3bee25b8369e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 12 Oct 2017 17:47:22 +0200 Subject: [PATCH] fix openSUSE Leap 15.0 build --- configs/sl15.0.conf | 2 +- dist/build.spec | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/configs/sl15.0.conf b/configs/sl15.0.conf index 9a15cf2d2..5e4fdff89 100644 --- a/configs/sl15.0.conf +++ b/configs/sl15.0.conf @@ -40,7 +40,7 @@ FileProvides: /usr/bin/fipscheck fipscheck FileProvides: /usr/bin/python python-base Preinstall: aaa_base attr bash coreutils diffutils -Preinstall: filesystem fillup glibc grep +Preinstall: filesystem fillup glibc grep liblua5_3-5 Preinstall: libbz2-1 libgcc_s1 libncurses6 pam Preinstall: permissions libreadline7 rpm sed tar libz1 libselinux1 Preinstall: liblzma5 libcap2 libacl1 libattr1 diff --git a/dist/build.spec b/dist/build.spec index 300f4dd76..c4ce81b3d 100644 --- a/dist/build.spec +++ b/dist/build.spec @@ -122,13 +122,6 @@ chroot or a secure virtualized %if 0%{?suse_version} # initvm make CFLAGS="$RPM_BUILD_FLAGS" initvm-all -#XXX temporary hack until lua is actually in -%if 0%{?suse_version} == 1330 -if rpm -q liblua5_3-5; then - V=%suse_version - sed -i -e 's/liblua5_3/liblua5_3-5/g' configs/sl${V:0:2}.${V:2:1}.conf -fi -%endif %endif %install