rpms/gdesklets/F-11 python-2.6.patch, NONE, 1.1 gdesklets.spec, 1.42, 1.43

[Luya Tshimbalanga]

Author: luya

Update of /cvs/pkgs/rpms/gdesklets/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7946

Modified Files:
	gdesklets.spec 
Added Files:
	python-2.6.patch 
Log Message:
patch to resolve python 2.6 incompatibility

python-2.6.patch:

--- NEW FILE python-2.6.patch ---
--- gDesklets-0.36.1/utils/ErrorFormatter.py	2008-03-19 16:00:59.000000000 -0700
+++ gDesklets-0.36.1.new/utils/ErrorFormatter.py	2009-05-12 22:32:47.000000000 -0700
@@ -113,9 +113,9 @@
 # give us an absolute path.
 #
 _old_imp = __import__
-def _new_imp(name, globs = {}, locls = {}, fromlist = []):
+def _new_imp(*args, **kwargs):
 
-    module = _old_imp(name, globs, locls, fromlist)
+    module = _old_imp(*args, **kwargs)
     # builtin modules have no "__file__" attribute, so we have to check for it
     if (module):
         if (hasattr(module, "__file__")):


Index: gdesklets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdesklets/F-11/gdesklets.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- gdesklets.spec	24 Feb 2009 20:03:23 -0000	1.42
+++ gdesklets.spec	13 May 2009 06:51:40 -0000	1.43
@@ -1,8 +1,8 @@
-#%define alphatag beta
+#%global alphatag beta
 
 Name:		gdesklets
 Version:	0.36.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	An interactive Imlib2 console for the X Window system
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@ License:	GPL+
 URL:		http://www.%{name}.de/
 Source0:	http://%{name}.de/files/%{name}-%{version}.tar.gz
 Patch0:		transition.patch
+Patch1:		python-2.6.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel , pygtk2-devel > 2.4.0, 
@@ -31,6 +32,7 @@ bars, weather sensors, news tickers.
 %prep
 %setup -q -n gDesklets-%{version}
 %patch0 -p1 -b .transition
+%patch1 -p1 -b .python2.6
 
 %build
 %configure \
@@ -40,6 +42,7 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
+
 %find_lang %{name}
 
 desktop-file-install --vendor=fedora  \
@@ -56,7 +59,6 @@ rm -rf %{buildroot}%{_datadir}/mime/{glo
 rm -f %{buildroot}%{_datadir}/applications/{%{name}.desktop,mimeinfo.cache}
 rm -f %{buildroot}%{_datadir}/mime/{globs2,generic-icons,icons,treemagic,types}
 
-
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
@@ -81,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Apr 29 2009 Luya Tshimbalanga <luya at fedoraproject.org> - 0.36.1-6
+- Patch applied on incompability with Python 2.6 (rhbz#498268, launchpad #344079)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild