diff --git a/backport-build-rpm-don-t-try-to-rm-drbdmon.8.gz-in-preun.patch b/backport-build-rpm-don-t-try-to-rm-drbdmon.8.gz-in-preun.patch new file mode 100644 index 0000000000000000000000000000000000000000..128bc2ff4c98cda6d7090dc1e1eb6789933442aa --- /dev/null +++ b/backport-build-rpm-don-t-try-to-rm-drbdmon.8.gz-in-preun.patch @@ -0,0 +1,62 @@ +From e25bb259b116ea4c29d9b5dcb17d593e5c31de6b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Moritz=20Wanzenb=C3=B6ck?= +Date: Wed, 23 Apr 2025 17:03:16 +0200 +Subject: [PATCH 077/200] spec: obsolete drbd-xen package + +This allows dnf/yum updates to succeed without --allowerasing. +--- + drbd.spec.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drbd.spec.in b/drbd.spec.in +index 7febb492..c7cee794 100644 +--- a/drbd.spec.in ++++ b/drbd.spec.in +@@ -121,6 +121,7 @@ BuildRequires: keyutils-devel + %else + BuildRequires: keyutils-libs-devel + %endif ++Obsoletes: drbd-xen <= 9.30.0 + + %description utils + DRBD mirrors a block device over the network to another machine. +-- +2.33.1.windows.1 + + +From 4104c341ed7b17b01476344cc5da653f3467a159 Mon Sep 17 00:00:00 2001 +From: Roland Kammerer +Date: Fri, 25 Apr 2025 09:41:22 +0200 +Subject: [PATCH 079/200] build,rpm: don't try to rm drbdmon.8.gz in preun + +This is most likely a fallout from changes introduced in +f962315c30e901258bd151f33994d85f32905cee + +We have "versioned man pages" and create symlinks to them (e.g., +drbdmeta.8.gz -> drbdmeta-9.0.8.gz). Creating and deleting these is +managed in post and preun scripts. drbdmon is special as there is no +versioned man page, there is only drbdmon.8.gz (the final file, no +symlinks). + +As is, we tried to rm the file twice, once in preun and then as part of +"files". This resulted in a completely harmless message that a +non-existent file was tried to get removed. +--- + drbd.spec.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drbd.spec.in b/drbd.spec.in +index c7cee794..dc6e1c83 100644 +--- a/drbd.spec.in ++++ b/drbd.spec.in +@@ -516,7 +516,6 @@ for f in drbd drbdadm drbdmeta drbdsetup; do + rm -f %{_mandir}/man8/$f.8.gz + done + rm -f %{_mandir}/man5/drbd.conf.5.gz +-rm -f %{_mandir}/man8/drbdmon.8.gz + fi + %if "%{initscripttype}" == "systemd" + %systemd_preun drbd.service +-- +2.33.1.windows.1 + diff --git a/drbd.spec b/drbd.spec index 7adc5e43ebbdc8de7d75f0861bbc597128d7ce4b..5923bfccf84d3c955c6e7c53e205cf620a25ee88 100644 --- a/drbd.spec +++ b/drbd.spec @@ -1,12 +1,13 @@ Name: drbd Summary: DRBD user-land tools and scripts Version: 9.31.0 -Release: 3 +Release: 4 Source0: http://www.linbit.com/downloads/%{name}/utils/%{name}-utils-%{version}.tar.gz Patch0: drbd-utils-9.12.2-disable_xsltproc_network_read.patch Patch1: drbd-utils-9.15.0-make_configure-workaround.patch Patch2: backport-DRBDmon-page-command-now-switches-from-cursor-to-page.patch Patch3: backport-drbdsetup-Output-device-config-in-drbdsetup-show.patch +Patch4: backport-build-rpm-don-t-try-to-rm-drbdmon.8.gz-in-preun.patch License: GPL-2.0-or-later ExclusiveOS: linux @@ -198,6 +199,10 @@ management utility. %systemd_preun drbd.service %changelog +* Tue Nov 25 2025 bizhiyuan - 9.31.0-4 +- spec: obsolete drbd-xen package +- build,rpm: don't try to rm drbdmon.8.gz in preun + * Mon Nov 24 2025 liupei - 9.31.0-3 - DRBDmon: Updated integerparse.h from cppdsaext - DRBDmon: Add missing default_types.h include in string_matching.h