From e888a0d523fa2ac987639b3a1a70a7af1339cfee06830828d31fae44b91b2a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Wed, 21 Aug 2024 17:33:18 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main combustion revision
 2406155999f413bd75a00206b3eb62fe

---
 _servicedata                | 2 +-
 combustion-1.4+git4.obscpio | 3 +++
 combustion-1.4.obscpio      | 3 ---
 combustion.changes          | 9 +++++++++
 combustion.obsinfo          | 6 +++---
 combustion.spec             | 2 +-
 6 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 combustion-1.4+git4.obscpio
 delete mode 100644 combustion-1.4.obscpio

diff --git a/_servicedata b/_servicedata
index f8d0265..938d18c 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/combustion.git</param>
-              <param name="changesrevision">ce777bfa81279a2b746b13abb766a8613b26ae1a</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">ca13ffa33d710d93bd3b19ec5eda8762343ea7b7</param></service></servicedata>
\ No newline at end of file
diff --git a/combustion-1.4+git4.obscpio b/combustion-1.4+git4.obscpio
new file mode 100644
index 0000000..304a0f7
--- /dev/null
+++ b/combustion-1.4+git4.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbcb8cb1ebad574897c2810f1444f18f8aaa453501afa5e67566b8ff30aa9a04
+size 58379
diff --git a/combustion-1.4.obscpio b/combustion-1.4.obscpio
deleted file mode 100644
index a31cca7..0000000
--- a/combustion-1.4.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2cd7fe2b9628a852414e5e5bbda1bd9d6557e41bddeabe61e2e7b43fb5f6df30
-size 49674
diff --git a/combustion.changes b/combustion.changes
index 1d46737..529347a 100644
--- a/combustion.changes
+++ b/combustion.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug 12 12:52:38 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Update to version 1.4+git4:
+  * Add basic automated testing
+  * Don't wait for other config sources if combustion.url is set
+  * Improve documentation for config sources a bit
+  * Stop gpg-agent before umounting /sysroot
+
 -------------------------------------------------------------------
 Tue Aug 06 13:39:27 UTC 2024 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/combustion.obsinfo b/combustion.obsinfo
index ff394a8..42b75a3 100644
--- a/combustion.obsinfo
+++ b/combustion.obsinfo
@@ -1,4 +1,4 @@
 name: combustion
-version: 1.4
-mtime: 1722951423
-commit: ce777bfa81279a2b746b13abb766a8613b26ae1a
+version: 1.4+git4
+mtime: 1723466937
+commit: ca13ffa33d710d93bd3b19ec5eda8762343ea7b7
diff --git a/combustion.spec b/combustion.spec
index f328476..a2e09f3 100644
--- a/combustion.spec
+++ b/combustion.spec
@@ -17,7 +17,7 @@
 
 
 Name:           combustion
-Version:        1.4
+Version:        1.4+git4
 Release:        0
 Summary:        System for initial configuration of appliances
 License:        GPL-2.0-or-later