From 9f26c701334ba29f8dd2c0325d159228fab9cb39 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sun, 2 Mar 2025 19:08:39 +0800 Subject: [PATCH] try build with cmake 4.0 --- ...ugins-core-4.3.1-port-to-newer-cmake.patch | 34 +++++++++++++++++++ dnf-plugins-core.spec | 12 ++++--- 2 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 dnf-plugins-core-4.3.1-port-to-newer-cmake.patch diff --git a/dnf-plugins-core-4.3.1-port-to-newer-cmake.patch b/dnf-plugins-core-4.3.1-port-to-newer-cmake.patch new file mode 100644 index 0000000..d3273aa --- /dev/null +++ b/dnf-plugins-core-4.3.1-port-to-newer-cmake.patch @@ -0,0 +1,34 @@ +--- dnf-plugins-core-4.3.1/CMakeLists.txt.orig 2025-03-02 18:41:49.006311400 +0800 ++++ dnf-plugins-core-4.3.1/CMakeLists.txt 2025-03-02 18:55:39.450919800 +0800 +@@ -1,24 +1,25 @@ + PROJECT (dnf-plugins-core NONE) +-CMAKE_MINIMUM_REQUIRED (VERSION 2.4) ++CMAKE_MINIMUM_REQUIRED (VERSION 3.12) + + if (NOT WITHOUT_LOCAL) + set (WITHOUT_LOCAL "0") + endif() + + IF (NOT PYTHON_DESIRED) +- FIND_PACKAGE (PythonInterp REQUIRED) ++ FIND_PACKAGE (Python REQUIRED) + ELSEIF (${PYTHON_DESIRED} STREQUAL "2") +- FIND_PACKAGE (PythonInterp 2 EXACT REQUIRED) ++ FIND_PACKAGE (Python 2 REQUIRED) + ELSEIF (${PYTHON_DESIRED} STREQUAL "3") +- FIND_PACKAGE (PythonInterp 3 EXACT REQUIRED) ++ FIND_PACKAGE (Python 3 REQUIRED) + ELSEIF (EXISTS ${PYTHON_DESIRED}) + SET (PYTHON_EXECUTABLE ${PYTHON_DESIRED}) +- FIND_PACKAGE (PythonInterp REQUIRED) ++ FIND_PACKAGE (Python REQUIRED) + ELSE () + MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED}) + ENDIF() + +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++SET(PYTHON_INSTALL_DIR ${Python_SITELIB}) ++SET(PYTHON_VERSION_MAJOR ${Python_VERSION_MAJOR}) + MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") + + SET (SYSCONFDIR /etc) diff --git a/dnf-plugins-core.spec b/dnf-plugins-core.spec index 1c98528..fd89438 100644 --- a/dnf-plugins-core.spec +++ b/dnf-plugins-core.spec @@ -9,16 +9,17 @@ Name: dnf-plugins-core Version: 4.3.1 -Release: 6 +Release: 7 Summary: Core Plugins for DNF License: GPL-2.0-or-later URL: https://github.com/rpm-software-management/dnf-plugins-core Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -patch6000: backport-download-plugin-respect-install_weak_deps-option-value.patch -patch6001: backport-reposync-Respect-norepopath-with-metadata-path.patch +Patch6000: backport-download-plugin-respect-install_weak_deps-option-value.patch +Patch6001: backport-reposync-Respect-norepopath-with-metadata-path.patch -patch9000: 9000-Replace-COPR-hub-with-openeuler.patch +Patch9000: 9000-Replace-COPR-hub-with-openeuler.patch +Patch9001: dnf-plugins-core-4.3.1-port-to-newer-cmake.patch BuildArch: noarch BuildRequires: cmake gettext python3-sphinx @@ -343,6 +344,9 @@ ln -sf %{_mandir}/man1/dnf-utils.1.gz %{buildroot}%{_mandir}/man1/repotrack.1.gz %{_mandir}/man8/dnf-local.* %changelog +* Sun Mar 02 2025 Funda Wang - 4.3.1-7 +- try build with cmake 4.0 + * Thu Nov 07 2024 yueyuankun - 4.3.1-6 - Type:bugfix - CVE:NA -- Gitee