diff --git a/lxqt-build-tools-0.10.0.tar.xz b/lxqt-build-tools-0.10.0.tar.xz new file mode 100644 index 0000000..890ed5f Binary files /dev/null and b/lxqt-build-tools-0.10.0.tar.xz differ diff --git a/lxqt-build-tools-0.6.0.tar.xz b/lxqt-build-tools-0.6.0.tar.xz deleted file mode 100644 index 5b8c38b..0000000 Binary files a/lxqt-build-tools-0.6.0.tar.xz and /dev/null differ diff --git a/lxqt-build-tools.spec b/lxqt-build-tools.spec index 9c8208d..53ec8d0 100644 --- a/lxqt-build-tools.spec +++ b/lxqt-build-tools.spec @@ -1,6 +1,6 @@ Name: lxqt-build-tools -Version: 0.6.0 -Release: 2 +Version: 0.10.0 +Release: 1 Summary: Packaging tools for LXQt License: BSD @@ -13,6 +13,9 @@ 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 @@ -21,17 +24,33 @@ 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 -pushd %{_target_platform} -%{?fedora:%{cmake}}%{!?fedora:%{cmake3}} .. -popd +%if 0%{?el7} +scl enable devtoolset-7 - <<\EOF +%endif + +mkdir build && pushd build +%cmake3 -DPULL_TRANSLATIONS=NO ../ + %make_build -C %{_target_platform} +%if 0%{?el7} +EOF +%endif + +popd + %install %make_install -C %{_target_platform} @@ -44,6 +63,9 @@ popd %changelog +* Thu Jan 13 2022 pei-jiankang - 0.10.0-1 +- update to upstream version 0.10.0 + * Mon Dec 28 2020 Ge Wang - 0.6.0-2 - Remove redundancy %{?dist}