Christian Heusel pushed to branch main at Arch Linux / Packaging / Packages / 
borgmatic


Commits:
1f5693e1 by Christian Heusel at 2024-03-11T22:10:31+01:00
upgpkg: 1.8.9-2: namcap & repro changes

fixes 
https://gitlab.archlinux.org/archlinux/packaging/packages/borgmatic/-/issues/1

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = borgmatic
        pkgdesc = Simple, configuration-driven backup software for servers and 
workstations
        pkgver = 1.8.9
-       pkgrel = 1
+       pkgrel = 2
        url = https://torsion.org/borgmatic
        arch = any
        license = GPL-3.0-or-later
@@ -12,12 +12,14 @@ pkgbase = borgmatic
        makedepends = python-build
        makedepends = python-installer
        makedepends = python-wheel
+       makedepends = python-setuptools
        depends = borg
+       depends = python
        depends = python-colorama
        depends = python-jsonschema
        depends = python-requests
        depends = python-ruamel-yaml
-       depends = python-setuptools
+       depends = python-packaging
        optdepends = apprise: for Apprise notifications
        optdepends = python-llfuse: for mount action
        source = 
git+https://projects.torsion.org/borgmatic-collective/borgmatic.git#tag=8c301ba6884218410a0a322daae1bcc80ec6786b


=====================================
PKGBUILD
=====================================
@@ -9,20 +9,21 @@
 pkgname=borgmatic
 _commit=8c301ba6884218410a0a322daae1bcc80ec6786b
 pkgver=1.8.9
-pkgrel=1
+pkgrel=2
 pkgdesc='Simple, configuration-driven backup software for servers and 
workstations'
 arch=('any')
 url=https://torsion.org/borgmatic
 license=('GPL-3.0-or-later')
 depends=(
   'borg'
+  'python'
   'python-colorama'
   'python-jsonschema'
   'python-requests'
   'python-ruamel-yaml'
-  'python-setuptools'
+  'python-packaging'
 )
-makedepends=('git' 'python-build' 'python-installer' 'python-wheel')
+makedepends=('git' 'python-build' 'python-installer' 'python-wheel' 
'python-setuptools')
 checkdepends=('apprise' 'python-flexmock' 'python-pytest')
 optdepends=(
   'apprise: for Apprise notifications'
@@ -44,12 +45,17 @@ prepare() {
 build() {
   cd $pkgname
   python -m build --wheel --skip-dependency-check --no-isolation
+
+  # build the completions
+  python -m venv --system-site-packages test-env
+  test-env/bin/python -m installer dist/*.whl
+  mkdir completions
+  ./test-env/bin/borgmatic --bash-completion > completions/bash
+  ./test-env/bin/borgmatic --fish-completion > completions/fish
 }
 
 check() {
   cd $pkgname
-  python -m venv --system-site-packages test-env
-  test-env/bin/python -m installer dist/*.whl
   PATH="$PWD/test-env/bin:$PATH" test-env/bin/python -m pytest -c /dev/null \
     --ignore=tests/end-to-end
 }
@@ -60,9 +66,6 @@ package() {
   install -Dm644 -t "$pkgdir"/usr/lib/systemd/system 
sample/systemd/borgmatic.{service,timer}
   install -Dm644 -t "$pkgdir"/usr/lib/systemd/user 
sample/systemd/borgmatic-user.{service,timer}
 
-  install -d 
"$pkgdir"/usr/share/{bash-completion/completions,fish/vendor_completions.d}
-  ./test-env/bin/borgmatic --bash-completion > \
-    "$pkgdir"/usr/share/bash-completion/completions/$pkgname
-  ./test-env/bin/borgmatic --fish-completion > \
-    "$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
+  install -Dm644 completions/bash 
"$pkgdir"/usr/share/bash-completion/completions/$pkgname
+  install -Dm644 completions/fish 
"$pkgdir"/usr/share/fish/vendor_completions.d/$pkgname.fish
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/borgmatic/-/commit/1f5693e152aa3484b097c08a481cbee5baf923e4

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/borgmatic/-/commit/1f5693e152aa3484b097c08a481cbee5baf923e4
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to