Mon May 13 01:16:27 PDT 2013

5 files changed, 20 insertions, 16 deletions

diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index f79be1058..a75c633b5 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 181375 2013-04-04 00:53:02Z eric $
+# $Id: PKGBUILD 185203 2013-05-12 06:52:48Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lm_sensors
 pkgver=3.3.3
-pkgrel=2
+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/"
@@ -17,31 +17,35 @@ source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz
 	healthd healthd.conf fancontrol.service sensord.service healthd.service \
         linux_3.0.patch lm_sensors-fancontrol.patch)
 sha1sums=('b55c06f425993e42f13553f204066c446da36fd3'
-          '035a721f20e4ad568f4fdde2d7c25d906c192458'
-          'afaad558d2ad4732aa53b69afa23ccf37bc67ab1'
+          'SKIP'
+          '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
           '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
-          '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
-          'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51'
-          'a7a20eb3c799d70287e6c7968a7ab42165925293'
+          '73cd658f4a418197dc75f65d6d309701c72cfd81'
+          'cea1ff07374a784cc4be1d28dc6c80641fcae99d'
+          'd72ec328e9303acef86342483b6f8537de6117d9'
           '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
           'd3e419b4019451fb039ae3d3b8e0ec55121b9f17')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/{detect/sensors-detect,init/lm_sensors.service}
   sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect
   sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
   patch -p0 -i "${srcdir}/linux_3.0.patch"
   patch -p0 -i "${srcdir}/lm_sensors-fancontrol.patch"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   make PREFIX=/usr
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
-    PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
+    PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
   install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
-  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
+  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/bin/healthd"
   install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
   install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
   install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service"
diff --git a/extra/lm_sensors/fancontrol.service b/extra/lm_sensors/fancontrol.service
index c86b498f8..813dbd60d 100644
--- a/extra/lm_sensors/fancontrol.service
+++ b/extra/lm_sensors/fancontrol.service
@@ -3,7 +3,7 @@ Description=Fan control daemon
 
 [Service]
 PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/sbin/fancontrol
+ExecStart=/usr/bin/fancontrol
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/lm_sensors/healthd b/extra/lm_sensors/healthd
index 5ffed5681..b1e2fd699 100644
--- a/extra/lm_sensors/healthd
+++ b/extra/lm_sensors/healthd
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# /usr/sbin/healthd
+# /usr/bin/healthd
 #
 
 . /etc/healthd.conf
diff --git a/extra/lm_sensors/healthd.service b/extra/lm_sensors/healthd.service
index 59d3270b0..1933192d3 100644
--- a/extra/lm_sensors/healthd.service
+++ b/extra/lm_sensors/healthd.service
@@ -3,7 +3,7 @@ Description=A daemon which can be used to alert you in the event of a hardware h
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/healthd
+ExecStart=/usr/bin/healthd
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/lm_sensors/sensord.service b/extra/lm_sensors/sensord.service
index 6d272f1ef..1d62ab9e8 100644
--- a/extra/lm_sensors/sensord.service
+++ b/extra/lm_sensors/sensord.service
@@ -3,7 +3,7 @@ Description=Sensor information logging daemon
 
 [Service]
 PIDFile=/var/run/sensord.pid
-ExecStart=/usr/sbin/sensord
+ExecStart=/usr/bin/sensord
 
 [Install]
 WantedBy=multi-user.target