- up to 4.12.0

diff --git a/dnf.spec b/dnf.spec
index d9b4f5768854aad24988f3f65a905a313dfd0cd2..ff81fc3edc0f861331677fa6233848df60172551 100644 (file)
--- 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 31adba8c58bd444dfa1dc0d4782c98f833c88cea..c82735568c71a021a7821c72a612eadf521311f6 100644 (file)
--- 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 c5c720d9f51a16f9c01155f6349c3683977b4a77..72eb68fea69040d53acaec3b2ad18ac646b0e093 100644 (file)
--- 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