[arch-commits] Commit in conky/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Friday, April 25, 2008 @ 21:09:27
  Author: eric
Revision: 977

fixed svn conflict

Modified:
  conky/repos/extra-x86_64/	(properties)
  conky/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


Property changes on: conky/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /conky/trunk:1
   + /conky/trunk:1-976

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-04-26 01:08:19 UTC (rev 976)
+++ extra-x86_64/PKGBUILD	2008-04-26 01:09:27 UTC (rev 977)
@@ -3,7 +3,7 @@
 # Contributor: MrGreen <mrgreen.linuxuser at gmail.com>
 
 pkgname=conky
-pkgver=1.4.9
+pkgver=1.5.1
 pkgrel=1
 pkgdesc="Conky is an advanced, highly configurable system monitor for X based on torsmo"
 arch=(i686 x86_64)
@@ -12,16 +12,16 @@
 replaces=('torsmo')
 depends=('libxext' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage')
 source=(http://optusnet.dl.sourceforge.net/sourceforge/conky/$pkgname-$pkgver.tar.bz2)
-md5sums=('42d966fce5aa5c5a326575ec214bff07')
+md5sums=('afc121a67e4405cb44b7738be79946ac')
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-xft --enable-mpd --enable-double-buffer \
+  ./configure --prefix=/usr --enable-xft --enable-mpd --enable-double-buffer \
   --enable-proc-uptime --enable-seti --enable-wlan --enable-rss 
   make || return 1
   make DESTDIR=$startdir/pkg install
-  install -D -m644 doc/conkyrc.sample $startdir/pkg/etc/xdg/conky/conkyrc.sample
+  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
 }
 
-
-