diff --git a/.abf.yml b/.abf.yml index a449030..fa289d1 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,2 @@ -removed_sources: - cherrytree-0.25.4.tar.gz: bd87be5631a084587548f8d096245eb99edaf3b4 sources: cherrytree-0.29.tar.xz: 82ca79d89d4310318721fa01315f50d51d1e10f0 diff --git a/cherrytree.spec b/cherrytree.spec index b180407..4b33824 100644 --- a/cherrytree.spec +++ b/cherrytree.spec @@ -1,46 +1,34 @@ -# get python version -%global py_ver %(if [ -f "%{__python}" ]; then %{__python} -c "import sys; sys.stdout.write(sys.version[:3])"; else echo 0; fi;) +Name: cherrytree +Version: 0.29 +Release: 1 +Summary: Hierarchical note taking application -Name: cherrytree -Version: 0.29 -Release: 1%{?dist} -Summary: Hierarchical note taking application +Group: Office +License: GPLv2+ +URL: http://www.giuspen.com/cherrytree/ +Source0: http://www.giuspen.com/software/%{name}-%{version}.tar.xz -Group: Office -License: GPLv2+ -URL: http://www.giuspen.com/cherrytree/ -Source0: http://www.giuspen.com/software/%{name}-%{version}.tar.xz - -BuildArch: noarch -BuildRequires: pkgconfig(python) -BuildRequires: desktop-file-utils -BuildRequires: gettext -Requires: python(abi) = %{py_ver} -Requires: pygtk2 -Requires: python-gobject -Requires: python-gtksourceview -Requires: p7zip +BuildArch: noarch +BuildRequires: pkgconfig(python) +BuildRequires: gettext +Requires: pygtk2 +Requires: python-gobject +Requires: python-gtksourceview +Requires: p7zip %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". - %prep %setup -q -# remove shebang to make rpmlint happy -#sed '/\/usr\/bin\/env/d' modules/main.py > modules/main.py.new && \ -# touch -r modules/main.py modules/main.py.new && \ -# mv modules/main.py.new modules/main.py - %build -%{__python} setup.py build - +python setup.py build %install -%{__python} setup.py install -O1 --root %{buildroot} +python setup.py install -O1 --root %{buildroot} # don't include useless egg rm -rf %{buildroot}%{python_sitelib} @@ -51,24 +39,6 @@ rm -rf %{buildroot}%{_datadir}/mime-info/ %find_lang %{name} - -%post -update-desktop-database &> /dev/null || : -update-mime-database %{_datadir}/mime &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -update-desktop-database &> /dev/null || : -update-mime-database %{_datadir}/mime &> /dev/null || : -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %files -f %{name}.lang %doc changelog.txt license.txt %{_bindir}/%{name} @@ -78,7 +48,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/mime/packages/%{name}.xml %{_mandir}/man1/*.1* - %changelog * Thu Jan 10 2013 Eugene Budanov - Update to version 0.29