[arch-commits] Commit in dnf/repos/community-any (3 files)

Jelle van der Waa jelle at gemini.archlinux.org
Mon Dec 20 12:50:44 UTC 2021


    Date: Monday, December 20, 2021 @ 12:50:44
  Author: jelle
Revision: 1080158

archrelease: copy trunk to community-any

Added:
  dnf/repos/community-any/PKGBUILD
    (from rev 1080157, dnf/trunk/PKGBUILD)
  dnf/repos/community-any/arch-release-ver.patch
    (from rev 1080157, dnf/trunk/arch-release-ver.patch)
Deleted:
  dnf/repos/community-any/PKGBUILD

------------------------+
 PKGBUILD               |  139 ++++++++++++++++++++++++-----------------------
 arch-release-ver.patch |   12 ++++
 2 files changed, 84 insertions(+), 67 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-20 12:50:34 UTC (rev 1080157)
+++ PKGBUILD	2021-12-20 12:50:44 UTC (rev 1080158)
@@ -1,67 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle at archlinux.org>
-
-pkgname=dnf
-pkgver=4.10.0
-pkgrel=1
-pkgdesc="Package manager forked from Yum, using libsolv as a dependency resolver"
-arch=('any')
-url="https://github.com/rpm-software-management/$pkgname"
-license=('GPL2')
-depends=('libdnf' 'libcomps'
-         'python' 'python-gpgme' 'rpm-tools')
-makedepends=('bash-completion' 'cmake' 'python-sphinx')
-optdepends=('unbound: for gpgkey_dns_verification option')
-backup=("etc/$pkgname/automatic.conf"
-        "etc/$pkgname/$pkgname.conf"
-        "etc/$pkgname/aliases.d/zypper.conf"
-        "etc/$pkgname/protected.d/$pkgname.conf"
-        "etc/$pkgname/protected.d/yum.conf"
-        "etc/libreport/events.d/collect_$pkgname.conf"
-        "etc/logrotate.d/$pkgname")
-options=('!emptydirs')
-source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('7c8d18b61cfe18104d066abbdd5a420067313ba93734120666f89695a113eba8')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  # sphinx-build-3 does not exist on Arch Linux,
-  # use sphinx-build instead
-  sed -e 's/sphinx-build-3/sphinx-build/' \
-      -i doc/CMakeLists.txt
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  cmake -B build \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DPYTHON_DESIRED=3
-
-  make -C build
-  make -C build doc-man
-}
-
-check() {
-  cd "$pkgname-$pkgver"
-
-  # Fails because Arch Linux does not support C.UTF-8 locale
-  make -n -C build ARGS="--output-on-failure" test
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make -C build DESTDIR="$pkgdir/" install
-
-  install -Dp -m644 README.rst "$pkgdir/usr/share/doc/$pkgname/README.rst"
-
-  rm "$pkgdir/usr/share/man/man8/yum.8" \
-     "$pkgdir/usr/share/man/man5/yum.conf.5" \
-     "$pkgdir/usr/share/man/man1/yum-aliases.1" \
-     "$pkgdir/usr/share/man/man8/yum-shell.8"
-  ln -s $pkgname-3 "$pkgdir/usr/bin/$pkgname"
-  ln -s $pkgname-automatic-3 "$pkgdir/usr/bin/$pkgname-automatic"
-
-  rm "$pkgdir/etc/$pkgname/$pkgname-strict.conf"
-}

Copied: dnf/repos/community-any/PKGBUILD (from rev 1080157, dnf/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-12-20 12:50:44 UTC (rev 1080158)
@@ -0,0 +1,72 @@
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+
+pkgname=dnf
+pkgver=4.10.0
+pkgrel=2
+pkgdesc="Package manager forked from Yum, using libsolv as a dependency resolver"
+arch=('any')
+url="https://github.com/rpm-software-management/$pkgname"
+license=('GPL2')
+depends=('libdnf' 'libcomps'
+         'python' 'python-gpgme' 'rpm-tools')
+makedepends=('bash-completion' 'cmake' 'python-sphinx')
+optdepends=('unbound: for gpgkey_dns_verification option')
+backup=("etc/$pkgname/automatic.conf"
+        "etc/$pkgname/$pkgname.conf"
+        "etc/$pkgname/aliases.d/zypper.conf"
+        "etc/$pkgname/protected.d/$pkgname.conf"
+        "etc/$pkgname/protected.d/yum.conf"
+        "etc/libreport/events.d/collect_$pkgname.conf"
+        "etc/logrotate.d/$pkgname")
+options=('!emptydirs')
+source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz" "arch-release-ver.patch")
+sha256sums=('7c8d18b61cfe18104d066abbdd5a420067313ba93734120666f89695a113eba8'
+            '13d082db7846482f090147b8e24b8fcb701948893c2b21f3c17cb12b9491e04e')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # sphinx-build-3 does not exist on Arch Linux,
+  # 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() {
+  cd "$pkgname-$pkgver"
+
+  cmake -B build \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DPYTHON_DESIRED=3
+
+  make -C build
+  make -C build doc-man
+}
+
+check() {
+  cd "$pkgname-$pkgver"
+
+  # Fails because Arch Linux does not support C.UTF-8 locale
+  make -n -C build ARGS="--output-on-failure" test
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make -C build DESTDIR="$pkgdir/" install
+
+  install -Dp -m644 README.rst "$pkgdir/usr/share/doc/$pkgname/README.rst"
+
+  rm "$pkgdir/usr/share/man/man8/yum.8" \
+     "$pkgdir/usr/share/man/man5/yum.conf.5" \
+     "$pkgdir/usr/share/man/man1/yum-aliases.1" \
+     "$pkgdir/usr/share/man/man8/yum-shell.8"
+  ln -s $pkgname-3 "$pkgdir/usr/bin/$pkgname"
+  ln -s $pkgname-automatic-3 "$pkgdir/usr/bin/$pkgname-automatic"
+
+  rm "$pkgdir/etc/$pkgname/$pkgname-strict.conf"
+}

Copied: dnf/repos/community-any/arch-release-ver.patch (from rev 1080157, dnf/trunk/arch-release-ver.patch)
===================================================================
--- arch-release-ver.patch	                        (rev 0)
+++ arch-release-ver.patch	2021-12-20 12:50:44 UTC (rev 1080158)
@@ -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):



More information about the arch-commits mailing list