[sugar-infoslicer] Add patch to remove cjson
Peter Robinson
pbrobinson at fedoraproject.org
Fri Dec 7 11:40:19 UTC 2012
commit ef4400cd262c8166434920263cccaf6cb1ff2536
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Fri Dec 7 11:40:06 2012 +0000
Add patch to remove cjson
sugar-infoslicer-usejson.patch | 29 +++++++++++++++++++++++++++++
sugar-infoslicer.spec | 7 ++++++-
2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/sugar-infoslicer-usejson.patch b/sugar-infoslicer-usejson.patch
new file mode 100644
index 0000000..39321cb
--- /dev/null
+++ b/sugar-infoslicer-usejson.patch
@@ -0,0 +1,29 @@
+--- InfoSlicer-15/book.py.orig 2012-05-17 12:41:53.000000000 +0100
++++ InfoSlicer-15/book.py 2012-12-07 11:38:28.014395173 +0000
+@@ -17,7 +17,7 @@
+ import uuid
+ import logging
+ import gobject
+-import cjson
++import json
+ import shutil
+ import zipfile
+ from gobject import SIGNAL_RUN_FIRST, TYPE_PYOBJECT
+@@ -124,7 +124,7 @@
+ 'revision' : self.revision }
+
+ index = file(os.path.join(self.root, 'index'), 'w')
+- index.write(cjson.encode(data))
++ index.write(json.dumps(data))
+ index.close()
+
+ def sync(self):
+@@ -142,7 +142,7 @@
+ if os.path.exists(self.root):
+ try:
+ index = file(os.path.join(self.root, 'index'), 'r')
+- data = cjson.decode(index.read())
++ data = json.loads(index.read())
+ self.uid = data['uid']
+ self.index = data['index']
+ self.revision = data['revision']
diff --git a/sugar-infoslicer.spec b/sugar-infoslicer.spec
index 0bb46f0..5c87dbc 100644
--- a/sugar-infoslicer.spec
+++ b/sugar-infoslicer.spec
@@ -1,12 +1,13 @@
Name: sugar-infoslicer
Version: 15
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Downloader for articles from Wikipedia
Group: Sugar/Activities
License: GPLv2+
URL: http://sugarlabs.org/go/Activities/InfoSlicer
Source0: http://download.sugarlabs.org/sources/honey/InfoSlicer/InfoSlicer-%{version}.tar.bz2
+Patch0: sugar-infoslicer-usejson.patch
BuildArch: noarch
BuildRequires: gettext
@@ -24,6 +25,7 @@ You can then publish the articles as a mini website.
%prep
%setup -q -n InfoSlicer-%{version}
+%patch0 -p1 -b .json
%build
@@ -42,6 +44,9 @@ python ./setup.py install --prefix=%{buildroot}/%{_prefix}
%changelog
+* Fri Dec 7 2012 Peter Robinson <pbrobinson at fedoraproject.org> 15-3
+- Add patch to remove cjson
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list