[arch-commits] Commit in gdesklets/trunk (3 files)

[Eric Bélanger]

    Date: Saturday, September 11, 2010 @ 02:40:52
  Author: eric
Revision: 90382

upgpkg: gdesklets 0.36.2-1
Upstream update, Built against python2, Added intltool makedepends, Added mime db update in .install file

Modified:
  gdesklets/trunk/PKGBUILD
  gdesklets/trunk/gdesklets.install
Deleted:
  gdesklets/trunk/no-import-overide.patch

-------------------------+
 PKGBUILD                |   39 ++++++++++++++++++++++-----------------
 gdesklets.install       |    2 ++
 no-import-overide.patch |   38 --------------------------------------
 3 files changed, 24 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-11 03:57:02 UTC (rev 90381)
+++ PKGBUILD	2010-09-11 06:40:52 UTC (rev 90382)
@@ -3,33 +3,38 @@
 # Maintainer: Roman Kyrylych <roman at archlinux.org>
 
 pkgname=gdesklets
-pkgver=0.36.1
+pkgver=0.36.2
 pkgrel=1
-pkgdesc="gDesklets provides an advanced architecture for desktop applets."
+pkgdesc="An advanced architecture for desktop applets"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://gdesklets.de/"
-depends=('libgtop>=2.14.8-2' 'librsvg>=2.16.0' 'libgnomeui>=2.18.1-2'
-         'gnome-python>=2.18.0' 'gconf>=2.18.0.1-4' 'desktop-file-utils')
-makedepends=('perlxml' 'swig')
+depends=('libgtop' 'librsvg' 'libgnomeui' 'gnome-python' 'gconf' 'desktop-file-utils' 'shared-mime-info')
+makedepends=('perlxml' 'intltool' 'swig')
 options=('!libtool' '!makeflags')
 install=gdesklets.install
-source=(http://gdesklets.zencomputer.ca/gDesklets/gDesklets-$pkgver.tar.bz2
-        no-import-overide.patch)
-md5sums=('425625a63280c15d084d92317720d8d5' '9190f9c8406e3c5ad5c0ab2bd95b71ff')
+source=(http://gdesklets.de/files/gdesklets-$pkgver.tar.bz2)
+md5sums=('c64e7017fa60746746de203d1b532045')
+sha1sums=('56742080aa04c27548b8856b6e6aca8861a0d9b5')
 
 build() {
-  cd $srcdir/gDesklets-$pkgver
-  patch -Np1 -i $srcdir/no-import-overide.patch
-  
+  cd "$srcdir/gDesklets-$pkgver"
+  sed -i 's/python -c/$PYTHON -c/' configure
+  sed -i 's|#! /usr/bin/env python|#! /usr/bin/env python2|' \
+    gdesklets gdesklets-shell gdesklets-daemon ctrlinfo gdesklets-logview test-control.py
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' contrib/gdesklets-migration-tool
+  sed -i 's|python|python2|' shell/plugins/PackageInstaller/__init__.py
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make || return 1
+  make
+}
 
+package() {
+  cd "$srcdir/gDesklets-$pkgver"
   make UPDATE_MIME_DATABASE=/bin/true UPDATE_DESKTOP_DATABASE=/bin/true \
-    GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install
+    GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
 
-  mkdir -p $pkgdir/usr/share/gconf/schemas
-  gconf-merge-schema $pkgdir/usr/share/gconf/schemas/$pkgname.schemas \
-    $pkgdir/etc/gconf/schemas/*.schemas
-  rm -f $pkgdir/etc/gconf/schemas/*.schemas
+  mkdir -p "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \
+    "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
 }

Modified: gdesklets.install
===================================================================
--- gdesklets.install	2010-09-11 03:57:02 UTC (rev 90381)
+++ gdesklets.install	2010-09-11 06:40:52 UTC (rev 90382)
@@ -3,6 +3,7 @@
 post_install() {
   usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
+  update-mime-database usr/share/mime
 }
 
 pre_upgrade() {
@@ -19,4 +20,5 @@
 
 post_remove() {
   update-desktop-database -q
+  update-mime-database usr/share/mime
 }

Deleted: no-import-overide.patch
===================================================================
--- no-import-overide.patch	2010-09-11 03:57:02 UTC (rev 90381)
+++ no-import-overide.patch	2010-09-11 06:40:52 UTC (rev 90382)
@@ -1,38 +0,0 @@
-diff -Naur gDesklets-0.36.1-old/utils/ErrorFormatter.py gDesklets-0.36.1/utils/ErrorFormatter.py
---- gDesklets-0.36.1-old/utils/ErrorFormatter.py	2008-03-20 09:00:59.000000000 +1000
-+++ gDesklets-0.36.1/utils/ErrorFormatter.py	2008-12-07 03:08:41.000000000 +1000
-@@ -112,20 +112,20 @@
- # available. Therefore, we have to extend the import handler in order to always
- # give us an absolute path.
- #
--_old_imp = __import__
--def _new_imp(name, globs = {}, locls = {}, fromlist = []):
--
--    module = _old_imp(name, globs, locls, fromlist)
--    # builtin modules have no "__file__" attribute, so we have to check for it
--    if (module):
--        if (hasattr(module, "__file__")):
--            module.__file__ = os.path.abspath(module.__file__)
--        return module
--    else:
--        return ""
--
--import __builtin__
--__builtin__.__import__ = _new_imp
-+#_old_imp = __import__
-+#def _new_imp(name, globs = {}, locls = {}, fromlist = []):
-+#
-+#    module = _old_imp(name, globs, locls, fromlist)
-+#    # builtin modules have no "__file__" attribute, so we have to check for it
-+#    if (module):
-+#        if (hasattr(module, "__file__")):
-+#            module.__file__ = os.path.abspath(module.__file__)
-+#        return module
-+#    else:
-+#        return ""
-+#
-+#import __builtin__
-+#__builtin__.__import__ = _new_imp
- 
- 
-