From 24d7d2a2effd853ae8988ee03e21add94b2135b23e4875b6217c02a4c2acc013 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Fri, 29 Mar 2024 10:07:49 +0000
Subject: [PATCH] Accepting request 1163413 from
 home:malcolmlewis:branches:GNOME:Apps

- Update to version 1.1.1+2:
  + Fixed regression after one search with replace, all subsequent
    searches open replace dialog, (gh#giuspen/cherrytree#2468).
  + Fixed regression searching in multiple nodes, only nodes names
    and tags, not working, (gh#giuspen/cherrytree#2461 and
    gh#giuspen/cherrytree#2408).
  + fixed import from cherrytree sqlite document having shared
    nodes.

OBS-URL: https://build.opensuse.org/request/show/1163413
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/cherrytree?expand=0&rev=190
---
 _servicedata               |  2 +-
 cherrytree-1.1.0+7.obscpio |  3 ---
 cherrytree-1.1.1+2.obscpio |  3 +++
 cherrytree.changes         | 12 ++++++++++++
 cherrytree.obsinfo         |  6 +++---
 cherrytree.spec            |  5 ++++-
 6 files changed, 23 insertions(+), 8 deletions(-)
 delete mode 100644 cherrytree-1.1.0+7.obscpio
 create mode 100644 cherrytree-1.1.1+2.obscpio

diff --git a/_servicedata b/_servicedata
index f491dab..1cd4ecf 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/giuspen/cherrytree.git</param>
-              <param name="changesrevision">691f0da8ebccca9cdc9eb9542a10f2409b26e94e</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">eaa3478a9e09878d94ef015f48f8416d506a5a0d</param></service></servicedata>
\ No newline at end of file
diff --git a/cherrytree-1.1.0+7.obscpio b/cherrytree-1.1.0+7.obscpio
deleted file mode 100644
index e196e27..0000000
--- a/cherrytree-1.1.0+7.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b513f116d99e129fe42c5df0fd418e79c51babb33156dd152c47cefda1855e0
-size 83493902
diff --git a/cherrytree-1.1.1+2.obscpio b/cherrytree-1.1.1+2.obscpio
new file mode 100644
index 0000000..895a7e9
--- /dev/null
+++ b/cherrytree-1.1.1+2.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56026b8080d580283f0c12654013f4878939c04cc95843463550f7a0f89f0f40
+size 83494926
diff --git a/cherrytree.changes b/cherrytree.changes
index bc40bc2..def06fe 100644
--- a/cherrytree.changes
+++ b/cherrytree.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Mar 29 00:19:18 UTC 2024 - malcolmlewis@opensuse.org
+
+- Update to version 1.1.1+2:
+  + Fixed regression after one search with replace, all subsequent
+    searches open replace dialog, (gh#giuspen/cherrytree#2468).
+  + Fixed regression searching in multiple nodes, only nodes names
+    and tags, not working, (gh#giuspen/cherrytree#2461 and
+    gh#giuspen/cherrytree#2408).
+  + fixed import from cherrytree sqlite document having shared
+    nodes.
+
 -------------------------------------------------------------------
 Mon Mar 25 22:08:42 UTC 2024 - malcolmlewis@opensuse.org
 
diff --git a/cherrytree.obsinfo b/cherrytree.obsinfo
index 344338b..d8cff9b 100644
--- a/cherrytree.obsinfo
+++ b/cherrytree.obsinfo
@@ -1,4 +1,4 @@
 name: cherrytree
-version: 1.1.0+7
-mtime: 1711318535
-commit: 691f0da8ebccca9cdc9eb9542a10f2409b26e94e
+version: 1.1.1+2
+mtime: 1711655990
+commit: eaa3478a9e09878d94ef015f48f8416d506a5a0d
diff --git a/cherrytree.spec b/cherrytree.spec
index 67cdc38..faa63f2 100644
--- a/cherrytree.spec
+++ b/cherrytree.spec
@@ -17,7 +17,7 @@
 
 
 Name:           cherrytree
-Version:        1.1.0+7
+Version:        1.1.1+2
 Release:        0
 Summary:        A hierarchical note taking application
 License:        GPL-3.0-or-later AND LGPL-2.1-only
@@ -68,6 +68,9 @@ rm %{buildroot}%{_datadir}/mime-info/cherrytree.*
 %find_lang %{name} %{?no_lang_C}
 %fdupes -s %{buildroot}%{_datadir}
 
+%check
+## Empty section added as per rpmlint report
+
 %files
 %license license.txt
 %doc changelog.txt