From 1f41fa1bf39e3fe9c785efff81f9a8f54e2fcaa0 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 28 Feb 2023 12:18:20 +0800 Subject: [PATCH] Apply scripts used in system-rpm-config before executing configure --- rpm.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/rpm.spec b/rpm.spec index 2a73111..e311976 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,4 +1,4 @@ -%define anolis_release 4 +%define anolis_release 5 %define rpmhome /usr/lib/rpm # run internal testsuite? @@ -74,7 +74,7 @@ BuildRequires: file-devel BuildRequires: gettext-devel BuildRequires: ncurses-devel BuildRequires: bzip2-devel >= 0.9.0c -BuildRequires: lua-devel >= 5.1 +BuildRequires: pkgconfig(lua) >= 5.2 BuildRequires: libcap-devel BuildRequires: libacl-devel %if %{with xz} @@ -317,6 +317,11 @@ for i in $(find . -name ltmain.sh) ; do %{__sed} -i.backup -e 's~compiler_flags=$~compiler_flags="%{_hardened_ldflags}"~' $i done; +[ -x /usr/lib/rpm/anolis/force-as-needed-for-shared-lib-in-libtool ] && /usr/lib/rpm/anolis/force-as-needed-for-shared-lib-in-libtool . +[ -x /usr/lib/rpm/anolis/fix-libtool-ltmain-from-overlinking ] && /usr/lib/rpm/anolis/fix-libtool-ltmain-from-overlinking +[ -x /usr/lib/rpm/anolis/fix-libtool-from-moving-options-after-libs ] && /usr/lib/rpm/anolis/fix-libtool-from-moving-options-after-libs . +[ -x /usr/lib/rpm/anolis/fix-dlsearch-path-in-libtool ] && /usr/lib/rpm/anolis/fix-dlsearch-path-in-libtool . %{_lib} + # Using configure macro has some unwanted side-effects on rpm platform # setup, use the old-fashioned way for now only defining minimal paths. ./configure \ @@ -329,7 +334,6 @@ done; --host=%{_target_platform} \ --with-vendor=anolis \ %{!?with_plugins: --disable-plugins} \ - --with-lua \ --with-selinux \ --with-cap \ --with-acl \ @@ -610,6 +614,9 @@ fi %doc docs/librpm/html/* %changelog +* Tue Feb 28 2023 Funda Wang - 4.18.0-5 +- Apply scripts used in system-rpm-config before executing configure + * Wed Nov 30 2022 chen_yu_ao - 4.18.0-4 - re-add abi files that was removed before -- Gitee