[arch-commits] Commit in matrix-appservice-irc/trunk (2 files)

[David Runge via arch-commits]

    Date: Tuesday, October 19, 2021 @ 10:18:56
  Author: dvzrv
Revision: 1030951

upgpkg: matrix-appservice-irc 0.32.0-1: Upgrade to 0.32.0.

Remove modifications for configuration file and installation of 
provisioning.rules file.
It is now part of the main configuration.

Add an .install file to warn about the merged configuration.

Added:
  matrix-appservice-irc/trunk/matrix-appservice-irc.install
Modified:
  matrix-appservice-irc/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   12 ++++--------
 matrix-appservice-irc.install |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2021-10-19 10:04:16 UTC (rev 1030950)
+++ PKGBUILD    2021-10-19 10:18:56 UTC (rev 1030951)
@@ -2,7 +2,7 @@
 # Contributor: Bruno Pagani <archa...@archlinux.org>
 
 pkgname=matrix-appservice-irc
-pkgver=0.31.0
+pkgver=0.32.0
 pkgrel=1
 pkgdesc="Node.js IRC bridge for Matrix"
 arch=('x86_64')
@@ -14,17 +14,17 @@
             'python-requests: for grant-ops-in-room.py, migrate-users.py, 
remove-idle-users.py and remove-user.py'
             'python-yaml: for grant-ops-in-room.py, migrate-users.py and 
remove-user.py')
 backup=("etc/${pkgname}/config.yaml"
-        "etc/${pkgname}/provisioning.rules.yaml"
         "etc/${pkgname}/registration.yaml")
+install="${pkgname}.install"
 
source=("https://github.com/matrix-org/matrix-appservice-irc/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz";
         "${pkgname}.service"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles")
-sha512sums=('4c32f5fe033b344399ca29a5d435445f6669ee6108658ebb31584e122cbd11cf698f8c5760f12b66c92d985a36bb4d998fda380ee576a8df8c0615f5e0e4f154'
+sha512sums=('aea53f69e07df4876e62f785278dcd3f3feb13af0413985df629fabab61dd105eab1f85ec4654e2691d7ae4057e1fda07b5b1e0e37626dde06cf97be7e5928fc'
             
'f1d1351a554f68537c7fc5771dddc0267a1f19d214bef935faca7b161d611145e3c127c77ae4eefc10c002a2f2f7a8d90e353b0e526ab83a9666d7d457fc449c'
             
'f615e5da11be8d834d6f48f064a65a9b7aa129d255be7865a171522d5aed921eb549a33661ab2c4fff4625d2ca5a7f9c43be95c188e7a77bdde4062aa3983edd'
             
'60b7afdd68aaf2c8e47caf10efefb6c4dc54f40d187ad495a604786b30c00dac7e5c77a7b596d86c2a62a7cdbe3727e11f75494f86d26c9fc51ea7a1bf6ab7f0')
-b2sums=('2b4fa7d371dd66e7ec52a6050816b0f3e578c1f3ad259a6cdf894a9bcc2b55fc2d511c6f29682c33e3938e2bef79cf55850e20c1b8a4efe8bb625416bea25b54'
+b2sums=('64a4ce34f3efc4cd6259abc7ee08934cf1794b203ad815c751c52b2efc46711fb0dec21a6d740fb8e43592e11843b6bcf6e334679921930a99ee45f5e56431f0'
         
'6010949756e816ca0fe9f9d6d119ec2085f34ec214111c0d55b6f0f90f1fccca23431c6ac485d29bf6ec723a3e6fa04150316fef67ea554254e994176078487a'
         
'cbfe3cdb07707b79ae438936927f06ac4e92669b0b7dd35a9d228aae3cc821e3a50a2cc1627f7959147e329e617247f4002a267bc8630819946e8083a39b8895'
         
'2dbbf14f82d88418470f848a2d11c0feacb257026382513c2fa02ad7f605f47e4cc5e9bf05668da383a596bc81450e468288863cdbdde9f7c16b02561f0114a7')
@@ -31,8 +31,6 @@
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-  sed -e 
"s|./provisioning.rules.yaml|/etc/${pkgname}/provisioning.rules.yaml|" \
-      -i config.sample.yaml
   touch registration.yaml
 }
 
@@ -109,8 +107,6 @@
   cp -av {lib,node_modules,app.js,config.schema.yml} 
"${pkgdir}/usr/lib/node_modules/${pkgname}/"
   # configuration
   install -vDm 640 config.sample.yaml "${pkgdir}/etc/${pkgname}/config.yaml"
-  install -vDm 640 provisioning.rules.sample.yaml \
-    "${pkgdir}/etc/${pkgname}/provisioning.rules.yaml"
   install -vDm 640 registration.yaml \
     -t "${pkgdir}/etc/${pkgname}/"
   # service

Added: matrix-appservice-irc.install
===================================================================
--- matrix-appservice-irc.install                               (rev 0)
+++ matrix-appservice-irc.install       2021-10-19 10:18:56 UTC (rev 1030951)
@@ -0,0 +1,38 @@
+
+# This is a default template for a post-install scriptlet.
+# Uncomment only required functions and remove any functions
+# you don't need (and this header).
+
+## arg 1:  the new package version
+#pre_install() {
+  # do something here
+#}
+
+## arg 1:  the new package version
+#post_install() {
+  # do something here
+#}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+#pre_upgrade() {
+  # do something here
+#}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if (( $(vercmp "$2" '0.32.0-1') < 0 )); then
+    printf "WARNING: The configuration in 
/etc/matrix-appservice-irc/provisioning.rules.yaml is now part of 
/etc/matrix-appservice-irc/config.yaml\n"
+  fi
+}
+
+## arg 1:  the old package version
+#pre_remove() {
+  # do something here
+#}
+
+## arg 1:  the old package version
+#post_remove() {
+  # do something here
+#}