From a4612fdff0983320fff2990975378646aa81a5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 7 Nov 2024 10:12:39 +0100 Subject: [PATCH] Sync from SUSE:ALP:Source:Standard:1.0 libsolv revision 3c1ae30e262e5f19f407b68f440a2b19 --- libsolv-0.7.28.tar.bz2 | 3 --- libsolv-0.7.30.tar.bz2 | 3 +++ libsolv.changes | 32 +++++++++++++++++++++++++++++++- libsolv.spec | 34 +++++++++++++++++++++++++++------- 4 files changed, 61 insertions(+), 11 deletions(-) delete mode 100644 libsolv-0.7.28.tar.bz2 create mode 100644 libsolv-0.7.30.tar.bz2 diff --git a/libsolv-0.7.28.tar.bz2 b/libsolv-0.7.28.tar.bz2 deleted file mode 100644 index 2dc5e0e..0000000 --- a/libsolv-0.7.28.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ddd5e2a7b0c3372dc4c8f1e0288780074311fd143c7fae92db834e37c2b6616 -size 590437 diff --git a/libsolv-0.7.30.tar.bz2 b/libsolv-0.7.30.tar.bz2 new file mode 100644 index 0000000..bcae9c8 --- /dev/null +++ b/libsolv-0.7.30.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd21e84c5cff8dc0529ed2cd483aed78d673febdeb88daab115e4c4970327d2f +size 597800 diff --git a/libsolv.changes b/libsolv.changes index e38979b..395054b 100644 --- a/libsolv.changes +++ b/libsolv.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Thu Jul 11 13:19:18 CEST 2024 - mls@suse.de + +- removed dependency on external find program in the repo2solv tool +- bindings: fix return value of repodata.add_solv() +- new SOLVER_FLAG_FOCUS_NEW flag +- bump version to 0.7.30 + +------------------------------------------------------------------- +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 + +- improve updating of installed multiversion packages +- fix decision introspection going into an endless loop in some + cases +- added experimental lua bindings +- bump version to 0.7.29 + +------------------------------------------------------------------- +Mon Apr 22 19:16:03 UTC 2024 - Dirk Müller + +- split libsolv-tools into libsolv-tools-base [jsc#PED-8153] + ------------------------------------------------------------------- Fri Jan 26 11:19:39 CET 2024 - mls@suse.de @@ -483,7 +513,7 @@ Tue Feb 7 13:13:01 CET 2017 - mls@suse.de Thu Nov 10 15:09:25 CET 2016 - mls@suse.de - 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 diff --git a/libsolv.spec b/libsolv.spec index 6fb4e28..40a8a29 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -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 @@ -65,7 +65,7 @@ %bcond_with zypp Name: libsolv -Version: 0.7.28 +Version: 0.7.30 Release: 0 Summary: Package dependency solver using a satisfiability algorithm License: BSD-3-Clause @@ -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 +Conflicts: libsolv-tools < %{version} + +%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. @@ -256,6 +266,7 @@ cmake . $CMAKE_FLAGS \ -DWITH_LIBXML2=1 \ -DENABLE_APPDATA=1 \ -DENABLE_COMPS=1 \ + -DMULTI_SEMANTICS=1 \ %{?with_static:-DENABLE_STATIC=1} \ %{!?with_shared:-DDISABLE_SHARED=1} \ %{?with_perl:-DENABLE_PERL=1} \ @@ -285,8 +296,8 @@ ln -s repo2solv %{buildroot}/%{_bindir}/repo2solv.sh %endif %endif %if %{with python_singlespec} -%{python_expand -pyver=%%python_version +%{python_expand # +pyver=%{$python_version} cmake . -U '*PYTHON*' -DENABLE_PYTHON=1 -DPYTHON_VERSION_MAJOR=${pyver%%.*} -DPYTHON_VERSION_MINOR=${pyver#*.} make DESTDIR=%{buildroot} -C bindings/python clean make DESTDIR=%{buildroot} -C bindings/python install @@ -294,7 +305,6 @@ make DESTDIR=%{buildroot} -C bindings/python install %python_compileall %endif - %check make ARGS=--output-on-failure test @@ -310,6 +320,13 @@ 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} @@ -317,7 +334,11 @@ make ARGS=--output-on-failure test %exclude %{_mandir}/man1/helix2solv* %endif %exclude %{_mandir}/man1/solv.1* +%exclude %{_mandir}/man1/repo2solv.1* +%exclude %{_mandir}/man1/rpmdb2solv.1* %exclude %{_bindir}/solv +%exclude %{_bindir}/repo2solv +%exclude %{_bindir}/rpmdb2solv %{_bindir}/* %{_mandir}/man1/* @@ -381,5 +402,4 @@ make ARGS=--output-on-failure test %endif %endif - %changelog