[arch-commits] Commit in lm_sensors/trunk (PKGBUILD fancontrol.rc)

[Daniel Griffiths]

    Date: Monday, May 10, 2010 @ 16:33:30
  Author: dgriffiths
Revision: 80064

FS#18177

Modified:
  lm_sensors/trunk/PKGBUILD
  lm_sensors/trunk/fancontrol.rc

---------------+
 PKGBUILD      |   15 +++++++++------
 fancontrol.rc |    4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-10 19:54:19 UTC (rev 80063)
+++ PKGBUILD	2010-05-10 20:33:30 UTC (rev 80064)
@@ -4,7 +4,7 @@
 
 pkgname=lm_sensors
 pkgver=3.1.2
-pkgrel=1
+pkgrel=3
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('i686' 'x86_64')
 url="http://www.lm-sensors.org/"
@@ -15,17 +15,17 @@
 install=sensors.install
 source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
 	sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc \
-        sensord.conf sensord.rc)
+        sensord.conf sensord.rc daemonarg.patch)
 md5sums=('58a9a225808ac4587c4c8cbd12b40b5c' 'c370f5e620bfe41113354a1e22c0c18c'\
-         '1e04aad66debdb72557b4528bf79b742' '47c40b381d1f25d6634ae84cecf35f33'\
+         '232bedf043dd5dedde82df1a399c682c' '47c40b381d1f25d6634ae84cecf35f33'\
          '6549050897c237514aeaa2bb6cfd29ea' 'f649261f52bd4329347bf93f5f83cb0a'\
          '970408d2e509dc4138927020efefe323' '96a8dd468e81d455ec9b165bdf33e0b7'\
-         '41a5c20854bbff00ea7174bd2276b736')
+         '41a5c20854bbff00ea7174bd2276b736' '9e42cc9ccab264b467ed4c843c27d4a3')
 sha1sums=('4a3b13e4f9c18c29e7f853739bdd88ca7799fcc7' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'\
-         '66f3cdde688127f4e4e81b5ec3c180149b5c36ea' '47095a32a918d6be50bd8daa8aaa9c24940d60e9'\
+         'a068ac0a3115a6191a487e11422506baa922b40a' '47095a32a918d6be50bd8daa8aaa9c24940d60e9'\
          '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' 'c6ddfebc20685ba69700f66038c6b00a7c0bdb80'\
          'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8'\
-         '72a60251d1d55a67307dab4105d9f3f01a080af4')
+         '72a60251d1d55a67307dab4105d9f3f01a080af4' '54d5f74b5f9dce5205daae702d6c12b34f7305e5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -41,4 +41,7 @@
   install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" || return 1
   install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" || return 1
   install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" || return 1
+
+  cd ${pkgdir}
+  patch -p1 < ${srcdir}/daemonarg.patch || return 1
 }

Modified: fancontrol.rc
===================================================================
--- fancontrol.rc	2010-05-10 19:54:19 UTC (rev 80063)
+++ fancontrol.rc	2010-05-10 20:33:30 UTC (rev 80064)
@@ -7,8 +7,8 @@
 case "$1" in
   start)
     stat_busy "Starting fancontrol"
-    [ -z "$PID" ] && /usr/sbin/fancontrol >/dev/null 2>&1 &
-    if [ $? -gt 0 ]; then
+    [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null
+    if [ $? -gt 0 -o -n "$PID" ]; then
       stat_fail
     else
       add_daemon fancontrol