From 998a84d51c6d4eac2389be77aac051151b2e2bea04719c75cfcd3a3251e47eab Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Thu, 13 Feb 2025 12:02:08 +0000
Subject: [PATCH 1/4] gitrev 3d21052fe (Translated using Weblate (Galician),
 2025-02-13)

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2826
---
 libzypp-17.36.1.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libzypp-17.36.1.tar.bz2 b/libzypp-17.36.1.tar.bz2
index dc6e8d7..4298d07 100644
--- a/libzypp-17.36.1.tar.bz2
+++ b/libzypp-17.36.1.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88e0e71757b8d2bf2a789ee1e4e149e4ede1dfa4f1202a8f9491f54055769be5
-size 5655034
+oid sha256:1a28820699bb51c033bd23c3abc86ba6f4bf6db5215436f7ffd660a6d61a9146
+size 5654918

From 52665d6ee1d9c18bd1bfaf419b6bd8bdd12eea883f5ba55b9e13515060cf465c Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Fri, 21 Feb 2025 14:06:07 +0000
Subject: [PATCH 2/4] gitrev 38a94a5c2 (Filesystem usrmerge must not be done in
 singletrans mode (bsc#1236481, bsc#1189788), 2025-02-18)

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2827
---
 libzypp-17.36.1.tar.bz2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libzypp-17.36.1.tar.bz2 b/libzypp-17.36.1.tar.bz2
index 4298d07..da5181f 100644
--- a/libzypp-17.36.1.tar.bz2
+++ b/libzypp-17.36.1.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a28820699bb51c033bd23c3abc86ba6f4bf6db5215436f7ffd660a6d61a9146
-size 5654918
+oid sha256:0e3af47ae3dbd1b09d60d468de893980af3e0b9276e55b8c1aeb2d196317ecb1
+size 5654244

From a0176e6de1ffd90d5f19cd98f729ddb352baa1a15dc1af70c8bfad441c712175 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Fri, 21 Feb 2025 14:15:58 +0000
Subject: [PATCH 3/4] gitrev a8aff4406 (Workaround bsc#1216091 on Code16,
 2023-10-12)

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2828
---
 libzypp-17.36.1.tar.bz2 |  4 ++--
 libzypp.spec            | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libzypp-17.36.1.tar.bz2 b/libzypp-17.36.1.tar.bz2
index da5181f..6f8293a 100644
--- a/libzypp-17.36.1.tar.bz2
+++ b/libzypp-17.36.1.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e3af47ae3dbd1b09d60d468de893980af3e0b9276e55b8c1aeb2d196317ecb1
-size 5654244
+oid sha256:58ab1265deaff667c5e53c018c93d579f7765602065d5af183df17816ff37af6
+size 5653866
diff --git a/libzypp.spec b/libzypp.spec
index 54b9c8b..75013a3 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -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
@@ -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}"

From fd0923df71025cacc4e85e5c4d5d80953095d5e4d7093c6bcbb99168e9b82ae7 Mon Sep 17 00:00:00 2001
From: ZYpp Developers <ma@suse.de>
Date: Fri, 21 Feb 2025 14:30:16 +0000
Subject: [PATCH 4/4] gitrev 32862c5a6 (changes 17.36.2 (35), 2025-02-21)

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2829
---
 libzypp-17.36.1.tar.bz2 |  3 ---
 libzypp-17.36.2.tar.bz2 |  3 +++
 libzypp.changes         | 10 ++++++++++
 libzypp.spec            |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)
 delete mode 100644 libzypp-17.36.1.tar.bz2
 create mode 100644 libzypp-17.36.2.tar.bz2

diff --git a/libzypp-17.36.1.tar.bz2 b/libzypp-17.36.1.tar.bz2
deleted file mode 100644
index 6f8293a..0000000
--- a/libzypp-17.36.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58ab1265deaff667c5e53c018c93d579f7765602065d5af183df17816ff37af6
-size 5653866
diff --git a/libzypp-17.36.2.tar.bz2 b/libzypp-17.36.2.tar.bz2
new file mode 100644
index 0000000..b26d74e
--- /dev/null
+++ b/libzypp-17.36.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2848e8c46330369bce1dcd2cf438145f65a54806e1373d54a1b9a2ffd9bfe26
+size 5653053
diff --git a/libzypp.changes b/libzypp.changes
index d9be54b..0eedf3f 100644
--- a/libzypp.changes
+++ b/libzypp.changes
@@ -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
 
diff --git a/libzypp.spec b/libzypp.spec
index 75013a3..47e1cc3 100644
--- a/libzypp.spec
+++ b/libzypp.spec
@@ -59,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