summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStorm Dragon2018-09-20 17:13:18 -0400
committerStorm Dragon2018-09-20 17:13:18 -0400
commit0bb77fd30872a9dc9f76cdc4d37460a31e7865bd (patch)
tree90d807e55cdc361f4ee9616cebf1052148bc7414
parent1a2db6502e3272cb37d6df0a3334df253d3f3a42 (diff)
downloadaur-0bb77fd30872a9dc9f76cdc4d37460a31e7865bd.tar.gz
We now get source from github as the pip site was failing to generat e a settings file.
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD11
-rw-r--r--fenrir.install24
3 files changed, 8 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 890a83176646..b4fb0958f9f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
# Generated by mksrcinfo v8
-# Sat Sep 15 11:48:53 UTC 2018
+# Thu Sep 20 21:12:45 UTC 2018
pkgbase = fenrir
pkgdesc = A user space console screen reader written in python3
- pkgver = 1.9.3.post1
+ pkgver = 1.9.3
pkgrel = 1
url = https://linux-a11y.org/index.php?page=fenrir-screenreader
- install = fenrir.install
arch = any
license = LGPL
makedepends = python-setuptools
@@ -26,11 +25,9 @@ pkgbase = fenrir
provides = fenrir
conflicts = fenrir
backup = etc/fenrirscreenreader/settings/settings.conf
- source = https://files.pythonhosted.org/packages/source/f/fenrir-screenreader/fenrir-screenreader-1.9.3.post1.tar.gz
- source = fenrir.install
+ source = https://github.com/chrys87/fenrir/archive/1.9.3.tar.gz
source = fenrirscreenreader.service
- md5sums = 5852a79aa71a3ef4e86448878743d299
- md5sums = c6a68679e6f1a23d4054d0209ba5210a
+ md5sums = 59aefa92a2f870d6da26024d960f4e53
md5sums = 0c2d1bd344b53d1fa5de6c49455b5a4f
pkgname = fenrir
diff --git a/PKGBUILD b/PKGBUILD
index 637de99f331e..60941a47996d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Chrys <chrys@linux-a11y.org>
pkgname='fenrir'
-pkgver=1.9.3.post1
+pkgver=1.9.3
pkgrel=1
pkgdesc='A user space console screen reader written in python3'
arch=('any')
@@ -21,18 +21,15 @@ makedepends=('python-setuptools')
provides=('fenrir')
conflicts=('fenrir')
backup=('etc/fenrirscreenreader/settings/settings.conf')
-install="$pkgname".install
-source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}-screenreader/${pkgname}-screenreader-${pkgver}.tar.gz"
- 'fenrir.install'
+source=("https://github.com/chrys87/${pkgname}/archive/${pkgver}.tar.gz"
'fenrirscreenreader.service')
-md5sums=('5852a79aa71a3ef4e86448878743d299'
- 'c6a68679e6f1a23d4054d0209ba5210a'
+md5sums=('59aefa92a2f870d6da26024d960f4e53'
'0c2d1bd344b53d1fa5de6c49455b5a4f')
package() {
install -d "$pkgdir/usr/lib/systemd/system/"
install -Dm644 fenrirscreenreader.service "$pkgdir/usr/lib/systemd/system/fenrirscreenreader.service"
-cd "${srcdir}/${pkgname}-screenreader-${pkgver}"
+cd "${srcdir}/${pkgname}-${pkgver}"
python setup.py install --force-settings --root="${pkgdir}/" --optimize=1
}
diff --git a/fenrir.install b/fenrir.install
deleted file mode 100644
index 417cab50d0d1..000000000000
--- a/fenrir.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pre_upgrade() {
- if [[ -d /etc/fenrir ]]; then
- [[ -d /etc/fenrirscreenreader ]] || cp -r /etc/fenrir /etc/fenrirscreenreader
- echo "Fenrir's settings directory is now located at /etc/fenrirscreenreader. Your settings have been copied over to the new location. You can remove the old /etc/fenrir directory when you are sure you no longer need it."
- fi
-}
-
-post_install() {
-_alert
-}
-
-post_upgrade() {
-_alert
-}
-
-_alert() {
-fold -s << EOF
-To have fenrir start at boot:
-sudo systemctl enable fenrir
-Pulseaudio users may want to run
-/usr/share/fenrir/tools/configure_pulse.sh
-once as their user account and once as root.
-EOF
-}