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 2022-09-17 20:10:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
and /work/SRC/openSUSE:Factory/.drbd-utils.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-utils"
Sat Sep 17 20:10:23 2022 rev:49 rq:1004084 version:9.19.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes 2022-01-15
20:05:09.637757181 +0100
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.2083/drbd-utils.changes
2022-09-17 20:10:30.481185950 +0200
@@ -1,0 +2,8 @@
+Fri Sep 16 07:30:59 UTC 2022 - Roger Zhou <zz...@suse.com>
+
+- restore drbd scripts back to /usr/lib/drbd from /lib/drbd (bsc#1203220)
+ Update drbd-utils.spec
+- fix drbd-bash-completion
+ Update rpmlint-build-error.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ drbd-utils.spec ++++++
--- /var/tmp/diff_new_pack.aaEwTT/_old 2022-09-17 20:10:31.021187507 +0200
+++ /var/tmp/diff_new_pack.aaEwTT/_new 2022-09-17 20:10:31.025187519 +0200
@@ -1,7 +1,7 @@
#
# spec file for package drbd-utils
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,8 @@
%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
-%define libdir /lib
+# see bsc#1203220 & usrmerge_move_lib_to_prefix_lib.patch for %{libdir}
+%define libdir /usr/lib
%else
%define sbindir %{_sbindir}
%define libdir %{_prefix}/lib
@@ -111,10 +112,11 @@
--with-initscripttype=systemd \
--with-systemdunitdir=%{_prefix}/lib/systemd/system \
%if !0%{?usrmerged}
- --prefix=/ \
+ --prefix=/usr \
--sbindir=/sbin \
%else
--prefix=%{_prefix} \
+ --sbindir=%{_sbindir} \
%endif
%if 0%{?is_opensuse}
--localstatedir=%{_localstatedir} \
@@ -123,6 +125,7 @@
--sysconfdir=%{_sysconfdir} \
--datarootdir=%{_datadir} \
--datadir=%{_datadir} \
+ --libdir=%{_prefix}/lib \
--exec_prefix=%{_prefix}/lib \
%{?with_drbdmon: --with-drbdmon} \
%{?with_prebuiltman: --with-prebuiltman} \
@@ -133,6 +136,10 @@
%install
%make_install
+%if !0%{?usrmerged}
+mkdir -p %{buildroot}%{_localstatedir}/lib/drbd
+%endif
+
%ifnarch %{ix86} x86_64
rm -rf %{buildroot}%{_sysconfdir}/xen
%endif
@@ -166,7 +173,7 @@
%config(noreplace) %{_sysconfdir}/drbd.conf
%config(noreplace) %{_sysconfdir}/drbd.d/global_common.conf
%config(noreplace) %{_sysconfdir}/multipath/conf.d/drbd.conf
-%{_datadir}/bash-completion/completions/drbdadm.sh
+%{_datadir}/bash-completion/completions/drbdadm
%{_tmpfilesdir}/drbd.conf
%{_mandir}/man5/drbd.*
%{_mandir}/man8/drbd*
++++++ rpmlint-build-error.patch ++++++
--- /var/tmp/diff_new_pack.aaEwTT/_old 2022-09-17 20:10:31.141187853 +0200
+++ /var/tmp/diff_new_pack.aaEwTT/_new 2022-09-17 20:10:31.149187877 +0200
@@ -32,7 +32,7 @@
- mkdir -p $(DESTDIR)$(sysconfdir)/bash_completion.d
- install -m 644 drbdadm.bash_completion
$(DESTDIR)$(sysconfdir)/bash_completion.d/drbdadm$(BASH_COMPLETION_SUFFIX)
+ mkdir -p $(DESTDIR)$(datadir)/bash-completion/completions
-+ install -m 644 drbdadm.bash_completion
$(DESTDIR)$(datadir)/bash-completion/completions/drbdadm$(BASH_COMPLETION_SUFFIX)
++ install -m 644 drbdadm.bash_completion
$(DESTDIR)$(datadir)/bash-completion/completions/drbdadm
endif
clean:
@@ -41,7 +41,7 @@
rm -f $(DESTDIR)$(sysconfdir)/ha.d/resource.d/drbdupper
rm -f $(DESTDIR)$(sysconfdir)/xen/scripts/block-drbd
- rm -f
$(DESTDIR)$(sysconfdir)/bash_completion.d/drbdadm$(BASH_COMPLETION_SUFFIX)
-+ rm -f
$(DESTDIR)$(datadir)/bash-completion/completions/drbdadm$(BASH_COMPLETION_SUFFIX)
++ rm -f $(DESTDIR)$(datadir)/bash-completion/completions/drbdadm
! test -L $(DESTDIR)/sbin/rcdrbd || rm $(DESTDIR)/sbin/rcdrbd
.PHONY: install uninstall clean distclean
