From 6d8469a1d0503ff4e7f20c5e97d09615655e887a Mon Sep 17 00:00:00 2001 From: "Greenray (Victor Nabatov)" Date: Fri, 18 Nov 2016 19:56:12 +0300 Subject: [PATCH] - New version 0.37.6 - Updated translations into Russian - Added man in Russian and User's Manual --- .abf.yml | 17 +---- cherrytree.spec | 163 +++++++++++++++++++++++++++++++++++------------- 2 files changed, 122 insertions(+), 58 deletions(-) diff --git a/.abf.yml b/.abf.yml index 786b6c2..c427f20 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,15 +1,4 @@ -removed_sources: - cherrytree-0.29.tar.xz: 82ca79d89d4310318721fa01315f50d51d1e10f0 - cherrytree-0.30.5.tar.xz: dc10337df026138ceea6546e5af57c699cf7961c - cherrytree-0.32.0.tar.xz: 91dae6aa3c16d97f42a5188ccab5540032b993e9 - cherrytree-0.33.4.tar.xz: 0a5fd34324bae637e22b7e96adcc1828e936dd39 - cherrytree-0.34.0.tar.xz: 8af9fbd35aa346e70d40d3b58f1795308f5ae4e1 - cherrytree-0.34.1.tar.xz: 0048c3b7821d4785206fae32806a7ae5a3354dd3 - cherrytree-0.35.10.tar.xz: c5089077663e943e4f6229c687117cb85829b52a - cherrytree-0.35.3.tar.xz: 3b64a3dec4cb8d6d431d329dba015138d977c6a6 - cherrytree-0.35.6.tar.xz: 09d2f91172e9be3d6cbaf82d33fb2ed0a5420098 - cherrytree-0.35.7.tar.xz: a5308295d74c362b6981df52ff1aff73413d6338 - cherrytree-0.35.9.tar.xz: eb94c3c16163816176097919b99becaefc6a83e0 - cherrytree-0.36.2.tar.xz: 6f01df38c511b498f66f8f15665f4c160d8c50b2 sources: - cherrytree-0.37.4.tar.xz: d17986e0ed6d87d6a5ee300b5097bd9e66e5df7f + cherrytree-0.37.6.tar.xz: 31254b6311cf5cd9b6c20ec4ed997128d5b09e26 + cherrytree-0.37.6-cherrytree.mo: 7d5218d886a2f876d790a58d812e3d6d71a442d2 + CherrytreeManual.ctb.tar.xz: e930f1b15640b0b0e974e20407452c48ef6964c8 diff --git a/cherrytree.spec b/cherrytree.spec index b315769..ad13949 100644 --- a/cherrytree.spec +++ b/cherrytree.spec @@ -1,60 +1,135 @@ -Name: cherrytree -Version: 0.37.4 -Release: 1 -Summary: Hierarchical note taking application +Name: cherrytree +Version: 0.37.6 +Release: 1 +Summary: Hierarchical note taking application +Summary(ru): Записная книжка иерархической структуры +License: GPLv3+ +Group: Office -Group: Office -License: GPLv2+ -URL: http://www.giuspen.com/cherrytree/ -Source0: http://www.giuspen.com/software/%{name}-%{version}.tar.xz +URL: http://www.giuspen.com/cherrytree/ +Source0: http://www.giuspen.com/software/%name-%version.tar.xz +Source1: CherrytreeManual.ctb.tar.xz +Source2: %name-%version-%name.mo +Source3: %name-%version-%name.1 +Source4: README.install.urpmi -BuildArch: noarch -BuildRequires: pkgconfig(python) -BuildRequires: gettext -BuildRequires: desktop-file-utils -Requires: pygtk2 -Requires: python-gobject -Requires: python-chardet -Requires: python-gtksourceview -Requires: python-enchant -Requires: p7zip +Patch0: %name-%version-path.patch +Patch1: %name-%version-desktop.patch + +BuildArch: noarch + +BuildRequires: python +BuildRequires: python-devel +BuildRequires: gettext + +Requires: python +Requires: p7zip +Requires: pygtk2.0 +Requires: python-appindicator +Requires: python-chardet +Requires: python-dbus +Requires: python-enchant +Requires: python-gobject +Requires: python-gtksourceview +Requires: sqlite-tools + +Requires(post): desktop-file-utils +Requires(post): gtk-update-icon-cache +Requires(post): shared-mime-info + +Requires(postun): desktop-file-utils +Requires(postun): gtk-update-icon-cache +Requires(postun): shared-mime-info %description -CherryTree is a hierarchical note taking application, featuring rich text and -syntax highlighting, storing all the data (including images) in a single XML -file with extension ".ctd". +Cherrytree is a hierarchical note taking application. The Main Features: +* Rich Text supporting Images, Tables, Code Boxes, Hyperlinks and Anchors, + Spell Check, Lists. +* Syntax Highlighting supporting many programming languages. +* Password Protection, Powerful Find and Replace utilities, TOC generator. +* Print, Save as PDF, Export to HTML, Export to Plain Text. +* Import from Several other Note Taking Applications. + +%description -l ru +Записная книжка иерархической +структуры. Основные возможности: +- поддержка форматированного текста, + изображений, таблиц, кода, + гиперссылок и якорей, списков, + проверка орфографии; +- подсветка синтаксиса, поддержка + многих языков программирования; +- защита паролем, мощный поиск и + замена, генератор TOC; +- печать, экспорт в PDF, HTML, + в обычный текст; +- импорт из нескольких других + приложений для заметок; +- хранение данных в XML или SQLite + файле. + + +%files -f %name.lang +%_bindir/%{name} +%py_puresitedir/%name +%_datadir/appdata/%name.appdata.xml +%_datadir/applications/%name.desktop +%_iconsdir/hicolor/scalable/apps/%name.svg +%_datadir/mime/packages/%name.xml +%_mandir/man1/*.1.xz +%_mandir/ru/man1/%name.1.xz +%py_puresitedir/CherryTree-%version-py2.7.egg-info +%doc changelog.txt license.txt CherrytreeManual.ctb README.install.urpmi + +#---------------------------------------------------------------------------- %prep -%setup -q +%setup -q -a 1 +%apply_patches %build python setup.py build %install -python setup.py install -O1 --root %{buildroot} +%__python2 setup.py install --prefix=%buildroot/usr -f +# These are no longer in use +rm -rf %buildroot%{_datadir}/application-registry +rm -rf %buildroot%{_datadir}/mime-info +# Menu entry check +desktop-file-validate %buildroot%{_datadir}/applications/%name.desktop +# Fix icon file permissions +chmod 0644 %buildroot%{_iconsdir}/hicolor/scalable/apps/%name.svg +# Add man in Russian +install -D %SOURCE3 %buildroot%{_mandir}/ru/man1/%name.1 +cp -a %SOURCE4 $RPM_BUILD_DIR/%name-%version +cp -fa %SOURCE2 %buildroot%{_localedir}/ru/LC_MESSAGES/%name.mo +%find_lang %name -# don't include useless egg -rm -rf %{buildroot}%{python_sitelib} +%post +%_update_desktop_database_bin %_datadir/applications +%_update_icon_cache_bin %_iconsdir/hicolor +%_update_mime_database_bin -n %_datadir/mime -# these are no longer in use -rm -rf %{buildroot}%{_datadir}/application-registry/ -rm -rf %{buildroot}%{_datadir}/mime-info/ +%postun +if [ $1 = 0 ]; then + %_update_desktop_database_bin %_datadir/applications + %_update_icon_cache_bin %_iconsdir/hicolor + %_update_mime_database_bin %_datadir/mime +fi -# menu entry check -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop -#fix icon file permissions -chmod 0644 %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg - -%find_lang %{name} - -%files -f %{name}.lang -%doc changelog.txt license.txt -%{_bindir}/%{name} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/appdata/cherrytree.appdata.xml -%{_datadir}/%{name}/ -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%{_datadir}/mime/packages/%{name}.xml -%{_mandir}/man1/*.1* +%changelog +* Fri Nov 18 2016 Victor Nabatov 0.37.6-1 +- New version 0.37.6 +- Updated translations into Russian +- Added man in Russian and User's Manual +0.37.5 (October 1st, 2016) +• the password protected documents now use 7zip fastest compression resulting in faster save and slightly larger documents +• added auto apply of web links as you type in rich text nodes +• added auto apply of links to nodes as you type in rich text nodes (CamelCase nodes names only) +• added proper scrolling to cursor after pasting of multiple lines of text from the clipboard +• added palette to the color picker dialog for the node name +• fixed bugs related to export to pdf of tables and codeboxes +• limited the spell check to rich text nodes after currently unresolvable problems with plain text spell check +-- Giuseppe Penone Sat, 01 Oct 2016 12:56:00 +0100