[arch-commits] Commit in lm_sensors/trunk (PKGBUILD linux_3.0.patch)

[Eric Bélanger]

    Date: Tuesday, August 2, 2011 @ 16:34:25
  Author: eric
Revision: 134304

upgpkg: lm_sensors 3.3.1-2
Add systemd config file (close FS#25251), Fix kernel version check (close FS#25359)

Added:
  lm_sensors/trunk/linux_3.0.patch
Modified:
  lm_sensors/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   14 +++++++++-----
 linux_3.0.patch |   11 +++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-02 19:52:44 UTC (rev 134303)
+++ PKGBUILD	2011-08-02 20:34:25 UTC (rev 134304)
@@ -3,7 +3,7 @@
 
 pkgname=lm_sensors
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('i686' 'x86_64')
 url="http://www.lm-sensors.org/"
@@ -15,7 +15,7 @@
 options=('!emptydirs')
 source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
 	sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
-        sensord.rc daemonarg.patch)
+        sensord.rc daemonarg.patch linux_3.0.patch)
 md5sums=('8c0eebda8524fc87da1393b4564d279b'
          'c370f5e620bfe41113354a1e22c0c18c'
          '232bedf043dd5dedde82df1a399c682c'
@@ -24,7 +24,8 @@
          '970408d2e509dc4138927020efefe323'
          '96a8dd468e81d455ec9b165bdf33e0b7'
          '41a5c20854bbff00ea7174bd2276b736'
-         '40c8eb16af8249a0f1d851fc1057ea15')
+         '40c8eb16af8249a0f1d851fc1057ea15'
+         '5c1be382963145f7191d9c4e45ca9f67')
 sha1sums=('cb819e5a93adb36ef00e6d3c5363f5f474efa78a'
           'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
           'a068ac0a3115a6191a487e11422506baa922b40a'
@@ -33,13 +34,15 @@
           'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f'
           'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
           '72a60251d1d55a67307dab4105d9f3f01a080af4'
-          '34241388c4001bfb6e49b7e10da1217e29a258d6')
+          '34241388c4001bfb6e49b7e10da1217e29a258d6'
+          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
-         -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/detect/sensors-detect
+         -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service}
   patch -p1 < ../daemonarg.patch
+  patch -p0 < ../linux_3.0.patch
   make PREFIX=/usr
 }
 
@@ -47,6 +50,7 @@
   cd "${srcdir}/${pkgname}-${pkgver}"
   make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
     PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
+  install -D -m644 prog/init/lm_sensors.service "${pkgdir}/lib/systemd/system/lm_sensors.service"
   install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
   install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
   install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"

Added: linux_3.0.patch
===================================================================
--- linux_3.0.patch	                        (rev 0)
+++ linux_3.0.patch	2011-08-02 20:34:25 UTC (rev 134304)
@@ -0,0 +1,11 @@
+--- prog/detect/sensors-detect	2011-08-02 10:23:46.000000000 +0200
++++ prog/detect/sensors-detect	2011-08-02 10:24:04.000000000 +0200
+@@ -2472,7 +2472,7 @@
+ 
+ sub initialize_kernel_version
+ {
+-	`uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
++	`uname -r` =~ /(\d+)\.(\d+)(.*)/;
+ 	@kernel_version = ($1, $2, $3, $4);
+ 	chomp($kernel_arch = `uname -m`);
+