diff --git a/fuse-exfat.changes b/fuse-exfat.changes index 5bceb24..b7fe3a1 100644 --- a/fuse-exfat.changes +++ b/fuse-exfat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 26 09:37:33 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Tue Dec 11 13:49:16 UTC 2018 - Jan Engelhardt diff --git a/fuse-exfat.spec b/fuse-exfat.spec index b4c5043..7c39fcd 100644 --- a/fuse-exfat.spec +++ b/fuse-exfat.spec @@ -1,7 +1,7 @@ # # spec file for package fuse-exfat # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2013 Sidlovsky, Yaroslav # # All modifications and additions to the file contributed by third parties @@ -51,10 +51,10 @@ make %{?_smp_mflags} %install %make_install -#UsrMerge +%if !0%{?usrmerged} mkdir %{buildroot}/sbin ln -sf %{_sbindir}/{mount.exfat,mount.exfat-fuse} %{buildroot}/sbin -#EndUsrMerge +%endif %post if ! grep -q -e '^exfat$' %{_sysconfdir}/filesystems ; then @@ -76,9 +76,9 @@ fi %files %license COPYING %doc ChangeLog README -#UsrMerge +%if !0%{?usrmerged} /sbin/* -#EndUsrMerge +%endif %{_sbindir}/mount.exfat %{_sbindir}/mount.exfat-fuse %{_mandir}/man8/mount.exfat-fuse.8%{?ext_man}