Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package drbd-utils for openSUSE:Factory
checked in at 2023-01-03 15:06:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
and /work/SRC/openSUSE:Factory/.drbd-utils.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-utils"
Tue Jan 3 15:06:03 2023 rev:52 rq:1046463 version:9.19.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes 2022-11-08
10:54:10.085658766 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.1563/drbd-utils.changes
2023-01-03 15:06:27.358891787 +0100
@@ -1,0 +2,7 @@
+Tue Jan 3 05:09:00 UTC 2023 - Heming Zhao <heming.z...@suse.com>
+
+- drbd.service fails to load - incorrect path to executable (bsc#1206754)
+ * use %suse_version to replace %UsrMerge
+ * modify drbd-utils.spec for create symbolic folder "/lib/drbd"
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ drbd-utils.spec ++++++
--- /var/tmp/diff_new_pack.HkrPaa/_old 2023-01-03 15:06:27.950895242 +0100
+++ /var/tmp/diff_new_pack.HkrPaa/_new 2023-01-03 15:06:27.958895289 +0100
@@ -1,7 +1,7 @@
#
# spec file for package drbd-utils
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,15 @@
%define services drbd.service drbd-lvchange@.service drbd-promote@.service
drbd-reconfigure-suspend-or-error@.service drbd-services@.target
drbd-wait-promotable@.service drbd@.service drbd@.target ocf.ra@.service
-%if !0%{?usrmerged}
-%define sbindir /sbin
-# see bsc#1203220 & usrmerge_move_lib_to_prefix_lib.patch for %{libdir}
-%define libdir /usr/lib
+%if 0%{?suse_version} < 1550
+ # for SLEs
+ %define sbindir /sbin
+ # see bsc#1203220 & usrmerge_move_lib_to_prefix_lib.patch for %{libdir}
+ %define libdir /usr/lib
%else
-%define sbindir %{_sbindir}
-%define libdir %{_prefix}/lib
+ # for opensuse
+ %define sbindir %{_sbindir}
+ %define libdir %{_prefix}/lib
%endif
%bcond_without drbdmon
# Man pages are included in the released tarball.
@@ -111,7 +113,7 @@
--with-bashcompletion \
--with-initscripttype=systemd \
--with-systemdunitdir=%{_prefix}/lib/systemd/system \
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
--sbindir=/sbin \
%else
--sbindir=%{_sbindir} \
@@ -154,8 +156,12 @@
ln -sf drbd.conf-9.0.5.gz %{_mandir}/man5/drbd.conf.5.gz
ln -sf drbd.conf-9.0.5.gz %{_mandir}/ja/man5/drbd.conf.5.gz
%if %{with drbdmon}
-ln -sf drbdmon-9.0.8.gz %{_mandir}/man8/drbdmon.8.gz
-ln -sf drbdmon-9.0.8.gz %{_mandir}/ja/man8/drbdmon.8.gz
+ ln -sf drbdmon-9.0.8.gz %{_mandir}/man8/drbdmon.8.gz
+ ln -sf drbdmon-9.0.8.gz %{_mandir}/ja/man8/drbdmon.8.gz
+%endif
+%if 0%{?suse_version} < 1550
+ # create symbolic folder for bsc#1206364
+ ln -s /usr/lib/drbd /lib/drbd
%endif
%preun
