[arch-commits] Commit in dnf/trunk (PKGBUILD arch-release-ver.patch)

[Jelle van der Waa]

    Date: Monday, December 20, 2021 @ 12:50:34
  Author: jelle
Revision: 1080157

upgpkg: dnf 4.10.0-2

Added:
  dnf/trunk/arch-release-ver.patch
Modified:
  dnf/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   11 ++++++++---
 arch-release-ver.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-20 12:17:03 UTC (rev 1080156)
+++ PKGBUILD	2021-12-20 12:50:34 UTC (rev 1080157)
@@ -2,7 +2,7 @@
 
 pkgname=dnf
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Package manager forked from Yum, using libsolv as a dependency resolver"
 arch=('any')
 url="https://github.com/rpm-software-management/$pkgname"
@@ -19,8 +19,9 @@
         "etc/libreport/events.d/collect_$pkgname.conf"
         "etc/logrotate.d/$pkgname")
 options=('!emptydirs')
-source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('7c8d18b61cfe18104d066abbdd5a420067313ba93734120666f89695a113eba8')
+source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz" "arch-release-ver.patch")
+sha256sums=('7c8d18b61cfe18104d066abbdd5a420067313ba93734120666f89695a113eba8'
+            '13d082db7846482f090147b8e24b8fcb701948893c2b21f3c17cb12b9491e04e')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -29,6 +30,10 @@
   # use sphinx-build instead
   sed -e 's/sphinx-build-3/sphinx-build/' \
       -i doc/CMakeLists.txt
+
+  # HACK: arch has no RELEASE_VER in /etc/os-release but setting it still makes `dnf.rpm.detect_releasever` returns None.
+  # Set it to the latest Fedora release to make dnf at least work.
+  patch -Np1 -i $srcdir/arch-release-ver.patch
 }
 
 build() {

Added: arch-release-ver.patch
===================================================================
--- arch-release-ver.patch	                        (rev 0)
+++ arch-release-ver.patch	2021-12-20 12:50:34 UTC (rev 1080157)
@@ -0,0 +1,12 @@
+diff -aur dnf-4.10.0/dnf/base.py dnf-4.10.0.new/dnf/base.py
+--- dnf-4.10.0/dnf/base.py	2021-10-21 08:31:48.000000000 +0200
++++ dnf-4.10.0.new/dnf/base.py	2021-12-20 11:22:45.127917712 +0100
+@@ -156,6 +156,8 @@
+         if 'releasever' not in subst:
+             subst['releasever'] = \
+                 dnf.rpm.detect_releasever(conf.installroot)
++        if subst['releasever'] is None:
++            subst['releasever'] = '35'
+         return conf
+ 
+     def _setup_modular_excludes(self):