diff --git a/sources b/sources index 497d205..3d9419c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cbca1d7e960d49cf249bdc7024610c1f InfoSlicer-15.tar.bz2 +3da989486c2f0c74b06deffea2781dce InfoSlicer-20.tar.bz2 diff --git a/sugar-infoslicer-usejson.patch b/sugar-infoslicer-usejson.patch deleted file mode 100644 index 39321cb..0000000 --- a/sugar-infoslicer-usejson.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 c794243..c97b1e8 100644 --- a/sugar-infoslicer.spec +++ b/sugar-infoslicer.spec @@ -1,20 +1,20 @@ Name: sugar-infoslicer -Version: 15 -Release: 4%{?dist} +Version: 20 +Release: 1%{?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 -BuildRequires: python-devel -BuildRequires: sugar-toolkit - +BuildRequires: gettext +BuildRequires: gobject-introspection-devel +BuildRequires: python-devel +BuildRequires: sugar-toolkit-gtk3-devel Requires: sugar +Requires: sugar-toolkit-gtk3 %description @@ -25,7 +25,6 @@ You can then publish the articles as a mini website. %prep %setup -q -n InfoSlicer-%{version} -%patch0 -p1 -b .json %build @@ -44,6 +43,9 @@ python ./setup.py install --prefix=%{buildroot}/%{_prefix} %changelog +* Mon Jul 22 2013 Peter Robinson 20-1 +- Release 20 + * Fri Feb 15 2013 Fedora Release Engineering - 15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild