From 6afe09628f454f663df5d57a20cf1b88c1094bc4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 11 May 2022 18:23:00 +0200 Subject: [PATCH] - up to 4.12.0 --- dnf.spec | 6 +++--- install.patch | 2 +- repos.d.patch | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dnf.spec b/dnf.spec index d9b4f57..ff81fc3 100644 --- a/dnf.spec +++ b/dnf.spec @@ -10,13 +10,13 @@ Summary: Package manager Summary(pl.UTF-8): Zarządca pakietów Name: dnf -Version: 4.6.1 -Release: 7 +Version: 4.12.0 +Release: 0.1 Group: Base # GPL v2+ with GPL v2 and GPL parts; for a breakdown of the licensing, see PACKAGE-LICENSING License: GPL v2 (parts on GPL v2+ or GPL) Source0: https://github.com/rpm-software-management/dnf/archive/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 21880d44905d6aa67ab6bee1e86380b3 +# Source0-md5: 0e0242e443f87290efd16226b056f18c Source1: pld.repo Source2: pld-archive.repo Source3: pld-debuginfo.repo diff --git a/install.patch b/install.patch index 31adba8..c827355 100644 --- a/install.patch +++ b/install.patch @@ -18,7 +18,7 @@ ENDIF() +IF (NOT PYTHON_INSTALL_DIR) - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) + 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) +ENDIF() MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") diff --git a/repos.d.patch b/repos.d.patch index c5c720d..72eb68f 100644 --- a/repos.d.patch +++ b/repos.d.patch @@ -8,7 +8,9 @@ clean_requirements_on_remove=True --- dnf-4.6.1/etc/dnf/dnf.conf~ 2021-03-02 21:05:07.000000000 +0700 +++ dnf-4.6.1/etc/dnf/dnf.conf 2022-05-11 22:11:47.577573922 +0700 -@@ -1,4 +1,5 @@ +@@ -1,6 +1,7 @@ + # see `man dnf.conf` for defaults and possible options + [main] +reposdir=/etc/dnf/repos.d gpgcheck=1 -- 2.44.0