Date: Wednesday, May 1, 2013 @ 05:02:00 Author: eric Revision: 184016
upgpkg: fvwm-crystal 3.1.7-1 Upstream update, Update url, Remove old patch, PKGBUILD clean up Modified: fvwm-crystal/trunk/PKGBUILD Deleted: fvwm-crystal/trunk/python2.6.patch -----------------+ PKGBUILD | 28 +++++----------------- python2.6.patch | 68 ------------------------------------------------------ 2 files changed, 7 insertions(+), 89 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-05-01 02:10:20 UTC (rev 184015) +++ PKGBUILD 2013-05-01 03:02:00 UTC (rev 184016) @@ -2,32 +2,18 @@ # Maintainer: Eric Bélanger <[email protected]> pkgname=fvwm-crystal -pkgver=3.0.6 -pkgrel=4 +pkgver=3.1.7 +pkgrel=1 pkgdesc="Transparent Themes for fvwm" arch=('any') -url="http://gna.org/projects/fvwm-crystal/"; +url="http://fvwm-crystal.sourceforge.net/"; license=('GPL') depends=('fvwm' 'imagemagick' 'python2' 'habak' 'trayer') options=('!makeflags') -source=(http://download.gna.org/fvwm-crystal/${pkgver}/${pkgname}-${pkgver}.tar.gz python2.6.patch) -md5sums=('82e2800882abb2c822519f1aa4dc0c72' - 'c0baa3da5e188f7e0f7a01d6481b6a53') -sha1sums=('965e521f64b8a89994f5afee25c8b1c88239bff0' - 'cfac2165ca8311fc446410cfed3b1d1f92b8ae61') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) +sha1sums=('2824991976918621d05160aa76c742382e6e5176') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 < ../python2.6.patch -} - 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}/usr/share/xsessions/fvwm-crystal.desktop" - - # Cleaning up files from svn tree - find "${pkgdir}" -depth -type d -name .svn -exec rm -rf {} \; + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" prefix=/usr install install-doc } Deleted: python2.6.patch =================================================================== --- python2.6.patch 2013-05-01 02:10:20 UTC (rev 184015) +++ python2.6.patch 2013-05-01 03:02:00 UTC (rev 184016) @@ -1,68 +0,0 @@ ---- 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', - # help = "what should be generated. aviable options are: all, menus, panel, topapps. default is all.") -- group.add_option('--with', action = 'append', type='string', dest='with', metavar='DIRECTORY', -+ group.add_option('--with', action = 'append', type='string', dest='withdir', metavar='DIRECTORY', - help = 'generate entries only for defined entries (directories or files)') - group.add_option('--without', action = 'append', type='string', dest='without', metavar='DIRECTORY', - help = 'do NOT use defined entries (directories or files) for generating output.') -@@ -206,7 +206,7 @@ - #end of parseArgv - - --def getAppsData(databases=[database],checkExecs=False,searchIconsIn='',sortOrder='prio',minLength=3,with=None,without=None,rootName='/Applications',topInSub=True,fileIcon='default.png',dirIcon='directory.png'): -+def getAppsData(databases=[database],checkExecs=False,searchIconsIn='',sortOrder='prio',minLength=3,withdir=None,without=None,rootName='/Applications',topInSub=True,fileIcon='default.png',dirIcon='directory.png'): - """Read application databases from directories. - if checkExecs is True then use exec_field from file name to check access before adding it to database - if searchIconsIn is provided then use this path to check icons existence -@@ -235,7 +235,7 @@ - return True - return False - -- def get_entry(root,dir,cat,sort,check,with,without,realcat): -+ def get_entry(root,dir,cat,sort,check,withdir,without,realcat): - if not os.path.isdir(os.path.join(root,dir)) or not os.access(os.path.join(root,dir),os.R_OK): - yield None - for entry in os.listdir(os.path.join(root,dir)): -@@ -268,9 +268,9 @@ - if not checkFileAccess(test): - continue - -- if with and len(with)>0: -+ if withdir and len(withdir)>0: - cont=False -- for i,v in enumerate(with): -+ for i,v in enumerate(withdir): - if not (os.path.join(cat,name).startswith(v) or os.path.join(cat,name.replace('_',' ')).startswith(v)): - cont=True - break -@@ -305,7 +305,7 @@ - x = realcat[:] - x.extend([prio,name]) - if access: -- for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,with,without,x): -+ for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,withdir,without,x): - yield sub - elif os.path.isfile(file): - if sort=='name' or sort=='rname': -@@ -327,7 +327,7 @@ - db=os.path.abspath(os.path.expanduser(databases[i])) - if not os.path.isdir(db) or not os.access(db,os.R_OK): - continue -- for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,with,without,[0,rootName]): -+ for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,withdir,without,[0,rootName]): - if not entry: - continue - if not entry[5]: -@@ -850,7 +850,7 @@ - if params[0].database and len(params[0].database)>0: - database=params[0].database - --apps=getAppsData(database,checkExecs=params[0].checkExecs,searchIconsIn=params[0].iconPath,sortOrder=params[0].sortOrder,minLength=params[0].subLength,with=params[0].with,without=params[0].without,rootName=params[0].rootCat,topInSub=params[0].topInSub,fileIcon=params[0].fileDefault,dirIcon=params[0].dirDefault) -+apps=getAppsData(database,checkExecs=params[0].checkExecs,searchIconsIn=params[0].iconPath,sortOrder=params[0].sortOrder,minLength=params[0].subLength,withdir=params[0].withdir,without=params[0].without,rootName=params[0].rootCat,topInSub=params[0].topInSub,fileIcon=params[0].fileDefault,dirIcon=params[0].dirDefault) - - ########################## DEBUG ################################ - if params[0].verbosity > 1:
