[Zim/f17] bug #802750
cheeselee
cheeselee at fedoraproject.org
Sun May 27 07:49:41 UTC 2012
commit 54917be74cda37042ec8a4b78aeac3c5a6393e48
Author: Robin Lee <cheeselee at fedoraproject.org>
Date: Sun May 27 15:49:03 2012 +0800
bug #802750
Zim.spec | 13 ++++++++++++-
zim-0.56-802750.patch | 16 ++++++++++++++++
2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/Zim.spec b/Zim.spec
index 132689a..7257076 100644
--- a/Zim.spec
+++ b/Zim.spec
@@ -1,6 +1,6 @@
Name: Zim
Version: 0.56
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Desktop wiki & notekeeper
Group: Applications/Editors
@@ -11,8 +11,15 @@ Source0: http://www.zim-wiki.org/downloads/zim-%{version}.tar.gz
# https://bugs.launchpad.net/zim/+bug/1003344
# applied in upstream bzr551
Patch0: zim-0.56-markdown-import.patch
+
+# https://bugs.launchpad.net/fedora/+bug/915037
+# applied in upstream bzr549
+Patch1: zim-0.56-802750.patch
+
BuildArch: noarch
+
+
BuildRequires: desktop-file-utils
BuildRequires: python2-devel >= 2.5
BuildRequires: pygobject2
@@ -31,6 +38,7 @@ or to serve as a personal scratch book.
%prep
%setup -q -n zim-%{version}
%patch0 -p0
+%patch1 -p0
%build
./setup.py build
@@ -83,6 +91,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{python_sitelib}/zim/
%changelog
+* Sun May 27 2012 Robin Lee <cheeselee at fedoraproject.org> - 0.56-3
+- bug #802750
+
* Thu May 24 2012 Robin Lee <cheeselee at fedoraproject.org> - 0.56-2
- BZ#822454
diff --git a/zim-0.56-802750.patch b/zim-0.56-802750.patch
new file mode 100644
index 0000000..3ea70aa
--- /dev/null
+++ b/zim-0.56-802750.patch
@@ -0,0 +1,16 @@
+=== modified file 'zim/gui/pageindex.py'
+--- zim/gui/pageindex.py 2012-03-27 19:00:32 +0000
++++ zim/gui/pageindex.py 2012-05-17 20:28:51 +0000
+@@ -204,7 +204,10 @@
+ if mypath:
+ treepath = self.get_treepath(mypath)
+ if treepath:
+- treeiter = self.get_iter(treepath)
++ try:
++ treeiter = self.get_iter(treepath)
++ except ValueError:
++ continue
+ self.emit('row-changed', treepath, treeiter)
+
+ def on_get_flags(self):
+
More information about the scm-commits
mailing list