Sync from SUSE:SLFO:Main libzypp revision 1d8e56874a40f0ea6774007c47cf081e

This commit is contained in:
Adrian Schröter 2025-02-21 17:58:08 +01:00
parent 68045cbf2b
commit 350953a08d
4 changed files with 21 additions and 9 deletions

BIN
libzypp-17.36.1.tar.bz2 (Stored with Git LFS)

Binary file not shown.

BIN
libzypp-17.36.2.tar.bz2 (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Feb 21 15:08:12 CET 2025 - ma@suse.de
- Filesystem usrmerge must not be done in singletrans mode
(bsc#1236481, bsc#1189788)
Commit will amend the backend in case the transaction would
perform a filesystem usrmerge.
- Workaround bsc#1216091 on Code16.
- version 17.36.2 (35)
-------------------------------------------------------------------
Wed Feb 12 15:58:56 CET 2025 - ma@suse.de

View File

@ -15,6 +15,8 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 || (0%{?is_opensuse} && 0%{?sle_version} >= 150100)
%bcond_without zchunk
%else
@ -57,7 +59,7 @@
%bcond_with enable_preview_single_rpmtrans_as_default_for_zypper
Name: libzypp
Version: 17.36.1
Version: 17.36.2
Release: 0
License: GPL-2.0-or-later
URL: https://github.com/openSUSE/libzypp
@ -289,11 +291,11 @@ Developer documentation for libzypp.
%build
mkdir build
cd build
%if 0%{?suse_version} > 1500
# Bug 1189788 - UsrMerge: filesystem package breaks system when upgraded in a single rpm transaction
# While the bug is not fixed, we don't allow ZYPP_SINGLE_RPMTRANS=1 on a not UsrMerged system
export CFLAGS="%{optflags} -DNO_SINGLETRANS_USERMERGE"
export CXXFLAGS="%{optflags} -DNO_SINGLETRANS_USERMERGE"
%if 0%{?suse_version} == 1600
# bsc#1216091: rpm-4.18' does not execute 'rpm --runposttrans'
# scripts chroot if --root is used.
export CFLAGS="%{optflags} -DWORKAROUNDDUMPPOSTTRANS_BUG_1216091"
export CXXFLAGS="%{optflags} -DWORKAROUNDDUMPPOSTTRANS_BUG_1216091"
%else
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"