rpms/gdesklets/F-12 python-2.6.patch, NONE, 1.1 gdesklets.spec, 1.43, 1.44
Luya Tshimbalanga
luya at fedoraproject.org
Thu Oct 29 19:10:19 UTC 2009
- Previous message (by thread): rpms/perl-Text-CSV_XS/F-12 .cvsignore, 1.7, 1.8 perl-Text-CSV_XS.spec, 1.17, 1.18 sources, 1.7, 1.8
- Next message (by thread): rpms/perl-UNIVERSAL-can/F-12 .cvsignore, 1.3, 1.4 perl-UNIVERSAL-can.spec, 1.6, 1.7 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: luya
Update of /cvs/pkgs/rpms/gdesklets/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2319
Modified Files:
gdesklets.spec
Added Files:
python-2.6.patch
Log Message:
Patch to address python 2.6 compatibilty from F11
python-2.6.patch:
ErrorFormatter.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- 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-12/gdesklets.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- gdesklets.spec 24 Jul 2009 23:41:16 -0000 1.43
+++ gdesklets.spec 29 Oct 2009 19:10:18 -0000 1.44
@@ -2,7 +2,7 @@
Name: gdesklets
Version: 0.36.1
-Release: 6%{?dist}
+Release: 7%{?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 \
@@ -81,6 +83,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Oct 29 2009 Luya Tshimbalanga <luya at fedoraproject.org> 0.36.1-7
+- Add patch to address compatibility with python 2.6
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.36.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message (by thread): rpms/perl-Text-CSV_XS/F-12 .cvsignore, 1.7, 1.8 perl-Text-CSV_XS.spec, 1.17, 1.18 sources, 1.7, 1.8
- Next message (by thread): rpms/perl-UNIVERSAL-can/F-12 .cvsignore, 1.3, 1.4 perl-UNIVERSAL-can.spec, 1.6, 1.7 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list