Dominique Leuenberger 2021-01-19 15:01:18 +00:00 committed by Git OBS Bridge
parent 8bcb4cf0c5
commit 6ac65462b8
2 changed files with 9 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 4 17:32:13 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 26 00:00:00 CET 2020 - dsterba@suse.cz Mon Oct 26 00:00:00 CET 2020 - dsterba@suse.cz

View File

@ -242,6 +242,7 @@ install -m 0755 btrfs-select-super %{buildroot}/%{_sbindir}
install -m 0755 btrfs-image %{buildroot}/%{_sbindir} install -m 0755 btrfs-image %{buildroot}/%{_sbindir}
install -m 0755 btrfstune %{buildroot}/%{_sbindir} install -m 0755 btrfstune %{buildroot}/%{_sbindir}
install -m 0755 btrfs-find-root %{buildroot}/%{_sbindir} install -m 0755 btrfs-find-root %{buildroot}/%{_sbindir}
%if !0%{?usrmerged}
install -m 0755 -d %{buildroot}/sbin install -m 0755 -d %{buildroot}/sbin
ln -s %{_sbindir}/btrfs %{buildroot}/sbin ln -s %{_sbindir}/btrfs %{buildroot}/sbin
ln -s %{_sbindir}/btrfs-convert %{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}/btrfs-find-root %{buildroot}/sbin
ln -s %{_sbindir}/mkfs.btrfs %{buildroot}/sbin ln -s %{_sbindir}/mkfs.btrfs %{buildroot}/sbin
ln -s %{_sbindir}/fsck.btrfs %{buildroot}/sbin ln -s %{_sbindir}/fsck.btrfs %{buildroot}/sbin
%endif
%if 0%{?suse_version} < 1310 %if 0%{?suse_version} < 1310
install -d -m0755 %{buildroot}/lib/mkinitrd/scripts/ install -d -m0755 %{buildroot}/lib/mkinitrd/scripts/
install -m 0755 %{SOURCE1} %{buildroot}/lib/mkinitrd/scripts/ install -m 0755 %{SOURCE1} %{buildroot}/lib/mkinitrd/scripts/
@ -313,6 +315,7 @@ done
%dir %{_dracutmodulesdir}/95suse-btrfs/ %dir %{_dracutmodulesdir}/95suse-btrfs/
%{_dracutmodulesdir}/95suse-btrfs/module-setup.sh %{_dracutmodulesdir}/95suse-btrfs/module-setup.sh
%endif %endif
%if !0%{?usrmerged}
/sbin/fsck.btrfs /sbin/fsck.btrfs
# mkinitrd utils # mkinitrd utils
/sbin/btrfs /sbin/btrfs
@ -321,6 +324,7 @@ done
/sbin/btrfstune /sbin/btrfstune
/sbin/btrfsck /sbin/btrfsck
/sbin/mkfs.btrfs /sbin/mkfs.btrfs
%endif
%{_sbindir}/btrfs %{_sbindir}/btrfs
%{_sbindir}/btrfs-convert %{_sbindir}/btrfs-convert
%{_sbindir}/btrfs-image %{_sbindir}/btrfs-image