summaryrefslogtreecommitdiff
path: root/extra/fvwm
diff options
context:
space:
mode:
authorroot <root@rshg047.dnsready.net>2011-06-13 19:04:06 +0000
committerroot <root@rshg047.dnsready.net>2011-06-13 19:04:06 +0000
commit7c64c5039335c73eaa1a402c417235e8ca9a5109 (patch)
treed53f2d1fc693b98b4a942b1bb1257bafbc67262a /extra/fvwm
parentad4b2565385561c6ff56f1f91c1e40115cf939d7 (diff)
Mon Jun 13 19:04:06 UTC 2011
Diffstat (limited to 'extra/fvwm')
-rw-r--r--extra/fvwm/PKGBUILD21
-rw-r--r--extra/fvwm/fvwm.desktop7
2 files changed, 17 insertions, 11 deletions
diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD
index bd7af2998..88ea17960 100644
--- a/extra/fvwm/PKGBUILD
+++ b/extra/fvwm/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 122671 2011-05-06 03:51:25Z eric $
+# $Id: PKGBUILD 127312 2011-06-13 03:53:57Z eric $
# Maintainer: Eric BĂ©langer <eric@archlinux.org>
pkgname=fvwm
pkgver=2.6.1
-pkgrel=2
+pkgrel=3
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=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor')
makedepends=('libxslt')
+provides=('fvwm-devel')
conflicts=('fvwm-devel')
-options=('!emptydirs')
-source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.bz2 fvwm2.desktop)
+replaces=('fvwm-devel')
+options=('!emptydirs' '!makeflags')
+source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop)
md5sums=('fbbbed1bb41fa0878b17ee209947602d'
- 'e52a6ef25a936dcf3ad0e58f2e9ed0ea')
+ 'a12c52729a74355838404ee2f5716e0c')
sha1sums=('cf7165d40180b45409e604736066cf9fcc792e36'
- 'e0924164329e7eb14e0d6137d8ff18cf6230191c')
+ '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,10 +29,7 @@ build() {
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 sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*} "${pkgdir}/usr/share/doc/fvwm"
+ install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop"
install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
}
diff --git a/extra/fvwm/fvwm.desktop b/extra/fvwm/fvwm.desktop
new file mode 100644
index 000000000..e297a6109
--- /dev/null
+++ b/extra/fvwm/fvwm.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=FVWM
+Comment=The fvwm window manager
+Type=XSession
+Exec=/usr/bin/fvwm
+TryExec=/usr/bin/fvwm