[arch-commits] Commit in xfce4-sensors-plugin/repos (3 files)

[Eric Bélanger]

    Date: Wednesday, November 12, 2008 @ 22:05:18
  Author: eric
Revision: 18974

fixed svn conflict

Modified:
  xfce4-sensors-plugin/repos/extra-i686/	(properties)
  xfce4-sensors-plugin/repos/extra-i686/PKGBUILD
  xfce4-sensors-plugin/repos/extra-i686/xfce4-sensors-plugin.install

------------------------------+
 PKGBUILD                     |   22 +++++++++-------------
 xfce4-sensors-plugin.install |    7 +------
 2 files changed, 10 insertions(+), 19 deletions(-)


Property changes on: xfce4-sensors-plugin/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xfce4-sensors-plugin/trunk:1
   + /xfce4-sensors-plugin/trunk:1-18973

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-13 03:02:50 UTC (rev 18973)
+++ extra-i686/PKGBUILD	2008-11-13 03:05:18 UTC (rev 18974)
@@ -1,29 +1,25 @@
 # $Id$
-# Maintainer: aurelien <aurelien at archlinux.org>
 # Contributor: Merk Matthias <macem at chello.at>
 
 pkgname=xfce4-sensors-plugin
-pkgver=0.10.99.2
-pkgrel=2
+pkgver=0.10.99.6
+pkgrel=1
 pkgdesc="A lm_sensors plugin for the Xfce panel"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'lm_sensors>=3.0.0')
-makedepends=('pkgconfig')
+depends=('xfce4-panel' 'lm_sensors>=3.0.0' 'libnotify')
+makedepends=('pkgconfig' 'intltool')
 options=(!libtool)
 install=${pkgname}.install
-source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	http://people.atrpms.net/~hdegoede/xfce4-sensors-plugin-0.10.99.2-lm_sensors3x.patch)
-md5sums=('5646407da37c6be63476b63347d0870b'
-         '9ae4ba1367bdb84b05717ffe81c153bf')
+source=(http://goodies.xfce.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('59dbd13b32bf635fab9cd2dc407183cb')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ../xfce4-sensors-plugin-0.10.99.2-lm_sensors3x.patch || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
     --localstatedir=/var --disable-static
   make || return 1
-  make DESTDIR=${startdir}/pkg/ install
+  make DESTDIR=${pkgdir} install
 }

Modified: extra-i686/xfce4-sensors-plugin.install
===================================================================
--- extra-i686/xfce4-sensors-plugin.install	2008-11-13 03:02:50 UTC (rev 18973)
+++ extra-i686/xfce4-sensors-plugin.install	2008-11-13 03:05:18 UTC (rev 18974)
@@ -7,10 +7,5 @@
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install $1
 }
-
-op=$1
-shift
-
-$op $*