From 9dd7eb9222d529be1e19b216424bcf7d8c125a0a9ecd4cb06bc996a7e9ff87c0 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 1 Dec 2020 15:18:22 +0000
Subject: [PATCH] - Update _service:   + Change to @PARENT_TAG@+@TAG_OFFSET@
 version scheme comonly used     by the GNOME Team (with +0 being stripped
 when detected).

OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/cherrytree?expand=0&rev=132
---
 _service                                        | 4 +++-
 cherrytree-0.99.24+1.obscpio                    | 3 +++
 cherrytree-0.99.24+git20201130.67860cc0.obscpio | 3 ---
 cherrytree.changes                              | 7 +++++++
 cherrytree.obsinfo                              | 2 +-
 cherrytree.spec                                 | 2 +-
 6 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 cherrytree-0.99.24+1.obscpio
 delete mode 100644 cherrytree-0.99.24+git20201130.67860cc0.obscpio

diff --git a/_service b/_service
index 491994a..a54f43f 100644
--- a/_service
+++ b/_service
@@ -7,7 +7,9 @@
     <param name="changesgenerate">enable</param>
     <param name="changesauthor">malcolmlewis@opensuse.org</param>
     <param name="filename">cherrytree</param>
-    <param name="versionformat">0.99.24+git%cd.%h</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionrewrite-pattern">(.*)\+0</param>
+    <param name="versionrewrite-replacement">\1</param>
   </service>
   <service mode="buildtime" name="tar" />
   <service mode="buildtime" name="recompress">
diff --git a/cherrytree-0.99.24+1.obscpio b/cherrytree-0.99.24+1.obscpio
new file mode 100644
index 0000000..cddfa65
--- /dev/null
+++ b/cherrytree-0.99.24+1.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed8bc31e07332a7de5d21b5a0f600708663ba2c1fe6d0a0adca845e43c2a1a7f
+size 82506254
diff --git a/cherrytree-0.99.24+git20201130.67860cc0.obscpio b/cherrytree-0.99.24+git20201130.67860cc0.obscpio
deleted file mode 100644
index eb5935b..0000000
--- a/cherrytree-0.99.24+git20201130.67860cc0.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d26d8966e399dc64ddcea4dec5ed8c007bea13abbb4d1d4a18666fb818c2820
-size 82536462
diff --git a/cherrytree.changes b/cherrytree.changes
index 4ee5df1..08fbf41 100644
--- a/cherrytree.changes
+++ b/cherrytree.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec  1 15:15:57 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update _service:
+  + Change to @PARENT_TAG@+@TAG_OFFSET@ version scheme comonly used
+    by the GNOME Team (with +0 being stripped when detected).
+
 -------------------------------------------------------------------
 Tue Dec 01 14:42:22 UTC 2020 - malcolmlewis@opensuse.org
 
diff --git a/cherrytree.obsinfo b/cherrytree.obsinfo
index 47be3cb..3912e18 100644
--- a/cherrytree.obsinfo
+++ b/cherrytree.obsinfo
@@ -1,5 +1,5 @@
 name: cherrytree
-version: 0.99.24+git20201130.67860cc0
+version: 0.99.24+1
 mtime: 1606779686
 commit: 67860cc0df2bc6ca1d3c39c164ef08485ab2811a
 
diff --git a/cherrytree.spec b/cherrytree.spec
index 2f2ec03..74e3493 100644
--- a/cherrytree.spec
+++ b/cherrytree.spec
@@ -17,7 +17,7 @@
 
 
 Name:           cherrytree
-Version:        0.99.24+git20201130.67860cc0
+Version:        0.99.24+1
 Release:        0
 Summary:        A hierarchical note taking application
 License:        GPL-3.0-or-later AND LGPL-2.1-only