From 93fe0c2d1a91cf03b8810d828460777831688647 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 29 Jan 2025 01:19:59 +0800 Subject: [PATCH] adopt to new cmake macro (cherry picked from commit 2cfe88d1700c705251f6c1eb2d700c6e64bb7f8a) --- libqtxdg.spec | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/libqtxdg.spec b/libqtxdg.spec index 3f79e66..2bf2143 100644 --- a/libqtxdg.spec +++ b/libqtxdg.spec @@ -1,13 +1,13 @@ Name: libqtxdg Summary: QtXdg, a Qt5 implementation of XDG standards Version: 3.12.0 -Release: 1 -License: LGPLv2+ +Release: 2 +License: LGPL-2.1-or-later URL: https://lxqt-project.org Source0: https://github.com/lxqt/libqtxdg/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ -BuildRequires: %{?fedora:cmake}%{!?fedora:cmake3} >= 3.0 +BuildRequires: cmake >= 3.0 BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Help) @@ -38,17 +38,11 @@ Files used for developing and building software that uses qtxdg. %setup -q %build -mkdir %{_target_platform}-qt5 -pushd %{_target_platform}-qt5 - %{?fedora:%{cmake}}%{!?fedora:%{cmake3}} .. -popd - -%make_build -C %{_target_platform}-qt5 +%cmake +%cmake_build %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt5 - -%ldconfig_scriptlets +%cmake_install %files %doc AUTHORS @@ -57,8 +51,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt5 %{_libdir}/libQt5Xdg.so.3.12.0 %{_libdir}/libQt5XdgIconLoader.so.3 %{_libdir}/libQt5XdgIconLoader.so.3.12.0 -%{_sysconfdir}/xdg/lxqt-qtxdg.conf -%{_sysconfdir}/xdg/qtxdg.conf +%config %{_sysconfdir}/xdg/lxqt-qtxdg.conf +%config %{_sysconfdir}/xdg/qtxdg.conf %files devel @@ -73,6 +67,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-qt5 %{_qt5_archdatadir}/plugins/iconengines/libQt5XdgIconPlugin.so %changelog +* Wed Jan 29 2025 Funda Wang - 3.12.0-2 +- adopt to new cmake macro + * Mon Jan 08 2024 peijiankang - 3.12.0-1 - update verison to 3.12.0 -- Gitee