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

[Eric Bélanger]

    Date: Friday, April 15, 2011 @ 23:57:41
  Author: eric
Revision: 119852

upgpkg: fvwm 2.6.0-1
Upstream update

Modified:
  fvwm/trunk/PKGBUILD
Deleted:
  fvwm/trunk/ChangeLog

-----------+
 ChangeLog |    5 -----
 PKGBUILD  |   35 ++++++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 18 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-04-15 22:43:30 UTC (rev 119851)
+++ ChangeLog	2011-04-16 03:57:41 UTC (rev 119852)
@@ -1,5 +0,0 @@
-2009-06-18  Eric Belanger  <eric at archlinux.org>
-
-	* fvwm 2.4.20-4
-	* Rebuilt against readline 6.0.00
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-15 22:43:30 UTC (rev 119851)
+++ PKGBUILD	2011-04-16 03:57:41 UTC (rev 119852)
@@ -1,25 +1,34 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=fvwm
-pkgver=2.4.20
-pkgrel=4
+pkgver=2.6.0
+pkgrel=1
 pkgdesc="A multiple large virtual desktop window manager originally derived from twm"
 arch=('i686' 'x86_64')
 url="http://www.fvwm.org"
 license=('GPL' 'custom')
-depends=('readline>=6.0.00' 'libxpm' 'libxinerama' 'gtk' 'imlib' 'libstroke')
+depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'readline' 'librsvg')
 conflicts=('fvwm-devel')
-source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.gz fvwm2.desktop)
-md5sums=('3ac10558411c896f3afba285697cf42c' 'e52a6ef25a936dcf3ad0e58f2e9ed0ea')
-sha1sums=('2130a16590462cbbf15f255a46abe8b8a6cb4401' 'e0924164329e7eb14e0d6137d8ff18cf6230191c')
+source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.bz2 fvwm2.desktop)
+md5sums=('e4b4b065b2185be9071a9a55ac49b39a'
+         'e52a6ef25a936dcf3ad0e58f2e9ed0ea')
+sha1sums=('7c6ed1075c3faa1cd13c2ebc31f720d971564f5e'
+          'e0924164329e7eb14e0d6137d8ff18cf6230191c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libexecdir=/usr/lib --with-stroke || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 ../fvwm2.desktop "${pkgdir}/etc/X11/sessions/fvwm2.desktop" || return 1
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-stroke-library
+  make
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -d "${pkgdir}/etc/fvwm"
+  install -D -m644 sample.fvwmrc/* "${pkgdir}/etc/fvwm"
+  rm -f "${pkgdir}"/etc/fvwm/Makefile*
+  install -D -m644 ../fvwm2.desktop "${pkgdir}/usr/share/xsessions/fvwm2.desktop"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}