[arch-commits] Commit in fluxbox/trunk (ChangeLog PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, February 8, 2011 @ 06:01:25
  Author: eric
Revision: 109334

Fixed location of sessions .desktop file, Removed ChangeLog, Change bash depends to sh

Modified:
  fluxbox/trunk/PKGBUILD
Deleted:
  fluxbox/trunk/ChangeLog

-----------+
 ChangeLog |   10 ----------
 PKGBUILD  |   23 +++++++++++++----------
 2 files changed, 13 insertions(+), 20 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-02-08 10:55:23 UTC (rev 109333)
+++ ChangeLog	2011-02-08 11:01:25 UTC (rev 109334)
@@ -1,10 +0,0 @@
-2008-09-19  Eric Belanger  <eric at archlinux.org>
-
-	* fluxbox 1.1.1-1
-	* Upstream update
-
-2008-09-05  Eric Belanger  <eric at archlinux.org>
-
-	* fluxbox 1.1.0.1-1
-	* Upstream update
-        * Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-08 10:55:23 UTC (rev 109333)
+++ PKGBUILD	2011-02-08 11:01:25 UTC (rev 109334)
@@ -1,6 +1,5 @@
 # $Id$
 # Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor:  John Proctor <jproctor at prium.net>
 
 pkgname=fluxbox
 pkgver=1.1.1
@@ -9,8 +8,8 @@
 arch=('i686' 'x86_64')
 url="http://www.fluxbox.org"
 license=('MIT')
-depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'bash' 'imlib2')
-makedepends=('pkgconfig')
+depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'sh' 'imlib2')
+makedepends=('pkg-config')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
         fluxbox.desktop)
@@ -18,15 +17,19 @@
 sha1sums=('6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
     --enable-kde --enable-gnome \
     --enable-xft --enable-xinerama \
-    --enable-imlib2 --enable-nls || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+    --enable-imlib2 --enable-nls
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
  # this is a fix to allow fluxbox to shutdown, but this can be changed by the user :-(
-  sed -i 's|^.*slit\.autoHide.*$|session.screen0.slit.autoHide:  True|' ${pkgdir}/usr/share/fluxbox/init || return 1
-  install -D -m644 ../fluxbox.desktop ${pkgdir}/etc/X11/sessions/fluxbox.desktop || return 1
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/COPYING || return 1
+  sed -i 's|^.*slit\.autoHide.*$|session.screen0.slit.autoHide:  True|' "${pkgdir}/usr/share/fluxbox/init"
+  install -D -m644 ../fluxbox.desktop "${pkgdir}/usr/share/xsessions/fluxbox.desktop"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING "
 }