Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package btrfsprogs for openSUSE:Factory
checked in at 2021-01-19 16:01:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old)
and /work/SRC/openSUSE:Factory/.btrfsprogs.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btrfsprogs"
Tue Jan 19 16:01:18 2021 rev:116 rq:864117 version:5.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2020-10-29
09:21:54.646665003 +0100
+++ /work/SRC/openSUSE:Factory/.btrfsprogs.new.28504/btrfsprogs.changes
2021-01-19 16:01:36.223326399 +0100
@@ -1,0 +2,5 @@
+Wed Nov 4 17:32:13 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ btrfsprogs.spec ++++++
--- /var/tmp/diff_new_pack.vBah4S/_old 2021-01-19 16:01:37.483328303 +0100
+++ /var/tmp/diff_new_pack.vBah4S/_new 2021-01-19 16:01:37.483328303 +0100
@@ -242,6 +242,7 @@
install -m 0755 btrfs-image %{buildroot}/%{_sbindir}
install -m 0755 btrfstune %{buildroot}/%{_sbindir}
install -m 0755 btrfs-find-root %{buildroot}/%{_sbindir}
+%if !0%{?usrmerged}
install -m 0755 -d %{buildroot}/sbin
ln -s %{_sbindir}/btrfs %{buildroot}/sbin
ln -s %{_sbindir}/btrfs-convert %{buildroot}/sbin
@@ -252,6 +253,7 @@
ln -s %{_sbindir}/btrfs-find-root %{buildroot}/sbin
ln -s %{_sbindir}/mkfs.btrfs %{buildroot}/sbin
ln -s %{_sbindir}/fsck.btrfs %{buildroot}/sbin
+%endif
%if 0%{?suse_version} < 1310
install -d -m0755 %{buildroot}/lib/mkinitrd/scripts/
install -m 0755 %{SOURCE1} %{buildroot}/lib/mkinitrd/scripts/
@@ -313,6 +315,7 @@
%dir %{_dracutmodulesdir}/95suse-btrfs/
%{_dracutmodulesdir}/95suse-btrfs/module-setup.sh
%endif
+%if !0%{?usrmerged}
/sbin/fsck.btrfs
# mkinitrd utils
/sbin/btrfs
@@ -321,6 +324,7 @@
/sbin/btrfstune
/sbin/btrfsck
/sbin/mkfs.btrfs
+%endif
%{_sbindir}/btrfs
%{_sbindir}/btrfs-convert
%{_sbindir}/btrfs-image
