3 files changed, 10 insertions, 45 deletions
diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD
index 9e0adc01d..4e959e0fa 100644
--- a/community/mcelog/PKGBUILD
+++ b/community/mcelog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88089 2013-04-11 09:34:40Z spupykin $
+# $Id: PKGBUILD 91951 2013-05-30 09:42:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 # Maintainer: Thomas Mudrunka <harvie@@email..cz>
 
 pkgname=mcelog
-pkgver=20130411
+pkgver=20130530
 pkgrel=1
 pkgdesc="Print machine check event log from x86-64 kernel"
 url="http://freshmeat.net/projects/mcelog/"
@@ -14,11 +14,14 @@ makedepends=('git')
 options=('docs')
 backup=('etc/mcelog/mcelog.conf')
 source=("git://github.com/andikleen/mcelog.git"
-	"${pkgname}.rc"
 	"mcelog.service")
 md5sums=('SKIP'
-         'f039a77d7bde3518d3d695b144816e8a'
-         'b71eb82e532aed3918ebf6b30e158e7f')
+         'afd7fc2b7a2f92a75e040b23d6b15958')
+
+prepare() {
+  cd "${srcdir}/mcelog"
+  sed -i 's|sbin|bin|g' Makefile mcelog.cron
+}
 
 build() {
   cd "${srcdir}/mcelog"
@@ -29,8 +32,7 @@ package() {
   cd "${srcdir}/mcelog"
   mkdir -p $pkgdir/usr/share/doc/mcelog
   make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog
-  install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron"
-  install -Dm0755 "${srcdir}/mcelog.rc" "${pkgdir}/etc/rc.d/mcelog"
+  install -Dm0755 mcelog.cron "${pkgdir}/usr/bin/mcelog.cron"
   install -Dm0644 mcelog.logrotate "${pkgdir}/etc/logrotate.d/mcelog.logrotate"
   install -Dm0644 README "${pkgdir}/usr/share/doc/mcelog/README"
   install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
diff --git a/community/mcelog/mcelog.rc b/community/mcelog/mcelog.rc
deleted file mode 100644
index fb73743c7..000000000
--- a/community/mcelog/mcelog.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/mcelog`
-case "$1" in
-  start)
-    stat_busy "Starting mcelog"
-    if [ -z "$PID" ]; then
-       /usr/sbin/mcelog --daemon --pidfile /var/run/mcelog.pid
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mcelog
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mcelog"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mcelog
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service
index 35c18bc6f..9d6c84f40 100644
--- a/community/mcelog/mcelog.service
+++ b/community/mcelog/mcelog.service
@@ -4,7 +4,7 @@ After=syslog.target
 
 [Service]
 PIDFile=/run/mcelog.pid
-ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid
+ExecStart=/usr/bin/mcelog --ignorenodev --daemon --foreground --pidfile /run/mcelog.pid
 StandardOutput=syslog
 
 [Install]