From 1411bb9561cc947ca74f0fd8b3e88812fff1dceb792fd948a991e8f39be2fb20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 21 Jun 2024 11:43:50 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main libsolv revision
 86ab92b9cd6b7b6c68d57a1e23e19ab1

---
 libsolv-0.7.29.tar.bz2 | 4 ++--
 libsolv.changes        | 8 ++++++++
 libsolv.spec           | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/libsolv-0.7.29.tar.bz2 b/libsolv-0.7.29.tar.bz2
index 1c51186..a861681 100644
--- a/libsolv-0.7.29.tar.bz2
+++ b/libsolv-0.7.29.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db55bb4af0f1ae5a5893bb319958a9d5a6c6cea9e904ffed7fd6a214864a8900
-size 597043
+oid sha256:bf0c58e23cb8f9092d13a6a116e747be27a93d40a76698299fe558e7c2ba2c13
+size 596997
diff --git a/libsolv.changes b/libsolv.changes
index 271e6dd..1e93a94 100644
--- a/libsolv.changes
+++ b/libsolv.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun  7 11:33:19 CEST 2024 - mls@suse.de
+
+- add a conflict to older libsolv-tools to libsolv-tools-base
+- report unsupported compression in solv_xfopen() with errno
+- fix return value of repodata.add_solv() in the bindings
+- fix SHA-224 oid in solv_pgpvrfy
+
 -------------------------------------------------------------------
 Tue Apr 30 15:15:45 CEST 2024 - mls@suse.de
 
diff --git a/libsolv.spec b/libsolv.spec
index 167522a..84f3a5a 100644
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -171,6 +171,7 @@ reading repositories.
 Summary:        Utilities used by libzypp to manage .solv files
 Group:          System/Management
 Provides:       libsolv-tools:%{_bindir}/repo2solv
+Conflicts:      libsolv-tools < %{version}
 
 %description tools-base
 This subpackage contains utilities used by libzypp to manage solv files.