Hello community, here is the log from the commit of package drbd-utils for openSUSE:Factory checked in at 2020-11-21 12:43:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old) and /work/SRC/openSUSE:Factory/.drbd-utils.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-utils" Sat Nov 21 12:43:18 2020 rev:42 rq:849660 version:9.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes 2020-10-14 15:39:27.534367993 +0200 +++ /work/SRC/openSUSE:Factory/.drbd-utils.new.5913/drbd-utils.changes 2020-11-23 10:25:23.757017902 +0100 @@ -1,0 +2,5 @@ +Tue Nov 17 16:01:34 UTC 2020 - Ludwig Nussel <[email protected]> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd-utils.spec ++++++ --- /var/tmp/diff_new_pack.iLQDTI/_old 2020-11-23 10:25:24.425018657 +0100 +++ /var/tmp/diff_new_pack.iLQDTI/_new 2020-11-23 10:25:24.425018657 +0100 @@ -15,6 +15,11 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%if !0%{?usrmerged} +%define sbindir /sbin +%else +%define sbindir %{_sbindir} +%endif %bcond_without drbdmon # Man pages are included in the released tarball. @@ -96,8 +101,12 @@ --with-bashcompletion \ --with-initscripttype=systemd \ --with-systemdunitdir=%{_prefix}/lib/systemd/system \ +%if !0%{?usrmerged} --prefix=/ \ --sbindir=/sbin \ +%else + --prefix=%{_prefix} \ +%endif --libdir=%{_prefix}/lib \ --mandir=%{_mandir} \ --sysconfdir=%{_sysconfdir} \ @@ -162,11 +171,11 @@ %dir %{_sysconfdir}/drbd.d %dir %{_sysconfdir}/multipath %dir %{_sysconfdir}/multipath/conf.d -/sbin/drbdadm -/sbin/drbdsetup -/sbin/drbdmeta +%{sbindir}/drbdadm +%{sbindir}/drbdsetup +%{sbindir}/drbdmeta %if %{with drbdmon} -/sbin/drbdmon +%{sbindir}/drbdmon %endif %ifarch %{ix86} x86_64 %dir %attr(700,root,root) %{_sysconfdir}/xen _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
