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-22 14:13:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old)
and /work/SRC/openSUSE:Factory/.ocfs2-tools.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocfs2-tools"
Sat Oct 22 14:13:32 2022 rev:84 rq:1030499 version:1.8.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes 2022-09-08
14:22:47.582549747 +0200
+++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new.2275/ocfs2-tools.changes
2022-10-22 14:14:04.480878432 +0200
@@ -1,0 +2,6 @@
+Sat Oct 22 08:40:00 UTC 2022 - heming.z...@suse.com
+
+- ocfs2-tools: finish UsrMerge, install to /usr (bsc#1191084)
+ + modify ocfs2_tools.spec to following UsrMerge rule
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocfs2-tools.spec ++++++
--- /var/tmp/diff_new_pack.AI9LAr/_old 2022-10-22 14:14:05.068879825 +0200
+++ /var/tmp/diff_new_pack.AI9LAr/_new 2022-10-22 14:14:05.072879835 +0200
@@ -21,6 +21,15 @@
%define _fillupdir /var/adm/fillup-templates
%endif
+#see bsc#1191084
+%if !0%{?usrmerged}
+ # for SLEs
+ %define sbindir /sbin
+%else
+ # for opensuse
+ %define sbindir %{_sbindir}
+%endif
+
#if run "rpmbuild --with=ocfs2console"
#_with_ocfs2console will be automatically defined
%if %{defined _with_ocfs2console}
@@ -180,11 +189,16 @@
autoreconf -fi -I /usr/share/aclocal
%configure --disable-debug \
-%if 0%{_ocfs2console} == 1
---enable-ocfs2console=yes \
-%endif
---enable-dynamic-fsck=yes \
---enable-dynamic-ctl=yes
+ %if 0%{_ocfs2console} == 1
+ --enable-ocfs2console=yes \
+ %endif
+ --enable-dynamic-fsck=yes \
+ --enable-dynamic-ctl=yes \
+ %if !0%{?usrmerged}
+ # "do nothing"
+ %else
+ --with-root-prefix=/usr
+ %endif
make OPTS="%{optflags}"
@@ -195,7 +209,7 @@
cd ..
%install
-mkdir -p %{buildroot}/sbin
+mkdir -p %{buildroot}%{sbindir}
mkdir -p %{buildroot}%{_prefix}/bin
mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}%{_udevrulesdir}
@@ -206,14 +220,14 @@
mkdir -p %{buildroot}/usr/lib/systemd/system
cp -f vendor/common/o2cb.service %{buildroot}/usr/lib/systemd/system/
cp -f vendor/common/ocfs2.service %{buildroot}/usr/lib/systemd/system/
- cp -f vendor/common/o2cb.init %{buildroot}/sbin
- cp -f vendor/common/ocfs2.init %{buildroot}/sbin
+ cp -f vendor/common/o2cb.init %{buildroot}%{sbindir}
+ cp -f vendor/common/ocfs2.init %{buildroot}%{sbindir}
%else
mkdir -p %{buildroot}%{_sysconfdir}/init.d
cp -f vendor/common/o2cb.init %{buildroot}%{_sysconfdir}/init.d/o2cb
cp -f vendor/common/ocfs2.init %{buildroot}%{_sysconfdir}/init.d/ocfs2
- ln -sf ..%{_sysconfdir}/init.d/o2cb %{buildroot}/sbin/rco2cb
- ln -sf ..%{_sysconfdir}/init.d/ocfs2 %{buildroot}/sbin/rcocfs2
+ ln -sf ..%{_sysconfdir}/init.d/o2cb %{buildroot}%{sbindir}/rco2cb
+ ln -sf ..%{_sysconfdir}/init.d/ocfs2 %{buildroot}%{sbindir}/rcocfs2
%endif
make DESTDIR="%{buildroot}" install
@@ -221,9 +235,11 @@
make DESTDIR="%{buildroot}" install
cd ..
+%if !0%{?usrmerged}
mv %{buildroot}/{,/usr}/sbin/o2image
mv %{buildroot}/{,/usr}/sbin/debugfs.ocfs2
#mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk
+%endif
chmod a-x %{buildroot}/%{_libdir}/libo2cb.a
chmod a-x %{buildroot}/%{_libdir}/libo2dlm.a
chmod a-x %{buildroot}/%{_libdir}/libocfs2.a
@@ -266,14 +282,14 @@
%doc documentation/users_guide.txt
%dir /usr/lib/udev
%dir %{_udevrulesdir}
-/sbin/fsck.ocfs2
-/sbin/mkfs.ocfs2
-/sbin/mounted.ocfs2
-/sbin/tunefs.ocfs2
-/sbin/mount.ocfs2
-/sbin/ocfs2_hb_ctl
-/sbin/o2cluster
-/sbin/defragfs.ocfs2
+%{sbindir}/fsck.ocfs2
+%{sbindir}/mkfs.ocfs2
+%{sbindir}/mounted.ocfs2
+%{sbindir}/tunefs.ocfs2
+%{sbindir}/mount.ocfs2
+%{sbindir}/ocfs2_hb_ctl
+%{sbindir}/o2cluster
+%{sbindir}/defragfs.ocfs2
%{_sbindir}/o2image
%{_sbindir}/debugfs.ocfs2
%{_sbindir}/o2hbmonitor
@@ -308,17 +324,17 @@
%files o2cb
%defattr(-,root,root)
%doc README.O2CB
-/sbin/o2cb_ctl
-/sbin/o2cb
+%{sbindir}/o2cb_ctl
+%{sbindir}/o2cb
%if %{systemd_enabled}
- /sbin/o2cb.init
- /sbin/ocfs2.init
+ %{sbindir}/o2cb.init
+ %{sbindir}/ocfs2.init
/usr/lib/systemd/system/o2cb.service
/usr/lib/systemd/system/ocfs2.service
%else
- /sbin/rco2cb
- /sbin/rcocfs2
+ %{sbindir}/rco2cb
+ %{sbindir}/rcocfs2
%{_sysconfdir}/init.d/o2cb
%{_sysconfdir}/init.d/ocfs2
%endif
