From 34540465935a447d2f29a3f36d8d9f30ccee3df20188b95a20c047dc1b947d1a Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 26 Mar 2024 08:38:32 +0000
Subject: [PATCH] Accepting request 1161565 from
 home:malcolmlewis:branches:GNOME:Apps

- Fix source version error and _service file.

OBS-URL: https://build.opensuse.org/request/show/1161565
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/cherrytree?expand=0&rev=188
---
 _service                   | 2 +-
 cherrytree-1.0+7.obscpio   | 3 ---
 cherrytree-1.1.0+7.obscpio | 3 +++
 cherrytree.changes         | 5 +++++
 cherrytree.obsinfo         | 2 +-
 cherrytree.spec            | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 cherrytree-1.0+7.obscpio
 create mode 100644 cherrytree-1.1.0+7.obscpio

diff --git a/_service b/_service
index 35bd59d..d4f13e1 100644
--- a/_service
+++ b/_service
@@ -7,7 +7,7 @@
     <param name="changesgenerate">enable</param>
     <param name="filename">cherrytree</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
-    <param name="versionrewrite-pattern">v([^\+]*)(?:\+0)?((?:\+[1-9][0-9]*)?)+\1\2</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>
   <service mode="buildtime" name="tar" />
diff --git a/cherrytree-1.0+7.obscpio b/cherrytree-1.0+7.obscpio
deleted file mode 100644
index 595274c..0000000
--- a/cherrytree-1.0+7.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:faa9094b37714a2f7c4100a5a062b2db42bf3aeed89cf83bc6bc0280be5697c3
-size 83488782
diff --git a/cherrytree-1.1.0+7.obscpio b/cherrytree-1.1.0+7.obscpio
new file mode 100644
index 0000000..e196e27
--- /dev/null
+++ b/cherrytree-1.1.0+7.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b513f116d99e129fe42c5df0fd418e79c51babb33156dd152c47cefda1855e0
+size 83493902
diff --git a/cherrytree.changes b/cherrytree.changes
index 56c4d1d..bc40bc2 100644
--- a/cherrytree.changes
+++ b/cherrytree.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 25 22:08:42 UTC 2024 - malcolmlewis@opensuse.org
+
+- Fix source version error and _service file.
+
 -------------------------------------------------------------------
 Mon Mar 25 00:38:41 UTC 2024 - malcolmlewis@opensuse.org
 
diff --git a/cherrytree.obsinfo b/cherrytree.obsinfo
index 42c8a5e..344338b 100644
--- a/cherrytree.obsinfo
+++ b/cherrytree.obsinfo
@@ -1,4 +1,4 @@
 name: cherrytree
-version: 1.0+7
+version: 1.1.0+7
 mtime: 1711318535
 commit: 691f0da8ebccca9cdc9eb9542a10f2409b26e94e
diff --git a/cherrytree.spec b/cherrytree.spec
index 0f15f98..67cdc38 100644
--- a/cherrytree.spec
+++ b/cherrytree.spec
@@ -17,7 +17,7 @@
 
 
 Name:           cherrytree
-Version:        1.0+7
+Version:        1.1.0+7
 Release:        0
 Summary:        A hierarchical note taking application
 License:        GPL-3.0-or-later AND LGPL-2.1-only