diff options
| author | Luis Martinez | 2022-01-29 18:11:52 -0600 |
|---|---|---|
| committer | Luis Martinez | 2022-01-29 18:11:52 -0600 |
| commit | 829616c5294c8340b210120d5e72e70258dd64c5 (patch) | |
| tree | 12be6d5af4a307b3988b1f1e4c283dccfad6a4ca | |
| parent | 45a992998da7f750c2fe739655d54bb720b91e3b (diff) | |
| download | aur-829616c5294c8340b210120d5e72e70258dd64c5.tar.gz | |
package cleanup
| -rw-r--r-- | .SRCINFO | 55 | ||||
| -rw-r--r-- | PKGBUILD | 95 | ||||
| -rw-r--r-- | maestral@.service | 13 |
3 files changed, 73 insertions, 90 deletions
@@ -1,41 +1,36 @@ pkgbase = maestral-git - pkgdesc = A light-weight and open-source Dropbox client. - pkgver = 1.4.4 + pkgdesc = Open-source Dropbox client + pkgver = 1.5.3.r1.gbf70c762 pkgrel = 1 - url = https://github.com/SamSchott/maestral-dropbox + url = https://github.com/SamSchott/maestral arch = any license = MIT + checkdepends = python-pytest + checkdepends = python-pytest-benchmark makedepends = git - makedepends = python - makedepends = python-setuptools + makedepends = python-build + makedepends = python-install makedepends = python-wheel - depends = python>=3.9 - depends = python-alembic>=1.3 - depends = python-alembic<1.6 - depends = python-click>=8.0.0 - depends = python-desktop-notifier>=3.2.2 - depends = python-dropbox>=10.9.0 - depends = python-dropbox<12.0 - depends = python-fasteners>=0.15 - depends = python-keyring>=22 - depends = python-keyrings-alt>=3.1.0 + depends = python-click + depends = python-desktop-notifier + depends = python-dropbox + depends = python-fasteners + depends = python-keyring + depends = python-keyrings-alt depends = python-packaging - depends = python-pathspec>=0.5.8 - depends = python-pyro5>=5.10 - depends = python-requests>=2.16.2 - depends = python-sdnotify>=0.3.2 - depends = python-survey>=3.4.3 - depends = python-survey<4.0 - depends = python-watchdog - depends = python-wheel + depends = python-pathspec + depends = python-pyro5 + depends = python-requests + depends = python-sdnotify + depends = python-setuptools + depends = python-survey + depends = python-watchdog-git depends = python-systemd - optdepends = maestral-qt: QT frontend for maestral - provides = maestral - conflicts = maestral - source = git+https://github.com/SamSchott/maestral-dropbox#branch=master + optdepends = maestral-qt: Qt interface for the maestral daemon + optdepends = python-importlib-metadata: REQUIRED for python<3.8 + source = maestral-git::git+https://github.com/SamSchott/maestral source = maestral@.service - md5sums = SKIP - md5sums = 841d7d34ae18d512e3d2fbe453702744 + sha256sums = SKIP + sha256sums = 79f48787cec441c252b1fcbecbce1342bbac1de275e90fe9dfbd1b9cad2ba2c8 pkgname = maestral-git - @@ -1,68 +1,57 @@ -# Maintainer: Batuhan Baserdem <lastname dot firstname at gmail> +# Maintainer: Luis Martinez <luis dot martinez at disroot dot org> +# Contributor: Batuhan Baserdem <lastname dot firstname at gmail> -_name=maestral -_srcname="${_name}-dropbox" - -pkgname="${_name}-git" -provides=("${_name}") -conflicts=("${_name}") -pkgver=1.4.4 +pkgname=maestral-git +pkgver=1.5.3.r1.gbf70c762 pkgrel=1 -pkgdesc='A light-weight and open-source Dropbox client.' +pkgdesc='Open-source Dropbox client' arch=('any') -url="https://github.com/SamSchott/${_srcname}" +url="https://github.com/SamSchott/maestral" license=('MIT') -source=("git+${url}#branch=master" "maestral@.service") -makedepends=('git' 'python' 'python-setuptools' 'python-wheel') depends=( - 'python>=3.9' - 'python-alembic>=1.3' 'python-alembic<1.6' - 'python-click>=8.0.0' - 'python-desktop-notifier>=3.2.2' - 'python-dropbox>=10.9.0' 'python-dropbox<12.0' - 'python-fasteners>=0.15' - 'python-keyring>=22' - 'python-keyrings-alt>=3.1.0' - 'python-packaging' - 'python-pathspec>=0.5.8' - 'python-pyro5>=5.10' - 'python-requests>=2.16.2' - 'python-sdnotify>=0.3.2' - 'python-survey>=3.4.3' 'python-survey<4.0' - 'python-watchdog' - 'python-wheel' - 'python-systemd') -optdepends=('maestral-qt: QT frontend for maestral') -md5sums=('SKIP' - '841d7d34ae18d512e3d2fbe453702744') + 'python-click' + 'python-desktop-notifier' + 'python-dropbox' + 'python-fasteners' + 'python-keyring' + 'python-keyrings-alt' + 'python-packaging' + 'python-pathspec' + 'python-pyro5' + 'python-requests' + 'python-sdnotify' + 'python-setuptools' + 'python-survey' + 'python-watchdog-git' + 'python-systemd') +optdepends=( + 'maestral-qt: Qt interface for the maestral daemon' + 'python-importlib-metadata: REQUIRED for python<3.8') +makedepends=('git' 'python-build' 'python-install' 'python-wheel') +checkdepends=('python-pytest' 'python-pytest-benchmark') +source=("$pkgname::git+$url" + 'maestral@.service') +sha256sums=('SKIP' + '79f48787cec441c252b1fcbecbce1342bbac1de275e90fe9dfbd1b9cad2ba2c8') pkgver() { - cd "${srcdir}/${_srcname}" - git describe --long --tags | sed 's|\([^-]*-g\)|r\1|;s|-|.|g;s|^v||g' + git -C "$pkgname" describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./' } -prepare() { - # Remove version restriction from watchdog; version name seems to be odd in arch repo - sed -i 's|watchdog>=[\.,0-9]*|watchdog|' "${pkgname}-${pkgver}/setup.py" +build() { + cd "$pkgname" + python -m build --wheel --skip-dependency-check --no-isolation } -build() { - cd "${srcdir}/${_srcname}" - python setup.py build +check() { + cd "$pkgname" + PYTHONPATH=src/ pytest -k 'not test_autostart' -x } package() { - # Change into the source git directory - cd "${srcdir}/${_srcname}" - - # Run python setup function - python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build - - # Install the licence - install -Dm644 "${srcdir}/${_srcname}/LICENSE.txt" \ - "${pkgdir}/usr/share/licenses/${_name}/LICENSE" - - # Install the systemd unit provided - install -Dm644 "${srcdir}/maestral@.service" \ - "${pkgdir}/usr/lib/systemd/user/maestral@.service" + export PYTHONHASHSEED=0 + cd "$pkgname" + python -m install --optimize=1 --destdir="$pkgdir/" dist/*.whl + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 "$srcdir/maestral@.service" -t "$pkgdir/usr/lib/systemd/user/" } diff --git a/maestral@.service b/maestral@.service index 02853676d85e..d67ef71014e3 100644 --- a/maestral@.service +++ b/maestral@.service @@ -1,15 +1,14 @@ [Unit] -Description = Maestral daemon for the config %I -Documentation = "https://github.com/SamSchott/maestral-dropbox/wiki" +Description = Maestral daemon for config %i +Documentation = https://github.com/SamSchott/maestral-dropbox/wiki [Service] Type = notify NotifyAccess = exec -ExecStart = /usr/bin/maestral start --foreground --config-name %i -ExecReload = /usr/bin/maestral restart --config-name %i -ExecStop = /usr/bin/maestral stop --config-name %i -RestartSec = 1 -Restart = on-failure +ExecStart = /usr/bin/maestral start -f -c %i +ExecStop = /usr/bin/maestral stop -c %i +ExecStopPost=/usr/bin/env bash -c "if [ ${SERVICE_RESULT} != success ];\ +then notify-send Maestral 'Daemon failed'; fi" WatchdogSec = 30s [Install] |