[arch-commits] Commit in xfce4-sensors-plugin/trunk (2 files)

[Evangelos Foutras]

    Date: Sunday, February 26, 2012 @ 16:47:10
  Author: foutrelis
Revision: 151506

upgpkg: xfce4-sensors-plugin 1.2.3-4

Trick xfce4-sensors into thinking the hddtemp daemon is running during build; add warning message about the hddtemp daemon.

Modified:
  xfce4-sensors-plugin/trunk/PKGBUILD
  xfce4-sensors-plugin/trunk/xfce4-sensors-plugin.install

------------------------------+
 PKGBUILD                     |   15 +++++++++------
 xfce4-sensors-plugin.install |   18 +++++++++++++++---
 2 files changed, 24 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-26 21:44:47 UTC (rev 151505)
+++ PKGBUILD	2012-02-26 21:47:10 UTC (rev 151506)
@@ -4,23 +4,26 @@
 
 pkgname=xfce4-sensors-plugin
 pkgver=1.2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A lm_sensors plugin for the Xfce panel"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'lm_sensors' 'libnotify' 'hicolor-icon-theme')
-makedepends=('intltool' 'hddtemp' 'gnu-netcat' 'xfce4-dev-tools')
-optdepends=('gnu-netcat: for hddtemp access')
-options=('!libtool' '!makeflags')
-install=${pkgname}.install
+depends=('xfce4-panel' 'lm_sensors' 'libnotify' 'hddtemp' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnu-netcat')
+options=('!libtool')
+install=$pkgname.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.2/$pkgname-$pkgver.tar.bz2)
 sha256sums=('3dd27348f7b38b55e53aa8d851cdb80e090b8830ca9e705bf32641679f08d326')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Satisfy the check that hddtemp is queryable via netcat
+  # (https://bugs.archlinux.org/task/28275)
+  echo ohai | nc -l -p 7634 -s localhost -c &
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \

Modified: xfce4-sensors-plugin.install
===================================================================
--- xfce4-sensors-plugin.install	2012-02-26 21:44:47 UTC (rev 151505)
+++ xfce4-sensors-plugin.install	2012-02-26 21:47:10 UTC (rev 151506)
@@ -1,13 +1,25 @@
-post_install() {
+post_common() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
+post_install() {
+  post_common
+
+  echo '> Make sure the hddtemp daemon is running, otherwise xfce4-sensors will'
+  echo '> crash on start.'
+}
+
 post_upgrade() {
-  post_install
+  post_common
+
+  if (($(vercmp $2 1.2.3-4) < 0)); then
+    echo '> Make sure the hddtemp daemon is running, otherwise xfce4-sensors will'
+    echo '> crash on start.'
+  fi
 }
 
 post_remove() {
-  post_install
+  post_common
 }
 
 # vim:set ts=2 sw=2 et: