OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/cherrytree?expand=0&rev=123

2020-02-22 17:08:52 +00:00 · 2020-02-22 17:08:52 +00:00 · 4d496d1fff
commit 4d496d1fff
parent b72745b810
5 changed files with 1064 additions and 120 deletions
--- a/cherrytree-0.14.tar.bz2
+++ b/cherrytree-0.14.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a640b3e505b36902f8d825bd88a9e4663f38ecf26ec79c2da5b424062177b9ca
-size 486021
--- a/cherrytree-0.38.9.tar.xz
+++ b/cherrytree-0.38.9.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc16669e81e7f981f1b51671171a55035febf2ea80e801c0dd7ff52763025475
+size 7807144
--- a/cherrytree-remove-shebang-line.patch
+++ b/cherrytree-remove-shebang-line.patch
@ -1,72 +0,0 @@
-diff -ur cherrytree-0.14//modules/config.py cherrytree-0.14-new//modules/config.py
--- cherrytree-0.14//modules/config.py	2010-08-23 22:42:19.000000000 +0530
-+++ cherrytree-0.14-new//modules/config.py	2010-08-30 23:55:07.447633033 +0530
-@@ -1,4 +1,3 @@
-#!/usr/bin/env python
- # -*- coding: UTF-8 -*-
- #
- #       config.py
-diff -ur cherrytree-0.14//modules/cons.py cherrytree-0.14-new//modules/cons.py
--- cherrytree-0.14//modules/cons.py	2010-08-23 15:15:29.000000000 +0530
-+++ cherrytree-0.14-new//modules/cons.py	2010-08-30 23:55:07.451542171 +0530
-@@ -1,4 +1,3 @@
-#!/usr/bin/env python
- # -*- coding: UTF-8 -*-
- #
- #       cons.py
-diff -ur cherrytree-0.14//modules/core.py cherrytree-0.14-new//modules/core.py
--- cherrytree-0.14//modules/core.py	2010-08-23 22:39:53.000000000 +0530
-+++ cherrytree-0.14-new//modules/core.py	2010-08-30 23:55:07.468651734 +0530
-@@ -1,4 +1,3 @@
-#!/usr/bin/env python
- # -*- coding: UTF-8 -*-
- #
- #       core.py
-diff -ur cherrytree-0.14//modules/imports.py cherrytree-0.14-new//modules/imports.py
--- cherrytree-0.14//modules/imports.py	2010-08-16 20:28:24.000000000 +0530
-+++ cherrytree-0.14-new//modules/imports.py	2010-08-30 23:55:07.472223361 +0530
-@@ -1,4 +1,3 @@
-#!/usr/bin/env python
- # -*- coding: UTF-8 -*-
- #
- #       imports.py
-diff -ur cherrytree-0.14//modules/lists.py cherrytree-0.14-new//modules/lists.py
--- cherrytree-0.14//modules/lists.py	2010-08-17 00:22:10.000000000 +0530
-+++ cherrytree-0.14-new//modules/lists.py	2010-08-30 23:55:07.474545949 +0530
-@@ -1,4 +1,3 @@
-#!/usr/bin/env python
- # -*- coding: UTF-8 -*-
- #
- #       lists.py
-diff -ur cherrytree-0.14//modules/machines.py cherrytree-0.14-new//modules/machines.py
--- cherrytree-0.14//modules/machines.py	2010-08-22 22:51:31.000000000 +0530
-+++ cherrytree-0.14-new//modules/machines.py	2010-08-30 23:55:07.476562103 +0530
-@@ -1,4 +1,3 @@
-#!/usr/bin/env python
- # -*- coding: UTF-8 -*-
- #
- #       machines.py
-diff -ur cherrytree-0.14//modules/printing.py cherrytree-0.14-new//modules/printing.py
--- cherrytree-0.14//modules/printing.py	2010-08-23 01:54:26.000000000 +0530
-+++ cherrytree-0.14-new//modules/printing.py	2010-08-30 23:55:07.480520358 +0530
-@@ -1,4 +1,3 @@
-#!/usr/bin/env python
- # -*- coding: UTF-8 -*-
- #
- #       printing.py
-diff -ur cherrytree-0.14//modules/support.py cherrytree-0.14-new//modules/support.py
--- cherrytree-0.14//modules/support.py	2010-08-16 20:28:24.000000000 +0530
-+++ cherrytree-0.14-new//modules/support.py	2010-08-30 23:55:07.481526946 +0530
-@@ -1,4 +1,3 @@
-#!/usr/bin/env python
- # -*- coding: UTF-8 -*-
- #
- #       support.py
-diff -ur cherrytree-0.14//modules/tables.py cherrytree-0.14-new//modules/tables.py
--- cherrytree-0.14//modules/tables.py	2010-08-17 20:59:04.000000000 +0530
-+++ cherrytree-0.14-new//modules/tables.py	2010-08-30 23:55:07.481526946 +0530
-@@ -1,4 +1,3 @@
-#!/usr/bin/env python
- # -*- coding: UTF-8 -*-
- #
- #       tables.py
--- a/cherrytree.changes
+++ b/cherrytree.changes
--- a/cherrytree.spec
+++ b/cherrytree.spec
@ -1,7 +1,7 @@
 #
