[arch-commits] Commit in mpdscribble/trunk (PKGBUILD rc.d service)

[bpiotrowski at nymeria.archlinux.org]

    Date: Wednesday, January 23, 2013 @ 21:52:12
  Author: bpiotrowski
Revision: 82752

upgpkg: mpdscribble 0.22-6

- remove sysvinit daemon
- start systemd unit the right way (FS#33484)

Modified:
  mpdscribble/trunk/PKGBUILD
  mpdscribble/trunk/service
Deleted:
  mpdscribble/trunk/rc.d

----------+
 PKGBUILD |   20 ++++++++------------
 rc.d     |   37 -------------------------------------
 service  |    5 +----
 3 files changed, 9 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-23 20:39:23 UTC (rev 82751)
+++ PKGBUILD	2013-01-23 20:52:12 UTC (rev 82752)
@@ -6,21 +6,20 @@
 
 pkgname=mpdscribble
 pkgver=0.22
-pkgrel=5
-pkgdesc='An mpd client which submits track info to last.fm'
+pkgrel=6
+pkgdesc='MPD client which submits track info to Last.fm'
 url='http://mpd.wikia.com/wiki/Client:Mpdscribble'
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libsoup' 'glib2' 'libmpdclient')
-install='mpdscribble.install'
+install=$pkgname.install
 source=(http://downloads.sourceforge.net/musicpd/mpdscribble-${pkgver}.tar.bz2
-        rc.d service)
-md5sums=('652ee927b797e9a4cef45494e77047db'
-         'f54c937c7b3ab8e4d39e4b903c2993fc'
-         '7e0a80c12225b0fe7be9c993f0079e95')
+        service)
+sha256sums=('1cde2b5f8c70f0e3e6f059d01bf0b0f2eac2b29fbcd14b01a8a5103e603feb41'
+            '8a6568235e8b2ac7535a6f99f4401450a4162bac0cacb938af2ec39a808e1132')
 
 build() {
-  cd mpdscribble-${pkgver}
+  cd mpdscribble-$pkgver
 
   ./configure \
     --prefix=/usr \
@@ -31,13 +30,10 @@
 }
 
 package() {
-  cd mpdscribble-${pkgver}
+  cd mpdscribble-$pkgver
 
   make DESTDIR="${pkgdir}" install
 
-  install -D "${srcdir}"/rc.d \
-    "${pkgdir}"/etc/rc.d/mpdscribble
-
   install -Dm644 "${srcdir}"/service \
     "${pkgdir}"/usr/lib/systemd/system/mpdscribble.service
 

Deleted: rc.d
===================================================================
--- rc.d	2013-01-23 20:39:23 UTC (rev 82751)
+++ rc.d	2013-01-23 20:52:12 UTC (rev 82752)
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mpdscribble`
-case "$1" in
-  start)
-    stat_busy "Starting mpdscribble"
-    [ -z "$PID" ] && /usr/bin/mpdscribble &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/mpdscribble.pid
-      add_daemon mpdscribble
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mpdscribble"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/mpdscribble.pid
-      rm_daemon mpdscribble
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac

Modified: service
===================================================================
--- service	2013-01-23 20:39:23 UTC (rev 82751)
+++ service	2013-01-23 20:52:12 UTC (rev 82752)
@@ -1,12 +1,9 @@
 [Unit]
 Description=last.fm updater for MPD
-Wants=mpd.service
 After=mpd.service
 
 [Service]
-Type=forking
-PIDFile=/run/mpdscribble.pid
-ExecStart=/usr/bin/mpdscribble --pidfile /run/mpdscribble.pid
+ExecStart=/usr/bin/mpdscribble --no-daemon
 
 [Install]
 WantedBy=multi-user.target