Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocfs2-tools for openSUSE:Factory
checked in at 2022-10-25 11:19:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
and /work/SRC/openSUSE:Factory/.ocfs2-tools.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocfs2-tools"
Tue Oct 25 11:19:36 2022 rev:85 rq:1030858 version:1.8.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes 2022-10-22
14:14:04.480878432 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new.2275/ocfs2-tools.changes
2022-10-25 11:19:39.786090859 +0200
@@ -1,0 +2,6 @@
+Mon Oct 24 10:06:00 UTC 2022 - heming.z...@suse.com
+
+- ocfs2-tools: finish UsrMerge, install to /usr (bsc#1191084)
+ + modify ocfs2_tools.spec to use %suse_version to replace %UsrMerge
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocfs2-tools.spec ++++++
--- /var/tmp/diff_new_pack.w7Eoov/_old 2022-10-25 11:19:40.562092579 +0200
+++ /var/tmp/diff_new_pack.w7Eoov/_new 2022-10-25 11:19:40.570092597 +0200
@@ -22,7 +22,7 @@
%endif
#see bsc#1191084
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
# for SLEs
%define sbindir /sbin
%else
@@ -194,7 +194,7 @@
%endif
--enable-dynamic-fsck=yes \
--enable-dynamic-ctl=yes \
- %if !0%{?usrmerged}
+ %if 0%{?suse_version} < 1550
# "do nothing"
%else
--with-root-prefix=/usr
@@ -235,7 +235,7 @@
make DESTDIR="%{buildroot}" install
cd ..
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
mv %{buildroot}/{,/usr}/sbin/o2image
mv %{buildroot}/{,/usr}/sbin/debugfs.ocfs2
#mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk
