[Zim] Update to 0.54 (#740211)
cheeselee
cheeselee at fedoraproject.org
Fri Dec 23 03:51:50 UTC 2011
commit cbeeeaa2fa7a5f73b1a47e4a9317f7933ef9f02e
Author: Robin Lee <cheeselee at fedoraproject.org>
Date: Fri Dec 23 11:51:44 2011 +0800
Update to 0.54 (#740211)
.gitignore | 1 +
Zim.spec | 15 +++++++++++----
sources | 2 +-
zim-0.54-desktop.patch | 19 +++++++++++++++++++
4 files changed, 32 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b7ba21..bf14745 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/zim-0.51.tar.gz
/zim-0.52.tar.gz
/zim-0.53.tar.gz
+/zim-0.54.tar.gz
diff --git a/Zim.spec b/Zim.spec
index 9d7ccd6..18b275e 100644
--- a/Zim.spec
+++ b/Zim.spec
@@ -1,5 +1,5 @@
Name: Zim
-Version: 0.53
+Version: 0.54
Release: 1%{?dist}
Summary: Desktop wiki & notekeeper
@@ -8,6 +8,8 @@ Group: Applications/Editors
License: GPLv2+ and LGPLv3+
URL: http://zim-wiki.org/
Source0: http://www.zim-wiki.org/downloads/zim-%{version}.tar.gz
+# https://bugs.launchpad.net/zim/+bug/907979
+Patch0: zim-0.54-desktop.patch
BuildArch: noarch
BuildRequires: desktop-file-utils
@@ -27,6 +29,7 @@ or to serve as a personal scratch book.
%prep
%setup -q -n zim-%{version}
+%patch0 -p1
%build
./setup.py build
@@ -41,7 +44,6 @@ sed -i -e '/^#!\//, 1d' %{buildroot}%{python_sitelib}/zim/inc/xdot.py \
%find_lang zim
-%check
desktop-file-validate %{buildroot}%{_datadir}/applications/zim.desktop
%clean
@@ -72,12 +74,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/pixmaps/*
%{_datadir}/applications/*
%{_datadir}/mime/packages/zim.xml
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/icons/hicolor/*/mimetypes/*
+%{_iconsbasedir}/*/apps/*
+%{_iconsbasedir}/*/mimetypes/*
+# No package in Fedora provides such directories
+%{_iconsdir}/ubuntu-mono-*/
%{python_sitelib}/zim-*.egg-info
%{python_sitelib}/zim/
%changelog
+* Fri Dec 23 2011 Robin Lee <cheeselee at fedoraproject.org> - 0.54-1
+- Update to 0.54 (#740211)
+
* Tue Sep 20 2011 Robin Lee <cheeselee at fedoraproject.org> - 0.53-1
- Update to 0.53 (#702811, #708471, #719889, #720434, #727804)
diff --git a/sources b/sources
index bce167a..4649295 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f100913a945a09bedf74f776a2d9bebd zim-0.53.tar.gz
+a66af7ef55ce1af20e988d8b4c3196ee zim-0.54.tar.gz
diff --git a/zim-0.54-desktop.patch b/zim-0.54-desktop.patch
new file mode 100644
index 0000000..378a230
--- /dev/null
+++ b/zim-0.54-desktop.patch
@@ -0,0 +1,19 @@
+diff --git a/xdg/zim.desktop b/xdg/zim.desktop
+index ca894a2..80ac29d 100644
+--- a/xdg/zim.desktop
++++ b/xdg/zim.desktop
+@@ -92,12 +92,12 @@ Comment[zh_TW]=以維基樣式編輯文字檔案
+ GenericName[zh_TW]=文字編輯器
+ X-Ayatana-Desktop-Shortcuts=QuickNote;QuickNoteClipboard;
+
+-[QuickNote Shortcut Group]
++[X-QuickNote Shortcut Group]
+ Name=Quick Note
+ Exec=zim --plugin quicknote
+ TargetEnvironment=Unity
+
+-[QuickNoteClipboard Shortcut Group]
++[X-QuickNoteClipboard Shortcut Group]
+ Name=Quick Note from Clipboard
+ Exec=zim --plugin quicknote input=clipboard
+ TargetEnvironment=Unity
More information about the scm-commits
mailing list