[arch-commits] Commit in lm_sensors/trunk (5 files)

[Eric Bélanger]

    Date: Sunday, May 12, 2013 @ 08:51:48
  Author: eric
Revision: 185202

upgpkg: lm_sensors 3.3.3-3

Move binaries in /usr/sbin to /usr/bin

Modified:
  lm_sensors/trunk/PKGBUILD
  lm_sensors/trunk/fancontrol.service
  lm_sensors/trunk/healthd
  lm_sensors/trunk/healthd.service
  lm_sensors/trunk/sensord.service

--------------------+
 PKGBUILD           |   26 +++++++++++++++-----------
 fancontrol.service |    2 +-
 healthd            |    2 +-
 healthd.service    |    2 +-
 sensord.service    |    2 +-
 5 files changed, 19 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 06:37:28 UTC (rev 185201)
+++ PKGBUILD	2013-05-12 06:51:48 UTC (rev 185202)
@@ -3,7 +3,7 @@
 
 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 @@
 	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 at 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"

Modified: fancontrol.service
===================================================================
--- fancontrol.service	2013-05-12 06:37:28 UTC (rev 185201)
+++ fancontrol.service	2013-05-12 06:51:48 UTC (rev 185202)
@@ -3,7 +3,7 @@
 
 [Service]
 PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/sbin/fancontrol
+ExecStart=/usr/bin/fancontrol
 
 [Install]
 WantedBy=multi-user.target

Modified: healthd
===================================================================
--- healthd	2013-05-12 06:37:28 UTC (rev 185201)
+++ healthd	2013-05-12 06:51:48 UTC (rev 185202)
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# /usr/sbin/healthd
+# /usr/bin/healthd
 #
 
 . /etc/healthd.conf

Modified: healthd.service
===================================================================
--- healthd.service	2013-05-12 06:37:28 UTC (rev 185201)
+++ healthd.service	2013-05-12 06:51:48 UTC (rev 185202)
@@ -3,7 +3,7 @@
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/healthd
+ExecStart=/usr/bin/healthd
 
 [Install]
 WantedBy=multi-user.target

Modified: sensord.service
===================================================================
--- sensord.service	2013-05-12 06:37:28 UTC (rev 185201)
+++ sensord.service	2013-05-12 06:51:48 UTC (rev 185202)
@@ -3,7 +3,7 @@
 
 [Service]
 PIDFile=/var/run/sensord.pid
-ExecStart=/usr/sbin/sensord
+ExecStart=/usr/bin/sensord
 
 [Install]
 WantedBy=multi-user.target