From 6ac65462b8a3ec05b1164466c3b62261e00885803bc4c0f1ce538630afc2111e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 19 Jan 2021 15:01:18 +0000 Subject: [PATCH] Accepting request 864117 from filesystems OBS-URL: https://build.opensuse.org/request/show/864117 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=116 --- btrfsprogs.changes | 5 +++++ btrfsprogs.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/btrfsprogs.changes b/btrfsprogs.changes index c3bc68a..9a09562 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 4 17:32:13 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Mon Oct 26 00:00:00 CET 2020 - dsterba@suse.cz diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 5f91343..3ff28ee 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -242,6 +242,7 @@ install -m 0755 btrfs-select-super %{buildroot}/%{_sbindir} 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}/btrfsck %{buildroot}/sbin 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 @@ done %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 @@ done /sbin/btrfstune /sbin/btrfsck /sbin/mkfs.btrfs +%endif %{_sbindir}/btrfs %{_sbindir}/btrfs-convert %{_sbindir}/btrfs-image