diff --git a/.abf.yml b/.abf.yml index c427f20..95a6c57 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,4 @@ sources: - cherrytree-0.37.6.tar.xz: 31254b6311cf5cd9b6c20ec4ed997128d5b09e26 - cherrytree-0.37.6-cherrytree.mo: 7d5218d886a2f876d790a58d812e3d6d71a442d2 + cherrytree-0.38.4.tar.xz: bc81ae2f6c6566639c5906b3754bf97c6c16b4d4 + #cherrytree-0.37.6-cherrytree.mo: 7d5218d886a2f876d790a58d812e3d6d71a442d2 CherrytreeManual.ctb.tar.xz: e930f1b15640b0b0e974e20407452c48ef6964c8 diff --git a/cherrytree-0.37.6-path.patch b/cherrytree-0.37.6-path.patch deleted file mode 100644 index b442a0d..0000000 --- a/cherrytree-0.37.6-path.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -aru '--exclude=locale' cherrytree-0.37.6.orig/cherrytree cherrytree-0.37.6/cherrytree ---- cherrytree-0.37.6.orig/cherrytree 2016-10-03 01:28:33.000000000 +0300 -+++ cherrytree-0.37.6/cherrytree 2016-10-28 16:29:34.740448735 +0300 -@@ -42,7 +42,7 @@ - MODULES_PATH = os.path.join(SCRIPT_DIR, 'modules') - else: - # installed -- SHARE_PATH = os.path.join(os.path.dirname(SCRIPT_DIR), 'share') -+ SHARE_PATH = os.path.join(os.path.dirname(SCRIPT_DIR), 'lib/python2.7/site-packages') - MODULES_PATH = os.path.join(SHARE_PATH, 'cherrytree', 'modules') - __builtin__.SHARE_PATH = SHARE_PATH - sys.path.insert(0, MODULES_PATH) -diff -aru '--exclude=locale' cherrytree-0.37.6.orig/modules/cons.py cherrytree-0.37.6/modules/cons.py ---- cherrytree-0.37.6.orig/modules/cons.py 2016-10-25 01:37:03.000000000 +0300 -+++ cherrytree-0.37.6/modules/cons.py 2016-11-17 22:49:23.560031470 +0300 -@@ -45,13 +45,12 @@ - if SHARE_PATH == os.path.dirname(MODULES_PATH): - GLADE_PATH = os.path.join(SHARE_PATH, "glade/") - SPECS_PATH = os.path.join(SHARE_PATH, 'language-specs/') -- LOCALE_PATH = os.path.join(SHARE_PATH, 'locale/') - if os.path.isfile(os.path.join(SHARE_PATH, 'config.cfg')): - CONFIG_DIR = SHARE_PATH - else: - GLADE_PATH = os.path.join(SHARE_PATH, 'cherrytree', 'glade/') - SPECS_PATH = os.path.join(SHARE_PATH, 'cherrytree', 'language-specs') -- LOCALE_PATH = os.path.join(SHARE_PATH, 'locale') -+LOCALE_PATH = '/usr/share/locale/' - CONFIG_PATH = os.path.join(CONFIG_DIR, 'config.cfg') - LANG_PATH = os.path.join(CONFIG_DIR, 'lang') - IMG_PATH = os.path.join(CONFIG_DIR, 'img_tmp.png') -diff -aru '--exclude=locale' cherrytree-0.37.6.orig/setup.py cherrytree-0.37.6/setup.py ---- cherrytree-0.37.6.orig/setup.py 2016-01-08 22:50:50.000000000 +0300 -+++ cherrytree-0.37.6/setup.py 2016-11-15 13:00:45.692233286 +0300 -@@ -185,12 +185,12 @@ - author = "Giuseppe Penone", - author_email = "giuspen@gmail.com", - url = "http://www.giuspen.com/cherrytree/", -- license = "GPL", -+ license = "GPLv3+", - data_files = [ - ("share/icons/hicolor/scalable/apps", ["glade/svg/cherrytree.svg"] ), -- ("share/cherrytree/glade", glob.glob("glade/*.*") ), -- ("share/cherrytree/language-specs", glob.glob("language-specs/*.lang") ), -- ("share/cherrytree/modules", glob.glob("modules/*.py") ), -+ ("lib/python2.7/site-packages/cherrytree/glade", glob.glob("glade/*.*") ), -+ ("lib/python2.7/site-packages/cherrytree/language-specs", glob.glob("language-specs/*.lang") ), -+ ("lib/python2.7/site-packages/cherrytree/modules", glob.glob("modules/*") ), - ("share/mime/packages", ["linux/cherrytree.xml"]), - ("share/mime-info", ["linux/cherrytree.mime", "linux/cherrytree.keys"]), - ("share/application-registry", ["linux/cherrytree.applications"]), -@@ -205,4 +205,4 @@ - }, - distclass=CherryTreeDist - ) -- subprocess.call("update-desktop-database") -+# subprocess.call("update-desktop-database") diff --git a/cherrytree-0.38.4-cherrytree.1 b/cherrytree-0.38.4-cherrytree.1 new file mode 100644 index 0000000..864216f --- /dev/null +++ b/cherrytree-0.38.4-cherrytree.1 @@ -0,0 +1,36 @@ +.TH cherrytree 1 "28 октября 2016" "CherryTree 0.37.6" "Краткая справка" + +.SH НАЗВАНИЕ + +.B cherrytree \- Записная книжка иерархической структуры. + +.SH СИНТАКСИС + +.B cherrytree [filepath [\-n nodename] [\-x export_to_html_dir]] + +.SH ОПИСАНИЕ + +Записная книжка иерархической структуры c поддержкой форматированного текста, изображений, таблиц, программного кода, +подсветки синтакиса, поиска и замены, ссылок на ресурсы в интернет, печати, импорта/экспорта в форматах различных приложений. +Руководство пользователя CherryTree: +.B /usr/share/doc/CherrytreeManual.ctb + +.SH ОПЦИИ ЗАПУСКА + +.B "filepath" +Открыть файл \fBfilepath\fR. +.TP +.B "filepath \-n nodename" +Открыть ветку \fBnodename\fR файла \fBfilepath\fR. +.TP +.B "filepath \-x export_to_html_dir" +Экпортировать файл \fBfilepath\fR в каталог \fBexport_to_html_dir\fR. + +.SH АВТОР + +Giuseppe Penone +.PP +Эта страница написана Vincent Cheng , для проекта Debian (может быть использована и в других проектах). + +.SH ПЕРЕВОД +Виктор Набатов diff --git a/cherrytree-0.38.4-desktop.patch b/cherrytree-0.38.4-desktop.patch new file mode 100644 index 0000000..4c4c268 --- /dev/null +++ b/cherrytree-0.38.4-desktop.patch @@ -0,0 +1,18 @@ +--- cherrytree-0.37.6.orig/linux/cherrytree.desktop 2016-01-08 22:50:50.000000000 +0300 ++++ cherrytree-0.37.6/linux/cherrytree.desktop 2016-10-28 16:23:38.292956109 +0300 +@@ -1,5 +1,6 @@ + [Desktop Entry] +-Name=CherryTree ++Name=Notebook CherryTree ++Name[ru]=Записная книжка CherryTree + Comment=Hierarchical Note Taking + Comment[cs]=Hierarchická tvorba poznámek + Comment[de]=Hierarchische Notizfunktion +@@ -17,5 +18,5 @@ + Terminal=false + Type=Application + StartupNotify=true +-Categories=GNOME;GTK;Utility; +-Keywords=editor;notes;note-taking; ++Categories=Office; ++Keywords=editor;notes;note-taking;notebook; diff --git a/cherrytree.spec b/cherrytree.spec index 9545eb3..80d6c08 100644 --- a/cherrytree.spec +++ b/cherrytree.spec @@ -1,42 +1,32 @@ -Name: cherrytree -Version: 0.37.6 -Release: 3 -Summary: Hierarchical note taking application -Summary(ru): Записная книжка иерархической структуры -License: GPLv3+ -Group: Office - -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 - -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 - +Name: cherrytree +Version: 0.38.4 +Release: 1 +Summary: Hierarchical note taking application +License: GPLv3+ +Group: Office +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.1 +Source3: README.install.urpmi +Patch0: %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 @@ -50,42 +40,25 @@ Cherrytree is a hierarchical note taking application. The Main Features: * 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 +%{_datadir}/appdata/%name.appdata.xml +%{_datadir}/applications/%name.desktop +%{_datadir}/%name/glade/* +%{_datadir}/%name/language-specs/* +%{_datadir}/%name/modules/* +%{_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 -a 1 -%apply_patches +%patch0 -p1 %build python setup.py build @@ -100,36 +73,20 @@ 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 +install -D %SOURCE2 %buildroot%{_mandir}/ru/man1/%name.1 +cp -a %SOURCE3 $RPM_BUILD_DIR/%name-%version + %find_lang %name %post -%_update_desktop_database_bin %_datadir/applications -%_update_icon_cache_bin %_iconsdir/hicolor -%_update_mime_database_bin -n %_datadir/mime +%_update_desktop_database_bin %_datadir/applications +%_update_icon_cache_bin %_iconsdir/hicolor +%_update_mime_database_bin -n %_datadir/mime %postun if [ $1 = 0 ]; then - %_update_desktop_database_bin %_datadir/applications - %_update_icon_cache_bin %_iconsdir/hicolor - %_update_mime_database_bin %_datadir/mime + %_update_desktop_database_bin %_datadir/applications + %_update_icon_cache_bin %_iconsdir/hicolor + %_update_mime_database_bin %_datadir/mime fi - -%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