[arch-commits] Commit in apcupsd/trunk (PKGBUILD apcupsd)

[Sergej Pupykin]

    Date: Monday, May 13, 2013 @ 16:17:29
  Author: spupykin
Revision: 90644

upgpkg: apcupsd 3.14.10-4

upd

Modified:
  apcupsd/trunk/PKGBUILD
Deleted:
  apcupsd/trunk/apcupsd

----------+
 PKGBUILD |    9 +++++----
 apcupsd  |   39 ---------------------------------------
 2 files changed, 5 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 14:17:25 UTC (rev 90643)
+++ PKGBUILD	2013-05-13 14:17:29 UTC (rev 90644)
@@ -5,7 +5,7 @@
 
 pkgname=apcupsd
 pkgver=3.14.10
-pkgrel=3
+pkgrel=4
 pkgdesc="Power mangement and controlling most of APC's UPS models"
 arch=(i686 x86_64)
 url="http://www.apcupsd.org"
@@ -14,17 +14,19 @@
 optdepends=('gd: for CGI'
             'gconf: for frontend'
             'gtk2: for frontend')
-makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2')
+makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2' 'systemd-sysvcompat')
 backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf
         etc/apcupsd/multimon.conf)
 source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
-        apcupsd
         apcupsd.service
         apcupsd-tmpfiles.conf)
 sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
             'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a'
             'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d'
             'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
+sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
+            'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d'
+            'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -39,7 +41,6 @@
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
-	install -Dm755 "$srcdir/apcupsd" "$pkgdir/etc/rc.d/apcupsd"
 	install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service"
 	install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
 	chmod 755 "$pkgdir"/sbin/*

Deleted: apcupsd
===================================================================
--- apcupsd	2013-05-13 14:17:25 UTC (rev 90643)
+++ apcupsd	2013-05-13 14:17:29 UTC (rev 90644)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /sbin/apcupsd`
-case "$1" in
-  start)
-    stat_busy "Starting APCUPSD Daemon"
-    [ -z "$PID" ] && /sbin/apcupsd -f /etc/apcupsd/apcupsd.conf
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon apcupsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping APCUPSD Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon apcupsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  status)
-    /sbin/apcaccess status
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-exit 0