[arch-commits] Commit in fluxconf/repos (3 files)

[Eric Bélanger]

    Date: Sunday, March 15, 2009 @ 21:11:12
  Author: eric
Revision: 30060

Fixed svn conflict

Added:
  fluxconf/repos/extra-x86_64/ChangeLog
    (from rev 30059, fluxconf/trunk/ChangeLog)
Modified:
  fluxconf/repos/extra-x86_64/	(properties)
  fluxconf/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   27 ++++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)


Property changes on: fluxconf/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /fluxconf/trunk:1
   + /fluxconf/trunk:1-30059

Copied: fluxconf/repos/extra-x86_64/ChangeLog (from rev 30059, fluxconf/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog	                        (rev 0)
+++ extra-x86_64/ChangeLog	2009-03-16 01:11:12 UTC (rev 30060)
@@ -0,0 +1,5 @@
+2009-03-13  Eric Belanger  <eric at archlinux.org>
+
+	* fluxconf 0.9.9-2
+	* Added license
+	* Added ChangeLog

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-16 01:07:51 UTC (rev 30059)
+++ extra-x86_64/PKGBUILD	2009-03-16 01:11:12 UTC (rev 30060)
@@ -1,24 +1,25 @@
 # $Id$
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: Jochem Kossen <j.kossen at home.nl>
 
 pkgname=fluxconf
 pkgver=0.9.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Configuration utility for the Fluxbox windowmanager"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+url="http://devaux.fabien.free.fr/flux/"
+license=('GPL')
 depends=('gtk2')
-source=(http://devaux.fabien.free.fr/flux/$pkgname-$pkgver.tar.gz)
-url="http://devaux.fabien.free.fr/flux/"
+source=(http://devaux.fabien.free.fr/flux/${pkgname}-${pkgver}.tar.gz)
 md5sums=('ac37b12410daa06128f8eb29163a741d')
+sha1sums=('c9e262d21b4badfcebccb0f500af10c854bda9eb')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  /usr/bin/make || return 1
-  /usr/bin/make prefix=$startdir/pkg/usr install
-  cd $startdir/pkg/usr/bin
-  /bin/ln -sf $pkgname fluxbare
-  /bin/ln -sf $pkgname fluxkeys
-  /bin/ln -sf $pkgname fluxmenu
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr || return 1
+  make || return 1
+  make prefix=${pkgdir}/usr install || return 1
+  ln -sf ${pkgname} ${pkgdir}/usr/bin/fluxbare
+  ln -sf ${pkgname} ${pkgdir}/usr/bin/fluxkeys
+  ln -sf ${pkgname} ${pkgdir}/usr/bin/fluxmenu
 }