From 736deb36707c3467082236780b9fe70ac1307696 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Thu, 7 Nov 2024 14:33:52 +0800
Subject: [PATCH] adopt to new cmake macro

(cherry picked from commit 51c06a98391acd7126f7ac33ecf9b1901a595b59)
---
 dnf-plugins-core.spec | 27 +++++++++++++--------------
 dnf-plugins-core.yaml |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec
index ce9e970..d23e515 100644
--- a/dnf-plugins-core.spec
+++ b/dnf-plugins-core.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global dnf_lowest_compatible 4.11.0
 %global dnf_plugins_extra 2.0.0
 %global hawkey_version 0.64.0
@@ -7,9 +9,9 @@
 
 Name:                  dnf-plugins-core
 Version:               4.3.1
-Release:               4
+Release:               5
 Summary:               Core Plugins for DNF
-License:               GPLv2+
+License:               GPL-2.0-or-later
 URL:                   https://github.com/rpm-software-management/dnf-plugins-core
 Source0:               %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
@@ -170,19 +172,14 @@ modules and create repository.
 
 %prep
 %autosetup -p1
-mkdir build-py3
 
 %build
-pushd build-py3
-  %cmake ../ -DPYTHON_DESIRED:FILEPATH=%{__python3} 
-  %make_build
-  make doc-man
-popd
+%cmake -DPYTHON_DESIRED:FILEPATH=%{__python3}
+%cmake_build
+%cmake_build --target doc-man
 
 %install
-pushd build-py3
-  %make_install
-popd
+%cmake_install
 
 %find_lang %{name}
 mv %{buildroot}%{_libexecdir}/dnf-utils-3 %{buildroot}%{_libexecdir}/dnf-utils
@@ -209,9 +206,7 @@ ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repoquery.1.gz
 ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz
 
 %check
-pushd build-py3
-ctest -VV
-popd
+%ctest
 
 %files
 %{_libexecdir}/dnf-utils
@@ -347,6 +342,10 @@ popd
 %{_mandir}/man8/dnf-local.*
 
 %changelog
+* Thu Nov 07 2024 Funda Wang <fundawang@yeah.net> - 4.3.1-5
+- adopt to new cmake macro
+- force out-of-source build per requested by doc-man generation
+
 * Wed May 8 2024 wangyueliang <wangyueliang@kylinos.cn> - 4.3.1-4
 - Type:bugfix
 - CVE:NA
diff --git a/dnf-plugins-core.yaml b/dnf-plugins-core.yaml
index 20cd9ee..5de3433 100644
--- a/dnf-plugins-core.yaml
+++ b/dnf-plugins-core.yaml
@@ -1,4 +1,4 @@
 version_control: github
 src_repo: rpm-software-management/dnf-plugins-core
 tag_prefix: ^v
-seperator: .
+separator: .
-- 
Gitee