[arch-commits] Commit in jmc/trunk (PKGBUILD jmc.install jmc.rc jmc.service)

[Sergej Pupykin]

    Date: Monday, January 29, 2018 @ 16:01:58
  Author: spupykin
Revision: 287796

upgpkg: jmc 0.3rc3-1

Modified:
  jmc/trunk/PKGBUILD
  jmc/trunk/jmc.install
  jmc/trunk/jmc.service
Deleted:
  jmc/trunk/jmc.rc

-------------+
 PKGBUILD    |   31 +++++++++++++------------------
 jmc.install |    4 ++--
 jmc.rc      |   53 -----------------------------------------------------
 jmc.service |    7 ++++---
 4 files changed, 19 insertions(+), 76 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-29 16:01:34 UTC (rev 287795)
+++ PKGBUILD	2018-01-29 16:01:58 UTC (rev 287796)
@@ -3,30 +3,25 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=jmc
-pkgver=0.2.3
-pkgrel=8
+pkgver=0.3rc3
+pkgrel=1
+_commit=8db8619603afa408d47078112106a64e0c3e9f9b
 pkgdesc="jabber mail component"
 arch=(any)
-url="http://people.happycoders.org/dax/projects/jmc"
+url="https://github.com/dax/jmc"
 license=("GPL")
-backup=(etc/ejabberd/jmc.xml)
-depends=(python2 python2-pyxmpp)
+backup=(etc/jabber/jmc.conf)
+depends=('python2' 'python2-pyxmpp' 'jcl')
+makedepends=('git' 'python2-setuptools')
 install=jmc.install
-source=(http://people.happycoders.org/dax/projects/release/jmc/0.2/jmc-$pkgver.tar.gz
+source=("git+https://github.com/dax/jmc.git#commit=${_commit}"
 	jmc.service)
-md5sums=('89dcd54e19842619000d447bfaceb8ab'
-         'eee9affe33a8e27e4d0aafffeff56cb0')
+sha256sums=('SKIP'
+            '93770f067647182d917df0206f8a6a47ab26bad009a5388bc1e3a240318c59f1')
 
 package() {
-  cd "$srcdir"
-
-  install -D -m0644 ./jmc-$pkgver/jmc.xml "$pkgdir"/etc/ejabberd/jmc.xml
-  rm -f ./jmc-$pkgver/jmc.xml
-
-  install -d -m0755 "$pkgdir"/usr/lib
-  cp -r jmc-$pkgver/src "$pkgdir"/usr/lib
-  mv "$pkgdir"/usr/lib/src "$pkgdir"/usr/lib/jmc
-
-  install -dm0755 "$pkgdir"/var/spool/ejabberd/jmc
+  cd "$srcdir/jmc"
+  python2 setup.py install --root="$pkgdir"
+  install -dm0755 "$pkgdir"/var/spool/jabber
   install -Dm0644 "$srcdir"/jmc.service "$pkgdir"/usr/lib/systemd/system/jmc.service
 }

Modified: jmc.install
===================================================================
--- jmc.install	2018-01-29 16:01:34 UTC (rev 287795)
+++ jmc.install	2018-01-29 16:01:58 UTC (rev 287796)
@@ -1,7 +1,7 @@
 post_install() {
-    chown -R ejabberd.jabber /var/spool/ejabberd
+    chown -R jabber.jabber /var/spool/jabber
 }
 
 post_upgrade() {
-    chown -R ejabberd.jabber /var/spool/ejabberd
+    chown -R jabber.jabber /var/spool/jabber
 }

Deleted: jmc.rc
===================================================================
--- jmc.rc	2018-01-29 16:01:34 UTC (rev 287795)
+++ jmc.rc	2018-01-29 16:01:58 UTC (rev 287796)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	[ -f /var/run/jmc.pid ] && echo `cat /var/run/jmc.pid`
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting jabber mail component daemon"
-
-    [ -f /var/run/jmc.pid ] && rm -f /var/run/jmc.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-      cd /usr/lib/jmc && python2 jmc.py -c /etc/ejabberd/jmc.xml 1>>/var/log/ejabberd/jmc1.log 2>>/var/log/ejabberd/jmc2.log &
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        add_daemon jmc
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping jabber mail component daemon"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/jmc.pid &> /dev/null
-      rm_daemon jmc
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

Modified: jmc.service
===================================================================
--- jmc.service	2018-01-29 16:01:34 UTC (rev 287795)
+++ jmc.service	2018-01-29 16:01:58 UTC (rev 287796)
@@ -3,8 +3,9 @@
 
 [Service]
 Type=simple
-PIDFile=/var/run/jmc.pid
-ExecStart=python2 /usr/lib/jmc/jmc.py -c /etc/ejabberd/jmc.xml
+User=jabber
+PIDFile=/run/jmc.pid
+ExecStart=/usr/bin/jmc
 
 [Install]
-WantedBy=bluetooth.target
+WantedBy=multi-user.target