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

[Giovanni Scafora]

    Date: Tuesday, May 5, 2009 @ 08:18:45
  Author: giovanni
Revision: 37944

Merged revisions 37927,37942 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/conky/trunk

........
  r37927 | andrea | 2009-05-04 18:52:24 -0700 (lun, 04 mag 2009) | 1 line
  
  use --sysconfdir and removed options enabled by default
........
  r37942 | giovanni | 2009-05-05 05:13:29 -0700 (mar, 05 mag 2009) | 1 line
  
  upgpkg: conky 1.7.0-2
........

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

----------+
 PKGBUILD |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)


Property changes on: conky/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /conky/trunk:1-37925
   + /conky/trunk:1-37943

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-05 12:14:11 UTC (rev 37943)
+++ extra-i686/PKGBUILD	2009-05-05 12:18:45 UTC (rev 37944)
@@ -4,7 +4,7 @@
 
 pkgname=conky
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An advanced, highly configurable system monitor for X based on torsmo"
 arch=('i686' 'x86_64')
 url="http://conky.sourceforge.net/"
@@ -18,16 +18,11 @@
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
-              --enable-xft \
-	      --enable-mpd \
-	      --enable-double-buffer \
+              --sysconfdir=/etc \
               --enable-wlan \
 	      --enable-rss
   make || return 1
   make DESTDIR=${pkgdir} install
-  mkdir -p ${pkgdir}/etc/xdg/
-  mv ${pkgdir}/usr/etc/conky/ ${pkgdir}/etc/xdg/
-  rmdir ${pkgdir}/usr/etc
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }