increment pkgrel to 3; obelisk

1 files changed, 16 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f5bd9c1783e9..5a1e94e8608f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=libbitcoin-server
 pkgver=3.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Bitcoin Full Node and Query Server"
 arch=('i686' 'x86_64')
 depends=('boost'
@@ -26,20 +26,20 @@ makedepends=('autoconf'
              'make'
              'pkg-config')
 optdepends=('libbitcoin-explorer: CurveZMQ client/server authentication')
-groups=('libbitcoin')
+groups=('libbitcoin' 'obelisk')
 url="https://github.com/libbitcoin/libbitcoin-server"
 license=('AGPL3')
 source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/libbitcoin/$pkgname/tar.gz/v$pkgver
         git+https://github.com/libbitcoin/libbitcoin-server.wiki
         bs.logrotate
-        bs.service
-        bsinit.service)
+        bs-init.service
+        bs.service)
 sha256sums=('bb97de5100b7a49b2c55817cf9431777535d0f95f90a80238356a5bcb86c1203'
             'SKIP'
-            '09ea3d2bf7cb87a0760c2a73893d62d1868d232c9e925cabf6140b1b031efee3'
-            '564112d0860f1523049bd89779e1b1bfc189a3d143d2cc808441981ed793658a'
-            '2bcf3615cd8e5ba6d4c78429b018b9bf756d5fad6ab879963a13f19e47315c7d')
-backup=('etc/bs/bs.cfg'
+            'a2e4a1d6aaabcec9c57207a7e92b004c2dfa4a2d15c0ecfc05eefbf307783a49'
+            'f110eb59cdd18a8ad0a512604370f912e65b0525e8bb08b463af3e62a920b47d'
+            '9a9a2286d7c38df7e1942838a19b430e2af6d80324202a117c7ebe2acf50cc80')
+backup=('etc/obelisk/bs/bs.cfg'
         'etc/logrotate.d/bs')
 install=bs.install
 
@@ -49,11 +49,11 @@ prepare() {
   msg2 'Configuring...'
   cp -dpr --no-preserve=ownership data/bs.cfg data/bs.cfg.in
   sed -i \
-    -e 's@^directory.*@directory = /srv/bs/db@' \
-    -e 's@^debug_file.*@debug_file = /var/log/bs/debug.log@' \
-    -e 's@^error_file.*@error_file = /var/log/bs/error.log@' \
-    -e 's@^hosts_file.*@hosts_file = /etc/bs/hosts.cache@' \
-    -e 's@^archive_directory.*@archive_directory = /var/log/bs@' \
+    -e 's@^directory.*@directory = /srv/obelisk/db@' \
+    -e 's@^debug_file.*@debug_file = /var/log/obelisk/bs/debug.log@' \
+    -e 's@^error_file.*@error_file = /var/log/obelisk/bs/error.log@' \
+    -e 's@^hosts_file.*@hosts_file = /etc/obelisk/hosts.cache@' \
+    -e 's@^archive_directory.*@archive_directory = /var/log/obelisk/bs@' \
     data/bs.cfg.in
 }
 
@@ -88,8 +88,7 @@ package() {
   install -Dm 644 COPYING -t "$pkgdir/usr/share/licenses/libbitcoin-server"
 
   msg2 'Installing...'
-  install -dm 700 "$pkgdir/etc/bs"
-  install -dm 755 "$pkgdir/srv/bs"
+  install -dm 755 "$pkgdir/var/log/obelisk/bs"
   make DESTDIR="$pkgdir" install
 
   msg2 'Installing documentation...'
@@ -97,14 +96,13 @@ package() {
     "$pkgdir/usr/share/doc/libbitcoin-server/wiki"
 
   msg2 'Installing conf...'
-  install -Dm 600 data/bs.cfg.in "$pkgdir/etc/bs/bs.cfg"
+  install -Dm 600 data/bs.cfg.in "$pkgdir/etc/obelisk/bs/bs.cfg"
 
   msg2 'Installing systemd service files...'
-  install -Dm 644 "$srcdir/bsinit.service" -t "$pkgdir/usr/lib/systemd/system"
+  install -Dm 644 "$srcdir/bs-init.service" -t "$pkgdir/usr/lib/systemd/system"
   install -Dm 644 "$srcdir/bs.service" -t "$pkgdir/usr/lib/systemd/system"
 
   msg2 'Installing logrotate conf...'
-  install -dm 755 "$pkgdir/var/log/bs"
   install -Dm 644 "$srcdir/bs.logrotate" "$pkgdir/etc/logrotate.d/bs"
 
   msg2 'Cleaning up pkgdir...'