diff options
| -rw-r--r-- | .SRCINFO | 48 | ||||
| -rw-r--r-- | PKGBUILD | 60 | ||||
| -rw-r--r-- | deluge-stable.install | 31 | ||||
| -rw-r--r-- | deluge-web.service | 5 | ||||
| -rw-r--r-- | deluge.tmpfiles.conf | 1 | ||||
| -rw-r--r-- | deluged.environment (renamed from deluged.conf) | 1 | ||||
| -rw-r--r-- | deluged.service | 7 |
7 files changed, 52 insertions, 101 deletions
@@ -1,35 +1,29 @@ pkgbase = deluge-stable-git pkgdesc = A bittorrent client written with python and pygtk - Git Stable branch Version pkgver = 1.3.15.r19.gd62987089 - pkgrel = 3 + pkgrel = 4 url = http://deluge-torrent.org/ - install = deluge-stable.install arch = any license = GPL3 makedepends = intltool - makedepends = pygtk - makedepends = librsvg - makedepends = python2-mako - makedepends = git - makedepends = python2-distribute makedepends = libtorrent-rasterbar - depends = python2-xdg - depends = python2-twisted - depends = python2-pyopenssl - depends = xdg-utils - depends = python2-chardet - depends = python2-gobject - depends = python2-service_identity + makedepends = python2-chardet + makedepends = python2-pyopenssl + makedepends = python2-twisted + makedepends = python2-xdg + depends = python2 depends = desktop-file-utils depends = hicolor-icon-theme - depends = python2-distribute - optdepends = libtorrent-rasterbar: deluge daemon, including local daemon - optdepends = python2-notify: libnotify notifications - optdepends = pygtk: needed for gtk ui - optdepends = librsvg: needed for gtk ui - optdepends = python2-mako: needed for web ui - optdepends = python2-pygame: audible notifications - optdepends = python2-libappindicator: appindicator notifications + optdepends = python2-service-identity + optdepends = libtorrent-rasterbar: required for daemon + optdepends = pygtk: required for GTK client + optdepends = xdg-utils: required for GTK client + optdepends = python2-chardet: required for GTK client + optdepends = python2-xdg: required for GTK client + optdepends = python2-notify: optional for GTK client + optdepends = python2-pygame: optional for GTK client + optdepends = python2-libappindicator: optional for GTK client + optdepends = python2-mako: required for web client provides = deluge conflicts = deluge conflicts = deluge-svn @@ -38,15 +32,13 @@ pkgbase = deluge-stable-git replaces = deluge-svn replaces = deluge-stable source = git://github.com/deluge-torrent/deluge#branch=1.3-stable - source = deluge.tmpfiles.conf source = deluged.service source = deluge-web.service - source = deluged.conf + source = deluged.environment md5sums = SKIP - md5sums = c50385d32a2db0ef3f46b8caadb0e988 - md5sums = 959d16333e3745831d3026a3465575d0 - md5sums = 2c0c3b59065c1ac7af68e31f8b392b40 - md5sums = 75e591b738cf9f858af2de8665a3b3e7 + md5sums = a20aa31829ba59f6153545be353a0a07 + md5sums = c4371974414e6b9003f62a53954eefea + md5sums = 71d556cf7ce3bb59391797827347e80c pkgname = deluge-stable-git @@ -8,49 +8,41 @@ pkgname=deluge-stable-git _gitname="deluge" _gitbranch="1.3-stable" pkgver=1.3.15.r19.gd62987089 -pkgrel=3 +pkgrel=4 pkgdesc="A bittorrent client written with python and pygtk - Git Stable branch Version" arch=('any') url="http://deluge-torrent.org/" license=('GPL3') -depends=('python2-xdg' - 'python2-twisted' - 'python2-pyopenssl' - 'xdg-utils' - 'python2-chardet' - 'python2-gobject' - 'python2-service_identity' +depends=('python2' 'desktop-file-utils' - 'hicolor-icon-theme' - 'python2-distribute') + 'hicolor-icon-theme') makedepends=('intltool' - 'pygtk' - 'librsvg' - 'python2-mako' - 'git' - 'python2-distribute' - 'libtorrent-rasterbar') -optdepends=('libtorrent-rasterbar: deluge daemon, including local daemon' - 'python2-notify: libnotify notifications' - 'pygtk: needed for gtk ui' - 'librsvg: needed for gtk ui' - 'python2-mako: needed for web ui' - 'python2-pygame: audible notifications' - 'python2-libappindicator: appindicator notifications') + 'libtorrent-rasterbar' + 'python2-chardet' + 'python2-pyopenssl' + 'python2-twisted' + 'python2-xdg') +optdepends=('python2-service-identity' + 'libtorrent-rasterbar: required for daemon' + 'pygtk: required for GTK client' + 'xdg-utils: required for GTK client' + 'python2-chardet: required for GTK client' + 'python2-xdg: required for GTK client' + 'python2-notify: optional for GTK client' + 'python2-pygame: optional for GTK client' + 'python2-libappindicator: optional for GTK client' + 'python2-mako: required for web client') provides=('deluge') conflicts=('deluge' 'deluge-svn' 'deluge-stable' 'deluge-git') replaces=('deluge-svn' 'deluge-stable') source=("git://github.com/deluge-torrent/deluge#branch=$_gitbranch" - deluge.tmpfiles.conf deluged.service deluge-web.service - deluged.conf) -install=deluge-stable.install + deluged.environment) md5sums=('SKIP' - 'c50385d32a2db0ef3f46b8caadb0e988' - '959d16333e3745831d3026a3465575d0' - '2c0c3b59065c1ac7af68e31f8b392b40' - '75e591b738cf9f858af2de8665a3b3e7') + 'a20aa31829ba59f6153545be353a0a07' + 'c4371974414e6b9003f62a53954eefea' + '71d556cf7ce3bb59391797827347e80c') pkgver() { cd "${srcdir}/${_gitname}" @@ -65,14 +57,16 @@ build() { package() { cd "${srcdir}/$_gitname" python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 + # Quick fix to keep namcap from thinking we need Python 3 + sed -i -e '1s@python@python2@' "${pkgdir}/usr/lib/python2.7/site-packages/deluge/ui/Win32IconImagePlugin.py" cd "${srcdir}" - install -Dm644 deluge.tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/deluge.conf" + install -Dm644 deluged.service "$pkgdir/usr/lib/systemd/system/deluged.service" install -Dm644 deluge-web.service "$pkgdir/usr/lib/systemd/system/deluge-web.service" - install -Dm644 deluged.conf "$pkgdir/etc/conf.d/deluged" + install -Dm644 deluged.environment "$pkgdir/etc/conf.d/deluged" echo 'u deluge - "Deluge BitTorrent daemon" /srv/deluge' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" - echo 'd /srv/deluge 0775 deluge deluge' | + echo 'd /srv/deluge 0770 deluge deluge' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" } diff --git a/deluge-stable.install b/deluge-stable.install deleted file mode 100644 index 27b11d5beda9..000000000000 --- a/deluge-stable.install +++ /dev/null @@ -1,31 +0,0 @@ -post_install() { - getent group deluge &>/dev/null || groupadd -g 125 deluge - if ! getent passwd deluge &>/dev/null; then - useradd -c 'Deluge user' -u 125 -g deluge -d /srv/deluge -s /bin/false deluge - passwd -l deluge &>/dev/null - fi - - post_upgrade - - - - -cat <<EOF ->>> The optional headless daemon started using 'systemctl start deluged.service' - uses the "deluge" user. Its default download directory is /srv/deluge. -EOF -} - -post_upgrade() { - systemd-tmpfiles --create deluge.conf - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_remove() { - getent passwd deluge &>/dev/null && userdel deluge - getent group deluge &>/dev/null && groupdel deluge - - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} diff --git a/deluge-web.service b/deluge-web.service index ab13c9afa9e0..cafaa4685965 100644 --- a/deluge-web.service +++ b/deluge-web.service @@ -1,15 +1,14 @@ [Unit] Description=Deluge Bittorrent Client WebUI -Documentation=man:deluge-web +Documentation=man:deluge-web(1) After=online.target deluged.service Wants=deluged.service [Service] -Type=forking Umask=027 User=deluge EnvironmentFile=/etc/conf.d/deluged -ExecStart=/usr/bin/deluge-web $WEB_OPTIONS +ExecStart=/usr/bin/deluge-web -d $WEB_OPTIONS Restart=on-failure [Install] diff --git a/deluge.tmpfiles.conf b/deluge.tmpfiles.conf deleted file mode 100644 index 23fcfc5a5a44..000000000000 --- a/deluge.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/deluge 0755 deluge deluge - diff --git a/deluged.conf b/deluged.environment index f95f2f6f56a3..6a8144a67263 100644 --- a/deluged.conf +++ b/deluged.environment @@ -1,3 +1,2 @@ -DELUGE_USER="deluge" OPTIONS="" WEB_OPTIONS="" diff --git a/deluged.service b/deluged.service index 0534b045f8da..a757ae63f5e6 100644 --- a/deluged.service +++ b/deluged.service @@ -1,14 +1,13 @@ [Unit] Description=Deluge Bittorrent Client Daemon -Documentation=man:deluged +Documentation=man:deluged(1) After=network-online.target [Service] +EnvironmentFile=/etc/conf.d/deluged User=deluge EnvironmentFile=/etc/conf.d/deluged -ExecStart=/usr/bin/deluged -P /run/deluge/deluged.pid $OPTIONS -Type=forking -PIDFile=/run/deluge/deluged.pid +ExecStart=/usr/bin/deluged -d $OPTIONS UMask=007 Restart=on-failure TimeoutStopSec=300 |