[arch-commits] Commit in conky (3 files)

[Giovanni Scafora]

    Date: Sunday, October 12, 2008 @ 17:45:26
  Author: giovanni
Revision: 15345

Merged revisions 12010 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/conky/trunk

........
  r12010 | eric | 2008-09-08 00:44:53 +0200 (lun, 08 set 2008) | 2 lines
  
  upgpkg: conky 1.6.1-1
      removed empty directory
........

Modified:
  conky/repos/extra-i686/	(properties)
  conky/repos/extra-i686/PKGBUILD
  conky/trunk/PKGBUILD

---------------------------+
 repos/extra-i686/PKGBUILD |    3 ++-
 trunk/PKGBUILD            |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)


Property changes on: conky/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /conky/trunk:1-11991
   + /conky/trunk:1-15344

Modified: repos/extra-i686/PKGBUILD
===================================================================
--- repos/extra-i686/PKGBUILD	2008-10-12 21:22:56 UTC (rev 15344)
+++ repos/extra-i686/PKGBUILD	2008-10-12 21:45:26 UTC (rev 15345)
@@ -13,6 +13,7 @@
 depends=('libxext' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage')
 makedepends=('pkgconfig')
 source=(http://downloads.sourceforge.net/sourceforge/conky/$pkgname-$pkgver.tar.bz2)
+md5sums=('b2839f21cec18e5eaa338c7440a1ba28')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -22,7 +23,7 @@
   make DESTDIR=$startdir/pkg install
   mkdir -p $startdir/pkg/etc/xdg/
   mv $startdir/pkg/usr/etc/conky/ $startdir/pkg/etc/xdg/
+  rmdir $startdir/pkg/usr/etc
   install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
 }
 
-md5sums=('b2839f21cec18e5eaa338c7440a1ba28')

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2008-10-12 21:22:56 UTC (rev 15344)
+++ trunk/PKGBUILD	2008-10-12 21:45:26 UTC (rev 15345)
@@ -4,7 +4,7 @@
 
 pkgname=conky
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Conky is an advanced, highly configurable system monitor for X based on torsmo"
 arch=('i686' 'x86_64')
 url="http://conky.sourceforge.net/"
@@ -18,7 +18,7 @@
 build() {
   cd $startdir/src/$pkgname-$pkgver
   ./configure --prefix=/usr --enable-xft --enable-mpd --enable-double-buffer \
-  --enable-proc-uptime --enable-seti --enable-wlan --enable-rss 
+  --enable-proc-uptime --enable-seti --enable-wlan --enable-rss --enable-smapi
   make || return 1
   make DESTDIR=$startdir/pkg install
   mkdir -p $startdir/pkg/etc/xdg/