Merge pull request #559 from dirkmueller/master

Split libsolv-tools

package/libsolv.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 22 19:16:03 UTC 2024 - Dirk Müller <[email protected]>
+
+- split libsolv-tools into libsolv-tools-base [jsc#PED-8153]
+
 -------------------------------------------------------------------
 Fri Jan 26 11:19:39 CET 2024 - [email protected]
 
@@ -483,7 +488,7 @@ Tue Feb 7 13:13:01 CET 2017 - [email protected]
 Thu Nov 10 15:09:25 CET 2016 - [email protected]
 
 - make testcase_str2solvid work with ignored packages
-- improve checks against corrupt rpm 
+- improve checks against corrupt rpm
 - add SOLVER_FLAG_FOCUS_BEST solver flag
 - rework susetags multi-line handling [bnc#1007273]
 - build both for python2 and python3

package/libsolv.spec.in

@@ -1,7 +1,7 @@
 #
 # spec file for package libsolv
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -153,6 +153,7 @@ so-called satisfiability algorithm for resolving package
 dependencies.
 
 %endif
+
 %package devel
 Summary: Development files for libsolv, a package solver
 Group: Development/Libraries/C and C++
@@ -166,13 +167,22 @@ Conflicts: libsatsolver-devel
 Development files for libsolv, a library for solving packages and
 reading repositories.
 
+%package tools-base
+Summary: Utilities used by libzypp to manage .solv files
+Group: System/Management
+Provides: libsolv-tools:%{_bindir}/repo2solv
+
+%description tools-base
+This subpackage contains utilities used by libzypp to manage solv files.
+
 %package tools
 Summary: Utilities to work with .solv files
 Group: System/Management
 Conflicts: satsolver-tools-obsolete
 Obsoletes: satsolver-tools < 0.18
 Provides: satsolver-tools = 0.18
 Requires: findutils
+Requires: libsolv-tools-base = %{version}
 
 %description tools
 libsolv is a library for solving packages and reading repositories.
@@ -295,7 +305,6 @@ make DESTDIR=%{buildroot} -C bindings/python install
 %python_compileall
 %endif
 
-
 %check
 make ARGS=--output-on-failure test
 
@@ -311,15 +320,36 @@ make ARGS=--output-on-failure test
 %{_libdir}/libsolvext.so.*
 %endif
 
+%files tools-base
+%defattr(-,root,root)
+%{_bindir}/repo2solv
+%{_bindir}/rpmdb2solv
+%{_mandir}/man1/repo2solv.1*
+%{_mandir}/man1/rpmdb2solv.1*
+
 %files tools
 %defattr(-,root,root)
 %if 0%{?suse_version}
 %exclude %{_bindir}/helix2solv
 %exclude %{_mandir}/man1/helix2solv*
 %endif
 %exclude %{_mandir}/man1/solv.1*
+%exclude %{_mandir}/man1/repo2solv.1*
+%exclude %{_mandir}/man1/rpmdb2solv.1*
 %exclude %{_bindir}/solv
-%{_bindir}/*
+%{_bindir}/appdata2solv
+%{_bindir}/comps2solv
+%{_bindir}/deltainfoxml2solv
+%{_bindir}/dumpsolv
+%{_bindir}/installcheck
+%{_bindir}/mergesolv
+%{_bindir}/repo2solv.sh
+%{_bindir}/repomdxml2solv
+%{_bindir}/rpmmd2solv
+%{_bindir}/rpms2solv
+%{_bindir}/susetags2solv
+%{_bindir}/testsolv
+%{_bindir}/updateinfoxml2solv
 %{_mandir}/man1/*
 
 %files devel
@@ -382,5 +412,4 @@ make ARGS=--output-on-failure test
 %endif
 %endif
 
-
 %changelog