Date: Tuesday, October 19, 2010 @ 22:50:21 Author: eric Revision: 96370
upgpkg: fvwm-crystal 3.0.6-3 Rebuilt for python2, Switched to 'any' arch, Added docs, Updated url Modified: fvwm-crystal/trunk/PKGBUILD fvwm-crystal/trunk/python2.6.patch Deleted: fvwm-crystal/trunk/ChangeLog -----------------+ ChangeLog | 14 -------------- PKGBUILD | 35 ++++++++++++++++------------------- python2.6.patch | 4 ++-- 3 files changed, 18 insertions(+), 35 deletions(-) Deleted: ChangeLog =================================================================== --- ChangeLog 2010-10-20 02:45:06 UTC (rev 96369) +++ ChangeLog 2010-10-20 02:50:21 UTC (rev 96370) @@ -1,14 +0,0 @@ -2008-11-09 Eric Belanger <[email protected]> - - * fvwm-crystal 3.0.6-2 - * Rebuilt for python 2.6 (close FS#12033) - * Removed unneeded .install file - -2008-07-08 Eric Belanger <[email protected]> - - * fvwm-crystal 3.0.6-1 - * Upstream update - * Added arch field - * Cleaned up install scriptlet - * Removed from the package unneeded files coming from the svn tree - * Added ChangeLog Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-10-20 02:45:06 UTC (rev 96369) +++ PKGBUILD 2010-10-20 02:50:21 UTC (rev 96370) @@ -1,33 +1,30 @@ # $Id$ # Maintainer: Eric Belanger <[email protected]> -# Contributor: Simo Leone <[email protected]> pkgname=fvwm-crystal pkgver=3.0.6 -pkgrel=2 +pkgrel=3 pkgdesc="Transparent Themes for fvwm" -arch=('i686' 'x86_64') -url="http://www.fvwm-crystal.org"; +arch=('any') +url="http://gna.org/projects/fvwm-crystal/"; license=('GPL') -depends=('fvwm-devel' 'imagemagick' 'python' 'habak' 'trayer') +depends=('fvwm-devel' 'imagemagick' 'python2' 'habak' 'trayer') source=(http://download.gna.org/fvwm-crystal/${pkgver}/${pkgname}-${pkgver}.tar.gz python2.6.patch) -md5sums=('82e2800882abb2c822519f1aa4dc0c72' '8e381c0233e3b6053722390e0e19b5ae') -sha1sums=('965e521f64b8a89994f5afee25c8b1c88239bff0' '6dfa5c12a29477111de8fbc3789d06c2ec04cf5e') +md5sums=('82e2800882abb2c822519f1aa4dc0c72' 'c0baa3da5e188f7e0f7a01d6481b6a53') +sha1sums=('965e521f64b8a89994f5afee25c8b1c88239bff0' 'cfac2165ca8311fc446410cfed3b1d1f92b8ae61') build() { - cd ${srcdir}/${pkgname}-${pkgver}/bin - patch -p0 < ../../python2.6.patch || return 1 - cd .. - make prefix=${pkgdir}/usr install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 < ../python2.6.patch +} - # make gdm work - install -D -m644 addons/fvwm-crystal.desktop ${pkgdir}/etc/X11/sessions/fvwm-crystal.desktop || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install install-doc + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' "${pkgdir}"/usr/bin/fvwm-crystal.{apps,wallpaper} \ + "${pkgdir}"/usr/share/fvwm-crystal/fvwm/scripts/FvwmMPD/{getprevdir.py,stripnames.py} + install -D -m644 addons/fvwm-crystal.desktop "${pkgdir}/etc/X11/sessions/fvwm-crystal.desktop" # Cleaning up files from svn tree - cd ${pkgdir}/usr/share/fvwm-crystal/fvwm/ - rm -r */.svn - rm -r */*/.svn - rm -r */*/*/.svn - rm -r */*/*/*/.svn - rm -r */*/*/*/*/.svn + find "${pkgdir}" -depth -type d -name .svn -exec rm -rf {} \; } Modified: python2.6.patch =================================================================== --- python2.6.patch 2010-10-20 02:45:06 UTC (rev 96369) +++ python2.6.patch 2010-10-20 02:50:21 UTC (rev 96370) @@ -1,5 +1,5 @@ ---- fvwm-crystal.apps.new 2008-10-24 23:48:23.000000000 +0200 -+++ fvwm-crystal.apps 2008-10-24 23:54:45.000000000 +0200 +--- bin/fvwm-crystal.apps.new 2008-10-24 23:48:23.000000000 +0200 ++++ bin/fvwm-crystal.apps 2008-10-24 23:54:45.000000000 +0200 @@ -102,7 +102,7 @@ group = OptionGroup(parser, "General creation options", "Options definig what should be generated") # group.add_option('-g', '--generate', action = 'store', choices=['all','menus','panel','topapps'], dest='generate', default='all', metavar='WHAT',
