diff --git a/_service b/_service
new file mode 100644
index 0000000..ce7ce95
--- /dev/null
+++ b/_service
@@ -0,0 +1,18 @@
+
+
+ https://github.com/giuspen/cherrytree.git
+ git
+ enable
+ master
+ enable
+ malcolmlewis@opensuse.org
+ cherrytree
+ 0.39.3+git%cd.%h
+
+
+
+ *.tar
+ xz
+
+
+
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..5423dc2
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+
+
+ https://github.com/giuspen/cherrytree.git
+ 9e116177dd2691da849edd3bf51f631c68becbd1
\ No newline at end of file
diff --git a/cherrytree-0.38.9.tar.xz b/cherrytree-0.38.9.tar.xz
deleted file mode 100644
index 6df8aab..0000000
--- a/cherrytree-0.38.9.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fc16669e81e7f981f1b51671171a55035febf2ea80e801c0dd7ff52763025475
-size 7807144
diff --git a/cherrytree-0.39.3+git20200610.9e116177.obscpio b/cherrytree-0.39.3+git20200610.9e116177.obscpio
new file mode 100644
index 0000000..80d5047
--- /dev/null
+++ b/cherrytree-0.39.3+git20200610.9e116177.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65bd8b337b957840129937ed8929434e3ae1499df76fd15912de817a8ff3f391
+size 52577806
diff --git a/cherrytree-set-git-version.patch b/cherrytree-set-git-version.patch
new file mode 100644
index 0000000..dcb8831
--- /dev/null
+++ b/cherrytree-set-git-version.patch
@@ -0,0 +1,12 @@
+diff -Naur a/future/CMakeLists.txt b/future/CMakeLists.txt
+--- a/future/CMakeLists.txt 2020-06-10 12:28:15.000000000 -0500
++++ b/future/CMakeLists.txt 2020-06-10 19:00:42.904288749 -0500
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.13.2)
+
+ project(cherrytree)
+-set(CT_VERSION "0.99.1")
++option(CT_VERSION "0.99.1")
+
+
+ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
diff --git a/cherrytree.changes b/cherrytree.changes
index 96c3487..9a08530 100644
--- a/cherrytree.changes
+++ b/cherrytree.changes
@@ -1,3 +1,91 @@
+-------------------------------------------------------------------
+Wed Jun 10 22:36:39 UTC 2020 - malcolmlewis@opensuse.org
+
+- Updated to latest git release 0.39.3+git20200610.9e116177:
+ - Build version from 'future' branch with cmake.
+- Changes from version 0.39.3:
+ * Forbid to use '<' and '>' in password in PyGtk2,
+ (gh#giuspen/cherrytree#765) - all characters will be available
+ in upcoming Gtkmm3 version currently under testing.
+ * After toggle tree visibility with tree that becomes visible,
+ the tree gets the focus (tree gets hidden, text gets the
+ focus).
+ * Possibility to disable triple click selecting the whole
+ paragraph, currently only editing directly config.cfg
+ (look for triple_click_paragraph).
+ * Translation updates.
+- Changes from version 0.39.2:
+ * Fix very slow node creation, (gh#giuspen/cherrytree#686).
+ * Fix Wrong "." processing in "Replace in Nodes Names" (RegExp
+ mode), (gh#giuspen/cherrytree#689).
+ * Fix for table's cell content lost unless you explicitly press
+ Enter, (gh#giuspen/cherrytree#700).
+ * Fix Control/command key deselects (un-highlights) text in
+ table, (gh#giuspen/cherrytree#699).
+ * Fix Keyboard shortcuts for sorting do not work,
+ (gh#giuspen/cherrytree#305).
+- Changes from version 0.39.1:
+ * Fixed export to html regressions after 0.39.0,
+ (gh#giuspen/cherrytree#668).
+ * Fixed RuntimeError: returned character can not be represented
+ in 16-bit unicode", (gh#giuspen/cherrytree#675,
+ gh#giuspen/cherrytree#664).
+ * Fixed problem with opening another note,
+ (gh#giuspen/cherrytree#679).
+ * Show node path in tooltip of Last Visited Nodes,
+ (gh#giuspen/cherrytree#680).
+ * Triple click functionality to select paragraph limited to rich
+ text as not ideal in particular for for code.
+- Changes from version 0.39.0:
+ * Improved export to html.
+ * Fixed export to pdf, picture blurry.
+ * Implemented a 'command palette' dialog to quickly access all
+ the commands in one place.
+ * Improved sorting.
+ * Improved performance of imports into cherrytree.
+ * Fixed 'recent document paths have wrong enconding',
+ (gh#giuspen/cherrytree#632).
+ * Fixed 'visited nodes history, going to todays node using key
+ binding'.
+ * Fixed 'syntax Highlighting selected first from list when
+ pressing enter', (gh#giuspen/cherrytree#657).
+ * Updated syntax highlighting language specs files for various
+ languages, (gh#giuspen/cherrytree#228,
+ gh#giuspen/cherrytree#92 and gh#giuspen/cherrytree#38).
+ * Cursor to stay inside codeBox after creation,
+ (gh#giuspen/cherrytree#655), remember: Ctrl+Space moves the
+ cursor in and out the codebox.
+ * Added triple click functionality to select paragraph.
+ * Fixed smart quotes spell check bug.
+ * Added new language Swedish.
+- Changes from version 0.38.11:
+ * Fixed regression of 0.38.10, could no longer print.
+- Changes from version 0.38.10:
+ * Bugfix: Error opening encrypted documents when path contains
+ non-ASCII characters, (gh#giuspen/cherrytree#399).
+ * Bugfix: removing the text formatting was possible in read-only
+ Node, (gh#giuspen/cherrytree#543).
+ * Bugfix: collapse all nodes at startup doesn't work with enabled
+ expand tree at mouse click, (gh#giuspen/cherrytree#569).
+ * Added support for export to pdf from command line,
+ (gh#giuspen/cherrytree#584).
+ * Supporting new syntax highlighting for language kotlin.
+ * 'reload after external update to ct* file' disabled by default,
+ (gh#giuspen/cherrytree#602).
+ * 'smart quotes auto replacement' replacing characters
+ configurable manually editing config.cfg.
+ * Added small sigma to default special chars,
+ (gh#giuspen/cherrytree#563).
+ * Added dollar as character not to be used in passwords; note
+ that all chars will be instead usable in upcoming gtkmm3
+ version, (gh#giuspen/cherrytree#545).
+ * Minor changes to support reading a document that has been
+ edited from the upcoming gtkmm3 version of cherrytree.
+ * Minor changes to support reading a config.cfg that has been
+ edited from the upcoming gtkmm3 version of cherrytree.
+- Add cherrytree-set-git-version.patch: Set git version in help
+ about.
+
-------------------------------------------------------------------
Thu Jan 30 11:09:02 UTC 2020 - Dominique Leuenberger
diff --git a/cherrytree.obsinfo b/cherrytree.obsinfo
new file mode 100644
index 0000000..6f69427
--- /dev/null
+++ b/cherrytree.obsinfo
@@ -0,0 +1,5 @@
+name: cherrytree
+version: 0.39.3+git20200610.9e116177
+mtime: 1591810095
+commit: 9e116177dd2691da849edd3bf51f631c68becbd1
+
diff --git a/cherrytree.spec b/cherrytree.spec
index 0b276d5..4b23f2a 100644
--- a/cherrytree.spec
+++ b/cherrytree.spec
@@ -1,7 +1,7 @@
#
-# spec file for package cherrytree
+# spec file for package cherrytree.spec
#
-# Copyright (c) 2019 SUSE LLC
+# # Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,35 +12,31 @@
# 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/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
Name: cherrytree
-Version: 0.38.9
+Version: 0.39.3+git20200610.9e116177
Release: 0
Summary: A hierarchical note taking application
License: GPL-3.0-or-later
Group: Productivity/Office/Other
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
+Source0: %{name}-%{version}.tar.xz
+#PATCH-FIX-OPENSUSE cherrytree-set-git-version.patch malcolmlewis@opensuse.org -- Set git version in help about.
+Patch0: cherrytree-set-git-version.patch
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: python3-lxml
BuildRequires: update-desktop-files
-Requires: python-gtk
-Requires: python-gtksourceview
-Requires: python-xml
-BuildArch: noarch
+BuildRequires: pkgconfig(gspell-1)
+BuildRequires: pkgconfig(gtkmm-3.0)
+BuildRequires: pkgconfig(gtksourceviewmm-3.0)
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(libxml++-2.6)
+BuildRequires: pkgconfig(sqlite3)
# For password-protected format
-%if 0%{?suse_version} > 1500
Recommends: p7zip-full
-%else
-Recommends: p7zip
-%endif
%description
A hierarchical note taking application, featuring rich text and syntax
@@ -50,32 +46,33 @@ file with extension ".ctd".
%lang_package
%prep
-%setup -q
-# 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]' {} \;
+%autosetup -p1
%build
+cd future
+#Disable build tests as this needs cpputest and static development files!
+%cmake -DBUILD_TESTING=OFF -DCT_VERSION=%{version}
+%cmake_build
%install
-python setup.py install --prefix=%{_prefix} --exec-prefix=%{_prefix} --root=%{buildroot}
+cd future
+%cmake_install
# Remove old mime registration files
-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
+%find_lang %{name} %{?no_lang_C}
+cp %{name}.lang ../
%files
%license license.txt
-%doc changelog.txt
+%doc changelog.old.txt changelog.txt
%{_bindir}/cherrytree
%dir %{_datadir}/metainfo
-%{_datadir}/metainfo/cherrytree.appdata.xml
+%{_datadir}/metainfo/com.giuspen.cherrytree.metainfo.xml
%{_datadir}/applications/cherrytree.desktop
%{_datadir}/cherrytree/
%{_datadir}/icons/hicolor/scalable/apps/cherrytree.svg
-%{_datadir}/mime/packages/cherrytree.xml
%{_mandir}/man1/cherrytree.1%{?ext_man}
-%{python_sitelib}/CherryTree-%{version}-py%{python_version}.egg-info
%files lang -f %{name}.lang