From 52f67df3f5f9fe084b1a624f373e72bdd50863aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 30 May 2024 15:47:21 +0200
Subject: [PATCH] Update to 0.7.29 (RHEL-32212)

Resolves: RHEL-38831
Resolves: RHEL-32212
---
 .gitignore   |  1 +
 libsolv.spec | 16 +++++++++++++---
 sources      |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2779c08..d64e0ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@
 /libsolv-0.7.25.tar.gz
 /libsolv-0.7.27.tar.gz
 /libsolv-0.7.28.tar.gz
+/libsolv-0.7.29.tar.gz
diff --git a/libsolv.spec b/libsolv.spec
index 9547e03..88604bd 100644
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -26,7 +26,7 @@
 %define __cmake_switch(b:) %[%{expand:%%{?with_%{-b*}}} ? "ON" : "OFF"]
 
 Name:           lib%{libname}
-Version:        0.7.28
+Version:        0.7.29
 Release:        %autorelease
 Summary:        Package dependency solver
 
@@ -72,11 +72,19 @@ Requires:       rpm-devel%{?_isa}
 %description devel
 Development files for %{name}.
 
+%package tools-base
+Summary:        Utilities used by libzypp to manage .solv files
+Provides:       libsolv-tools:%{_bindir}/repo2solv
+
+%description tools-base
+This subpackage contains utilities used by libzypp to manage solv files.
+
 %package tools
 Summary:        Package dependency solver tools
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 # repo2solv dependencies. Used as execl()
 Requires:       /usr/bin/find
+Requires:       libsolv-tools-base = %{version}
 
 %description tools
 Package dependency solver tools.
@@ -199,18 +207,20 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 %{_bindir}/%{1}\
 %{_mandir}/man1/%{1}.1*
 
+%files tools-base
+%solv_tool repo2solv
+%solv_tool rpmdb2solv
+
 %files tools
 %solv_tool deltainfoxml2solv
 %solv_tool dumpsolv
 %solv_tool installcheck
 %solv_tool mergesolv
 %solv_tool repomdxml2solv
-%solv_tool rpmdb2solv
 %solv_tool rpmmd2solv
 %solv_tool rpms2solv
 %solv_tool testsolv
 %solv_tool updateinfoxml2solv
-%solv_tool repo2solv
 %if %{with comps}
   %solv_tool comps2solv
 %endif
diff --git a/sources b/sources
index f7b7435..bd3d5d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libsolv-0.7.28.tar.gz) = c97cb031d0476248f78f099f08001c41857b414da43a9a428f77ae3525bd4d5261a76605f1b6dde4262519d495e64528edc88702241b529f90c0d5fb58bc475b
+SHA512 (libsolv-0.7.29.tar.gz) = 5c76a4f2173999a7741ba613368209ee98942a82ca910ab455d19690ddade06d69a791406495a4bd50988c032fc6aa94b613fb00d54e1a5d36d6db1e8912599c