[dreampie] fixed #712703 - dreampie not working with python 2.3
Ionuț Arțăriși
mapleoin at fedoraproject.org
Tue Jun 14 07:55:17 UTC 2011
commit c65bc9ceceb074d7acb7354cd8b809894c0e3796
Author: Ionuț Arțăriși <iartarisi at suse.cz>
Date: Tue Jun 14 09:54:53 2011 +0200
fixed #712703 - dreampie not working with python 2.3
dreampie-1.1-setdefaultencoding.patch | 14 ++++++++++++++
dreampie.spec | 11 ++++++++++-
2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/dreampie-1.1-setdefaultencoding.patch b/dreampie-1.1-setdefaultencoding.patch
new file mode 100644
index 0000000..ebd78bc
--- /dev/null
+++ b/dreampie-1.1-setdefaultencoding.patch
@@ -0,0 +1,14 @@
+=== modified file 'share/dreampie/subp_main.py'
+--- share/dreampie/subp_main.py 2010-05-17 22:05:39 +0000
++++ share/dreampie/subp_main.py 2011-05-27 07:20:05 +0000
+@@ -27,7 +27,8 @@
+ # the -S flag, and call sys.setdefaultencoding before site.py has a chance of
+ # doing anything else.
+ import sys
+-sys.setdefaultencoding('utf-8')
++if sys.version_info[0] < 3:
++ sys.setdefaultencoding('utf-8')
+ import site
+
+ from os.path import abspath, join, dirname
+
diff --git a/dreampie.spec b/dreampie.spec
index 143a43c..137a2cc 100644
--- a/dreampie.spec
+++ b/dreampie.spec
@@ -10,7 +10,7 @@ sys.stdout.write(sys.version[:3])")}
Name: dreampie
Version: 1.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A graphical cross-platform interactive Python shell
Group: Development/Tools
@@ -23,6 +23,7 @@ License: GPLv3+ and LGPLv2+ and BSD and Python and Copyright only
URL: http://dreampie.sourceforge.net/
Source0: http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
Source1: dreampie.README.Fedora
+Patch1: dreampie-1.1-setdefaultencoding.patch
BuildRequires: python2-devel
BuildRequires: python3-devel
@@ -54,6 +55,11 @@ within %{name}.
%prep
%setup -q
+# fix bug with python3.2 where setdefaultencoding no longer exists
+# this bug has already been fixed upstream, so it can be removed after 1.1
+# https://bugs.launchpad.net/dreampie/+bug/716377
+%patch1 -b .setdefaultencoding
+
cp %{SOURCE1} ./README.Fedora
%build
@@ -91,6 +97,9 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/subp-py3
%changelog
+* Tue Jun 14 2011 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 1.1.1-1
+- fixed #712703 - dreampie not working with python 3.2
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list