--- a/ChangeLog	Wed Dec 09 09:09:44 2009 +0000
+++ b/ChangeLog	Wed Dec 09 09:21:20 2009 +0000
@@ -1,3 +1,10 @@
+2009-12-09  jerry Tan <[email protected]>
+
+	* patches/gdesklets-07-python2.6.diff
+	* base-specs/gdesklets.spec
+	* SUNWgnome-desklets.spec
+        migrate gdesklet to python2.6
+
 2009-12-09  Wang Xin  <[email protected]>
 
 	Bump to 2.29.3

--- a/SUNWgnome-desklets.spec	Wed Dec 09 09:09:44 2009 +0000
+++ b/SUNWgnome-desklets.spec	Wed Dec 09 09:21:20 2009 +0000
@@ -53,6 +53,9 @@
 export CFLAGS="%optflags"
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="%_ldflags"
+export PYTHON="/usr/bin/python2.6"
+export PYTHON_VERSION="2.6"
+
 %gdesklets.build -d %name-%version
 
 %install

--- a/base-specs/gdesklets.spec	Wed Dec 09 09:09:44 2009 +0000
+++ b/base-specs/gdesklets.spec	Wed Dec 09 09:21:20 2009 +0000
@@ -35,6 +35,8 @@
 Patch5:         gdesklets-05-manpage.diff
 # date:2008-08-13 owner:jedy type:branding
 Patch6:         gdesklets-06-menu-entry.diff
+# date:2009-12-09 owner:jerrytan type:branding
+Patch7:         gdesklets-07-python2.6.diff
 URL:		http://www.gdesklets.de/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 Autoreqprov:	on
@@ -52,6 +54,7 @@
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %ifos linux

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdesklets-07-python2.6.diff	Wed Dec 09 09:21:20 2009 +0000
@@ -0,0 +1,77 @@
+diff -u gDesklets-0.36.1.old/ctrlinfo gDesklets-0.36.1/ctrlinfo
+--- gDesklets-0.36.1.old/ctrlinfo	2009-12-09 14:48:14.041042000 +0800
++++ gDesklets-0.36.1/ctrlinfo	2009-12-09 14:54:08.396962000 +0800
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.6
+ 
+ # This tool loads a given control and outputs information about the control.
+ #
+diff -u gDesklets-0.36.1.old/gdesklets gDesklets-0.36.1/gdesklets
+--- gDesklets-0.36.1.old/gdesklets	2009-12-09 14:48:14.041210000 +0800
++++ gDesklets-0.36.1/gdesklets	2009-12-09 14:54:20.452467000 +0800
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.6
+ 
+ from main import client, DISPLAY, HOME, USERHOME
+ from main import LOGFILE, LOG_PATH, PID_PATH, REGISTRY_PATH, SOCKET_PATH
+diff -u gDesklets-0.36.1.old/gdesklets-daemon gDesklets-0.36.1/gdesklets-daemon
+--- gDesklets-0.36.1.old/gdesklets-daemon	2009-12-09 14:48:14.041345000 +0800
++++ gDesklets-0.36.1/gdesklets-daemon	2009-12-09 14:54:42.524281000 +0800
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.6
+ # -*- coding: UTF-8 -*-
+ 
+ import __builtin__
+diff -u gDesklets-0.36.1.old/gdesklets-logview gDesklets-0.36.1/gdesklets-logview
+--- gDesklets-0.36.1.old/gdesklets-logview	2009-12-09 14:48:14.041477000 +0800
++++ gDesklets-0.36.1/gdesklets-logview	2009-12-09 14:54:53.596152000 +0800
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.6
+ 
+ #
+ # Log file viewer for gDesklets.
+diff -u gDesklets-0.36.1.old/gdesklets-migration-tool gDesklets-0.36.1/gdesklets-migration-tool
+--- gDesklets-0.36.1.old/gdesklets-migration-tool	2009-12-09 14:48:14.041612000 +0800
++++ gDesklets-0.36.1/gdesklets-migration-tool	2009-12-09 14:55:13.364014000 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.6
+ #
+ # TODO:
+ #   -Add selectors for previous and current gDesklets versions
+diff -u gDesklets-0.36.1.old/gdesklets-shell gDesklets-0.36.1/gdesklets-shell
+--- gDesklets-0.36.1.old/gdesklets-shell	2009-12-09 14:48:14.041739000 +0800
++++ gDesklets-0.36.1/gdesklets-shell	2009-12-09 14:55:25.715918000 +0800
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.6
+ 
+ from utils import i18n
+ import __builtin__
+diff -u gDesklets-0.36.1.old/test-control.py gDesklets-0.36.1/test-control.py
+--- gDesklets-0.36.1.old/test-control.py	2009-12-09 14:48:14.053620000 +0800
++++ gDesklets-0.36.1/test-control.py	2009-12-09 14:55:50.883623000 +0800
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.6
+ # A simple script to test controls interactively.
+ 
+ from plugin.Interface import Interface
+--- gDesklets-0.36.1.old/utils/ErrorFormatter.py	2009-12-09 16:27:54.734797000 +0800
++++ gDesklets-0.36.1/utils/ErrorFormatter.py	2009-12-09 16:28:42.320703000 +0800
+@@ -113,9 +113,9 @@
+ # give us an absolute path.
+ #
+ _old_imp = __import__
+-def _new_imp(name, globs = {}, locls = {}, fromlist = []):
++def _new_imp(name, globs = {}, locls = {}, fromlist = [] , level = -1):
+ 
+-    module = _old_imp(name, globs, locls, fromlist)
++    module = _old_imp(name, globs, locls, fromlist, level)
+     # builtin modules have no "__file__" attribute, so we have to check for it
+     if (module):
+         if (hasattr(module, "__file__")):