From 89deae7bc11cfafcde4e792d336f26ad736a851a Mon Sep 17 00:00:00 2001 From: pei-jiankang Date: Thu, 13 Jan 2022 17:59:38 +0800 Subject: [PATCH] update to upstream version 0.10.0 (cherry picked from commit 413d15ae8927135a5fe011d720882013bc5932f3) --- lxqt-build-tools.spec | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/lxqt-build-tools.spec b/lxqt-build-tools.spec index 53ec8d0..d3f48a2 100644 --- a/lxqt-build-tools.spec +++ b/lxqt-build-tools.spec @@ -13,9 +13,6 @@ BuildRequires: %{?fedora:cmake}%{!?fedora:cmake3} >= 3.0 BuildRequires: gcc-c++ BuildRequires: pkgconfig(Qt5Core) BuildRequires: glib2-devel -%if 0%{?el7} -BuildRequires: devtoolset-7-gcc-c++ -%endif Requires: %{?fedora:cmake}%{!?fedora:cmake3} >= 3.0 @@ -24,33 +21,17 @@ Various packaging tools and scripts for LXQt applications. %prep -%if 0%{?el7} -scl enable devtoolset-7 - <<\EOF -%endif %autosetup -p1 %{__mkdir} -p %{_target_platform} -%if 0%{?el7} -EOF -%endif %build -%if 0%{?el7} -scl enable devtoolset-7 - <<\EOF -%endif - -mkdir build && pushd build +pushd %{_target_platform} %cmake3 -DPULL_TRANSLATIONS=NO ../ - +popd %make_build -C %{_target_platform} -%if 0%{?el7} -EOF -%endif - -popd - %install %make_install -C %{_target_platform}