From: Michael Schroeder <mls@suse.de>
Date: Fri, 7 Jun 2024 09:34:15 +0000 (+0200)
Subject: Use %version in the new conflict and add a changes entry
X-Git-Tag: 0.7.30~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e758a844625f7224b9a0205b6cadbb9735735905;p=thirdparty%2Flibsolv.git

Use %version in the new conflict and add a changes entry
---

diff --git a/package/libsolv.changes b/package/libsolv.changes
index a33f33b8..54a43fcb 100644
--- a/package/libsolv.changes
+++ b/package/libsolv.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun  7 11:33:19 CEST 2024 - mls@suse.de
+
+- add a conflict to older libsolv-tools to libsolv-tools-base
+
 -------------------------------------------------------------------
 Tue Apr 30 15:15:45 CEST 2024 - mls@suse.de
 
diff --git a/package/libsolv.spec.in b/package/libsolv.spec.in
index 05611e47..59562b37 100644
--- a/package/libsolv.spec.in
+++ b/package/libsolv.spec.in
@@ -171,7 +171,7 @@ reading repositories.
 Summary:        Utilities used by libzypp to manage .solv files
 Group:          System/Management
 Provides:       libsolv-tools:%{_bindir}/repo2solv
-Conflicts:      libsolv-tools < 0.7.29
+Conflicts:      libsolv-tools < %{version}
 
 %description tools-base
 This subpackage contains utilities used by libzypp to manage solv files.