-# spec file for package cherrytree (Version 0.14)
+# spec file for package cherrytree
 #
-# Copyright 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -12,32 +12,35 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
 Name:           cherrytree
-Version:        0.14
-Release:        1
-License:        GPLv2+
+Version:        0.38.9
+Release:        0
 Summary:        A hierarchical note taking application
-Url:            http://www.giuspen.com/cherrytree/
+License:        GPL-3.0-or-later
 Group:          Productivity/Office/Other
-Source:         %{name}-%{version}.tar.bz2
-# PATCH-FIX-OPENSUSE %{name}-remove-shebang-line.patch badshah400@gmail.com -- delete shebang lines in .py files
-Patch0:         %{name}-remove-shebang-line.patch
+URL:            https://www.giuspen.com/cherrytree/
+Source:         http://www.giuspen.com/software/%{name}-%{version}.tar.xz
 BuildRequires:  desktop-file-utils
+BuildRequires:  python-enchant
 BuildRequires:  python-gtk
 BuildRequires:  python-gtksourceview
+# We need the %%mime_database_* macros
+BuildRequires:  shared-mime-info
 BuildRequires:  update-desktop-files
-Requires:       %{name}-lang = %{version}
 Requires:       python-gtk
 Requires:       python-gtksourceview
-Requires(post): shared-mime-info
-Requires(postun): shared-mime-info
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} >= 1120
+Requires:       python-xml
 BuildArch:      noarch
+# For password-protected format
+%if 0%{?suse_version} > 1500
+Recommends:     p7zip-full
+%else
+Recommends:     p7zip
 %endif
-%py_requires
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}

 %description
 A hierarchical note taking application, featuring rich text and syntax
@ -45,49 +48,34 @@ highlighting, storing all the data (including images) in a single xml
 file with extension ".ctd".

 %lang_package
+
 %prep
 %setup -q
-%patch0 -p1
+# Fix rpm runtime dependency rpmlint error replace the shebang in all the scripts with %%{_bindir}/python3
+find . -type f -exec perl -pi -e 'BEGIN{undef $/};s[^#\!/usr/bin/env python2][#\!%{_bindir}/python2]' {} \;

 %build

 %install
-%{__python} setup.py install --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --root=%{buildroot}
-rm %{buildroot}%{_datadir}/cherrytree/glade/cherrytree.glade.h
+python setup.py install --prefix=%{_prefix} --exec-prefix=%{_prefix} --root=%{buildroot}
 # Remove old mime registration files
-rm -f %{buildroot}%{_datadir}/application-registry/cherrytree.*
-rm -f %{buildroot}%{_datadir}/mime-info/cherrytree.*
-%find_lang %{name}
+rm %{buildroot}%{_datadir}/application-registry/cherrytree.*
+rm %{buildroot}%{_datadir}/mime-info/cherrytree.*
+%find_lang %{name} %{?no_lang_C}
 %suse_update_desktop_file -G "Hierarchical Notes Utility" cherrytree TextEditor

-%clean
-rm -rf %{buildroot}
-
-%post
-%if 0%{?suse_version} >= 1140
-%icon_theme_cache_post
-%else
-gtk-update-icon-cache %{_datadir}/icons/hicolor || true
-%endif
-update-mime-database %{_datadir}/mime
-
-%postun
-%if 0%{?suse_version} >= 1140
-%icon_theme_cache_postun
-%else
-gtk-update-icon-cache %{_datadir}/icons/hicolor || true
-%endif
-update-mime-database %{_datadir}/mime
-
 %files
-%defattr(-,root,root)
-%doc changelog license
+%license license.txt
+%doc changelog.txt
 %{_bindir}/cherrytree
+%dir %{_datadir}/metainfo
+%{_datadir}/metainfo/cherrytree.appdata.xml
 %{_datadir}/applications/cherrytree.desktop
 %{_datadir}/cherrytree/
 %{_datadir}/icons/hicolor/scalable/apps/cherrytree.svg
 %{_datadir}/mime/packages/cherrytree.xml
-%{python_sitelib}/CherryTree-0.14-py2.6.egg-info
+%{_mandir}/man1/cherrytree.1%{?ext_man}
+%{python_sitelib}/CherryTree-%{version}-py%{python_version}.egg-info

 %files lang -f %{name}.lang