From 9f8d6e6f7c744e7b9ea77e1f2fe5b3e399b01d5b424b4fb94468b5e5f88956be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Wed, 16 Feb 2022 16:54:52 +0000
Subject: [PATCH] Accepting request 955411 from GNOME:Next

- Update to version 0.7.18+30:
  * libappstream-builder: Fix file paths in icon tarball
- Update to version 0.7.18+29:
  * Updated translations.
- Improve _service file to handle to drop +0 in versions for when
  we are exactly on a tag.

OBS-URL: https://build.opensuse.org/request/show/955411
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/appstream-glib?expand=0&rev=147
---
 _service                         |  6 +++---
 _servicedata                     |  2 +-
 appstream-glib-0.7.18+28.obscpio |  3 ---
 appstream-glib-0.7.18+30.obscpio |  3 +++
 appstream-glib.changes           | 14 ++++++++++++++
 appstream-glib.obsinfo           |  6 +++---
 appstream-glib.spec              |  2 +-
 7 files changed, 25 insertions(+), 11 deletions(-)
 delete mode 100644 appstream-glib-0.7.18+28.obscpio
 create mode 100644 appstream-glib-0.7.18+30.obscpio

diff --git a/_service b/_service
index b8a04e4..49c48c7 100644
--- a/_service
+++ b/_service
@@ -3,10 +3,10 @@
     <param name="url">https://github.com/hughsie/appstream-glib.git</param>
     <param name="scm">git</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
-    <param name="versionrewrite-pattern">appstream_glib_(\d+)_(\d+)_(\d+)</param>
-    <param name="versionrewrite-replacement">\1.\2.\3</param>
+    <param name="versionrewrite-pattern">appstream_glib_(\d+)_(\d+)_(\d+)(\+0)?(\+[1-9][0-9]*)?</param>
+    <param name="versionrewrite-replacement">\1.\2.\3\5</param>
     <param name="changesgenerate">enable</param>
-    <param name="revision">004a4e60e2433c404e7c36b94770c94e592db0fc</param>
+    <param name="revision">349799ba1d026a18012520b9f2e1901a88ac467b</param>
 <!--
     <param name="revision">refs/tags/appstream_glib_0_7_18</param>
 -->
diff --git a/_servicedata b/_servicedata
index 19a796a..5f8188e 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">https://github.com/hughsie/appstream-glib.git</param>
-          <param name="changesrevision">004a4e60e2433c404e7c36b94770c94e592db0fc</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">349799ba1d026a18012520b9f2e1901a88ac467b</param></service></servicedata>
\ No newline at end of file
diff --git a/appstream-glib-0.7.18+28.obscpio b/appstream-glib-0.7.18+28.obscpio
deleted file mode 100644
index 6b38b7f..0000000
--- a/appstream-glib-0.7.18+28.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f47ae26d272c7d3bc11a50b46b415bf091e0376edfeb2a65f8966a34a67c18a4
-size 5167117
diff --git a/appstream-glib-0.7.18+30.obscpio b/appstream-glib-0.7.18+30.obscpio
new file mode 100644
index 0000000..7a22fe6
--- /dev/null
+++ b/appstream-glib-0.7.18+30.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08fbcc5c911bf6a585c643b21771f8c0abe414b1372e95172eefd89641c5cbbd
+size 5167117
diff --git a/appstream-glib.changes b/appstream-glib.changes
index 0cfe5cb..df7802d 100644
--- a/appstream-glib.changes
+++ b/appstream-glib.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Feb 16 14:38:50 UTC 2022 - dimstar@opensuse.org
+
+- Update to version 0.7.18+30:
+  * libappstream-builder: Fix file paths in icon tarball
+
+-------------------------------------------------------------------
+Tue Feb 15 16:43:07 UTC 2022 - dimstar@opensuse.org
+
+- Update to version 0.7.18+29:
+  * Updated translations.
+- Improve _service file to handle to drop +0 in versions for when
+  we are exactly on a tag.
+
 -------------------------------------------------------------------
 Tue Feb 08 15:58:58 UTC 2022 - bjorn.lie@gmail.com
 
diff --git a/appstream-glib.obsinfo b/appstream-glib.obsinfo
index 837d941..a4cae01 100644
--- a/appstream-glib.obsinfo
+++ b/appstream-glib.obsinfo
@@ -1,4 +1,4 @@
 name: appstream-glib
-version: 0.7.18+28
-mtime: 1644332535
-commit: 004a4e60e2433c404e7c36b94770c94e592db0fc
+version: 0.7.18+30
+mtime: 1645021796
+commit: 349799ba1d026a18012520b9f2e1901a88ac467b
diff --git a/appstream-glib.spec b/appstream-glib.spec
index a9abf55..2112329 100644
--- a/appstream-glib.spec
+++ b/appstream-glib.spec
@@ -18,7 +18,7 @@
 
 
 Name:           appstream-glib
-Version:        0.7.18+28
+Version:        0.7.18+30
 Release:        0
 Summary:        AppStream Abstraction Library
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later