thinkfan-0.9.2-1: updating version

5 files changed, 63 insertions, 65 deletions

diff --git a/pcr/thinkfan/PKGBUILD b/pcr/thinkfan/PKGBUILD
index c8bc49e0b..9af51d9c7 100644
--- a/pcr/thinkfan/PKGBUILD
+++ b/pcr/thinkfan/PKGBUILD
@@ -2,25 +2,36 @@
 # Contributor (Arch): Frederik Alkærsig (FALKER) <havnelisten AT gmail.com>
 
 pkgname=thinkfan
-pkgver=0.8.1
-pkgrel=3
+pkgver=0.9.2
+pkgrel=1
 pkgdesc="A minimalist fan control program. Supports the sysfs hwmon interface and thinkpad_acpi"
 arch=('i686' 'x86_64' 'mips64el')
+makedepends=('cmake')
+depends=('libatasmart')
 license=('GPL')
 source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        "thinkfan" "thinkfan.service")
+        "thinkfan.install" "thinkfan.service" "thinkpad_acpi.conf")
 url="http://thinkfan.sourceforge.net/"
-md5sums=('aaa6c88bab3b43756ac5a1638622828c'
-         '16fc3a83a1468e3ccaeba67e14ab2177'
-         '7639b82035fcee712753e05de6b0601d')
+install="thinkfan.install"
+md5sums=('4292633aebd61b91f04cd332c4d3e181'
+         '76553f63dc55a6e09a429bb4e28eb649'
+         '0197bde7c3d3b64d34635ead78cf3437'
+         'bca920d066846e5811a2465aefa13012')
 
 build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd ${srcdir}
+    cmake . -DCMAKE_INSTALL_PREFIX=/usr -DUSE_ATASMART:BOOL=ON
     make
-    install -D -m755 ${pkgname} ${pkgdir}/usr/sbin/${pkgname}
-    install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
+}
+
+package() {
+    cd ${srcdir}
+    install -D -m755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
+    install -D -m644 ${srcdir}/thinkpad_acpi.conf ${pkgdir}/usr/lib/modprobe.d/thinkpad_acpi.conf
     install -D -m644 README ${pkgdir}/usr/share/doc/${pkgname}/README
-    install -D -m644 ${srcdir}/thinkfan.service ${pkgdir}/usr/lib/systemd/system/thinkfan.service
+    install -D -m644 NEWS ${pkgdir}/usr/share/doc/${pkgname}/README
+    install -D -m644 ${srcdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service
+    install -D -m644 ${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1
     cp -r examples ${pkgdir}/usr/share/doc/${pkgname}/
 }
 
diff --git a/pcr/thinkfan/thinkfan b/pcr/thinkfan/thinkfan
deleted file mode 100644
index d37c81424..000000000
--- a/pcr/thinkfan/thinkfan
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-test -f /usr/sbin/thinkfan || exit 0
-
-case "$1" in
-  start)
-    stat_busy "Starting thinkfan"
-    /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon thinkfan
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping thinkfan"
-    PID=$(</var/run/thinkfan.pid)
-    kill $PID
-    rm -f /var/run/thinkfan.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon thinkfan
-      stat_done
-    fi
-    ;;
-  restart)
-    stat_busy "Restarting thinkfan"
-
-    PID=$(</var/run/thinkfan.pid)
-    kill $PID
-    rm -f /var/run/thinkfan.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-      rm_daemon thinkfan
-    else
-    /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1
-      if [ $? -gt 0 ]; then
-        stat_fail
-        rm_daemon thinkfan
-      else
-        stat_done
-      fi
-    fi
-    ;;
-  *)
-      echo "Usage: $0 {stop|start|restart}"
-    ;;
-esac
-exit 0
diff --git a/pcr/thinkfan/thinkfan.install b/pcr/thinkfan/thinkfan.install
new file mode 100644
index 000000000..ecf947a7d
--- /dev/null
+++ b/pcr/thinkfan/thinkfan.install
@@ -0,0 +1,40 @@
+# This is an install file for thinkfan package.
+
+_update() {
+    echo "Please configure thinkfan in: /etc/thinkfan.conf"
+    echo "Have a look at the examples in: /usr/share/doc/thinkfan/examples for details."
+}
+
+## arg 1:  the new package version
+pre_install() {
+  :
+}
+
+# arg 1:  the new package version
+post_install() {
+  _update
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_upgrade() {
+  :
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  _update
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  :
+}
+
+# arg 1:  the old package version
+post_remove() {
+  :
+}
+
+# vim:set ts=2 sw=2 noet:
diff --git a/pcr/thinkfan/thinkfan.service b/pcr/thinkfan/thinkfan.service
index 7895b8d3a..e7c8badd1 100644
--- a/pcr/thinkfan/thinkfan.service
+++ b/pcr/thinkfan/thinkfan.service
@@ -3,7 +3,7 @@ Description=Thinkfan Daemon - simple and lightweight fan control program
 After=basic.target
 
 [Service]
-ExecStart=/usr/sbin/thinkfan -n -s5 -q
+ExecStart=/usr/bin/thinkfan -n -s5 -q
 
 [Install]
 WantedBy=multi-user.target
diff --git a/pcr/thinkfan/thinkpad_acpi.conf b/pcr/thinkfan/thinkpad_acpi.conf
new file mode 100644
index 000000000..00e1014b8
--- /dev/null
+++ b/pcr/thinkfan/thinkpad_acpi.conf
@@ -0,0 +1 @@
+options thinkpad_acpi fan_control=1