From 2a2e935f803d4a85b1f059dbfa2297827fc4db77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Thu, 5 Jul 2018 13:40:00 +0300 Subject: [PATCH] Updated to 0.38.5 --- .abf.yml | 5 +-- README.install.urpmi | 5 --- cherrytree-0.37.6-cherrytree.1 | 36 ---------------- cherrytree-0.37.6-desktop.patch | 18 -------- cherrytree.spec | 76 ++++++++++++--------------------- 5 files changed, 29 insertions(+), 111 deletions(-) delete mode 100644 README.install.urpmi delete mode 100644 cherrytree-0.37.6-cherrytree.1 delete mode 100644 cherrytree-0.37.6-desktop.patch diff --git a/.abf.yml b/.abf.yml index 95a6c57..f4c552b 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,3 @@ sources: - cherrytree-0.38.4.tar.xz: bc81ae2f6c6566639c5906b3754bf97c6c16b4d4 - #cherrytree-0.37.6-cherrytree.mo: 7d5218d886a2f876d790a58d812e3d6d71a442d2 - CherrytreeManual.ctb.tar.xz: e930f1b15640b0b0e974e20407452c48ef6964c8 + CherrytreeManual.ctb.tar.xz: e930f1b15640b0b0e974e20407452c48ef6964c8 + cherrytree-0.38.5.tar.xz: 4f7b231aa71523617c2a784932a29864a098da13 diff --git a/README.install.urpmi b/README.install.urpmi deleted file mode 100644 index 14ce857..0000000 --- a/README.install.urpmi +++ /dev/null @@ -1,5 +0,0 @@ -=== English === -CherryTree user manual: /usr/share/doc/CherrytreeManual.ctb - -=== Russian === -Руководство пользователя CherryTree: /usr/share/doc/CherrytreeManual.ctb diff --git a/cherrytree-0.37.6-cherrytree.1 b/cherrytree-0.37.6-cherrytree.1 deleted file mode 100644 index 864216f..0000000 --- a/cherrytree-0.37.6-cherrytree.1 +++ /dev/null @@ -1,36 +0,0 @@ -.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.37.6-desktop.patch b/cherrytree-0.37.6-desktop.patch deleted file mode 100644 index 4c4c268..0000000 --- a/cherrytree-0.37.6-desktop.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 80d6c08..ddecc08 100644 --- a/cherrytree.spec +++ b/cherrytree.spec @@ -1,18 +1,16 @@ -Name: cherrytree -Version: 0.38.4 -Release: 1 Summary: Hierarchical note taking application +Name: cherrytree +Version: 0.38.5 +Release: 1 License: GPLv3+ Group: Office -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.1 -Source3: README.install.urpmi -Patch0: %name-%version-desktop.patch +Source2: %{name}-0.38.4-%{name}.1 +Patch0: %{name}-0.38.4-desktop.patch BuildArch: noarch -BuildRequires: python -BuildRequires: python-devel +BuildRequires: pkgconfig(python) BuildRequires: gettext Requires: python Requires: p7zip @@ -24,12 +22,6 @@ 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. The Main Features: @@ -40,19 +32,19 @@ 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. -%files -f %name.lang -%_bindir/%{name} -%{_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 +%files -f %{name}.lang +%doc changelog.txt license.txt CherrytreeManual.ctb +%{_bindir}/%{name} +%{_datadir}/%{name}/glade/* +%{_datadir}/%{name}/language-specs/* +%{_datadir}/%{name}/modules/* +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/mime/packages/%{name}.xml +%{_iconsdir}/hicolor/scalable/apps/%{name}.svg %{_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 +%{_mandir}/ru/man1/%{name}.1.xz +%{py_puresitedir}/CherryTree-%{version}-py2.7.egg-info #---------------------------------------------------------------------------- @@ -64,29 +56,15 @@ Cherrytree is a hierarchical note taking application. The Main Features: python setup.py build %install -%__python2 setup.py install --prefix=%buildroot/usr -f +python 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 +rm -rf %{buildroot}%{_datadir}/application-registry +rm -rf %{buildroot}%{_datadir}/mime-info # Menu entry check -desktop-file-validate %buildroot%{_datadir}/applications/%name.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop # Fix icon file permissions -chmod 0644 %buildroot%{_iconsdir}/hicolor/scalable/apps/%name.svg +chmod 0644 %{buildroot}%{_iconsdir}/hicolor/scalable/apps/%{name}.svg # Add man in Russian -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 - -%postun -if [ $1 = 0 ]; then - %_update_desktop_database_bin %_datadir/applications - %_update_icon_cache_bin %_iconsdir/hicolor - %_update_mime_database_bin %_datadir/mime -fi +install -D %SOURCE2 %{buildroot}%{_mandir}/ru/man1/%{name}.1 +%find_lang %{name}