[arch-commits] Commit in fvwm/trunk (PKGBUILD fvwm.desktop fvwm2.desktop)

[Eric Bélanger]

    Date: Sunday, June 12, 2011 @ 23:53:57
  Author: eric
Revision: 127312

upgpkg: fvwm 2.6.1-3
Changed it to replace fvwm-devel, Disabled SMP build, Moved sample configs from /etc to /usr/share/doc, Renamed and updated desktop file

Added:
  fvwm/trunk/fvwm.desktop
Modified:
  fvwm/trunk/PKGBUILD
Deleted:
  fvwm/trunk/fvwm2.desktop

---------------+
 PKGBUILD      |   19 +++++++++----------
 fvwm.desktop  |    7 +++++++
 fvwm2.desktop |    8 --------
 3 files changed, 16 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-13 01:13:23 UTC (rev 127311)
+++ PKGBUILD	2011-06-13 03:53:57 UTC (rev 127312)
@@ -3,20 +3,22 @@
 
 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 @@
 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"
 }

Added: fvwm.desktop
===================================================================
--- fvwm.desktop	                        (rev 0)
+++ fvwm.desktop	2011-06-13 03:53:57 UTC (rev 127312)
@@ -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

Deleted: fvwm2.desktop
===================================================================
--- fvwm2.desktop	2011-06-13 01:13:23 UTC (rev 127311)
+++ fvwm2.desktop	2011-06-13 03:53:57 UTC (rev 127312)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=FVWM2
-Comment=The fvwm2 window manager
-Exec=fvwm2
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application