aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbobpaul2020-04-11 17:06:35 -0500
committerbobpaul2020-04-11 17:06:35 -0500
commit38d1c1b161db200514d264e22a434a4c12016fcb (patch)
tree9662dee73eff75a19238ffc1874a630f936874f6
parent5bffd9d64dd6a1f7b7227a353d08bdd0e1d619a4 (diff)
downloadaur-38d1c1b161db200514d264e22a434a4c12016fcb.tar.gz
Updated for r61.9f5d965
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rw-r--r--mautrix-hangouts.service3
-rw-r--r--usr-share.patch10
4 files changed, 14 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e932d891e66a..ded6e4248636 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mautrix-hangouts-git
pkgdesc = A Matrix-Hangouts puppeting bridge with multi-user support
- pkgver = r49.1241db9
- pkgrel = 2
+ pkgver = r61.9f5d965
+ pkgrel = 1
arch = any
license = AGPLv3
makedepends = git
@@ -24,12 +24,12 @@ pkgbase = mautrix-hangouts-git
source = tmpfiles-mautrix-hangouts.conf
source = mautrix-hangouts.service
sha256sums = SKIP
- sha256sums = 627acf28bc80600abb3c0ddf4b0ed563bd77814687c96afabaf1779a55c335d9
+ sha256sums = ab5f4cb4d1f8d4c2199dd3f1499712abeed26ac65f3696dec9fb3ed5108da300
sha256sums = eefb2404ecc09eb1484ff3fb73986c9a44d92c5ae729e41269f82148b4299160
sha256sums = 918d04d07223c83324e18f44fc181abaadc49b747de76a9bcfd48e6bdda6bd05
sha256sums = 36aee765d66afa89778962432660ff49f711bf6982758e0c572d760568555758
sha256sums = e078d74a16e9cbf8b7f6426274256e72f84ab34ed29c240cce3249985fb566da
- sha256sums = 6cef4d60dbe05b92c8d5a2353de3e3ea8b3b34a25aad27c0b985f62e8942e833
+ sha256sums = 6029e541b610e8fe05463749a9f44490d796e0ccf752ccedbaa6d6430672ca64
pkgname = mautrix-hangouts-git
diff --git a/PKGBUILD b/PKGBUILD
index 887f90c9fec2..fef04c4c313e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
_pkgbase=mautrix-hangouts
pkgname=${_pkgbase}-git
-pkgver=r49.1241db9
-pkgrel=2
+pkgver=r61.9f5d965
+pkgrel=0
pkgdesc="A Matrix-Hangouts puppeting bridge with multi-user support"
arch=(any)
conflicts=(mautrix-hangouts)
@@ -29,12 +29,12 @@ source=("${_pkgbase}::git+https://github.com/tulir/${_pkgbase}"
"tmpfiles-mautrix-hangouts.conf"
"${_pkgbase}.service")
sha256sums=('SKIP'
- '627acf28bc80600abb3c0ddf4b0ed563bd77814687c96afabaf1779a55c335d9'
+ 'ab5f4cb4d1f8d4c2199dd3f1499712abeed26ac65f3696dec9fb3ed5108da300'
'eefb2404ecc09eb1484ff3fb73986c9a44d92c5ae729e41269f82148b4299160'
'918d04d07223c83324e18f44fc181abaadc49b747de76a9bcfd48e6bdda6bd05'
'36aee765d66afa89778962432660ff49f711bf6982758e0c572d760568555758'
'e078d74a16e9cbf8b7f6426274256e72f84ab34ed29c240cce3249985fb566da'
- '6cef4d60dbe05b92c8d5a2353de3e3ea8b3b34a25aad27c0b985f62e8942e833')
+ '6029e541b610e8fe05463749a9f44490d796e0ccf752ccedbaa6d6430672ca64')
pkgver() {
cd "$srcdir/${_pkgbase}"
diff --git a/mautrix-hangouts.service b/mautrix-hangouts.service
index 3bafd9e4974e..a798e358baa0 100644
--- a/mautrix-hangouts.service
+++ b/mautrix-hangouts.service
@@ -9,8 +9,7 @@ User=mautrix-hangouts
Group=mautrix-hangouts
WorkingDirectory=/var/lib/mautrix-hangouts/
ExecStart=/usr/bin/mautrix-hangouts -c /etc/synapse/mautrix-hangouts/config.yaml \
- -r /etc/synapse/mautrix-hangouts/registration.yaml \
- -b /usr/share/mautrix-hangouts/example-config.yaml
+ -r /etc/synapse/mautrix-hangouts/registration.yaml
Restart=always
RestartSec=3
diff --git a/usr-share.patch b/usr-share.patch
index c4aeb42153dd..6175f5e8a73b 100644
--- a/usr-share.patch
+++ b/usr-share.patch
@@ -1,15 +1,15 @@
diff --git a/setup.py b/setup.py
-index cd47505..50faa3e 100644
+index 149b5a0..06ae8ea 100644
--- a/setup.py
+++ b/setup.py
-@@ -61,8 +61,8 @@ setuptools.setup(
- "web/static/*.png", "web/static/*.css", "web/static/*.html", "web/static/*.js",
+@@ -70,8 +70,8 @@ setuptools.setup(
+ "example-config.yaml"
]},
data_files=[
-- (".", ["example-config.yaml", "alembic.ini"]),
+- (".", ["alembic.ini"]),
- ("alembic", ["alembic/env.py"]),
- ("alembic/versions", glob.glob("alembic/versions/*.py"))
-+ ("./share/mautrix-hangouts", ["example-config.yaml", "alembic.ini"]),
++ ("./share/mautrix-hangouts", ["alembic.ini"]),
+ ("./share/mautrix-hangouts/alembic", ["alembic/env.py"]),
+ ("./share/mautrix-hangouts/alembic/versions", glob.glob("alembic/versions/*.py"))
],