From a1a87399893d1264962f655d9c8de33bf4c3cf2457403e4122cec3f44d8e680c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 15 Aug 2022 20:06:21 +0000 Subject: [PATCH] - avoid bashism in post-scripts (bsc#1195391) - remove usrmerge hacks OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse-exfat?expand=0&rev=14 --- fuse-exfat.changes | 6 ++++++ fuse-exfat.spec | 11 ++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/fuse-exfat.changes b/fuse-exfat.changes index b7fe3a1..e4f21d4 100644 --- a/fuse-exfat.changes +++ b/fuse-exfat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 15 19:58:39 UTC 2022 - Dirk Müller + +- avoid bashism in post-scripts (bsc#1195391) +- remove usrmerge hacks + ------------------------------------------------------------------- Thu Nov 26 09:37:33 UTC 2020 - Ludwig Nussel diff --git a/fuse-exfat.spec b/fuse-exfat.spec index 7c39fcd..df47e78 100644 --- a/fuse-exfat.spec +++ b/fuse-exfat.spec @@ -1,7 +1,7 @@ # # spec file for package fuse-exfat # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2013 Sidlovsky, Yaroslav # # All modifications and additions to the file contributed by third parties @@ -51,10 +51,6 @@ make %{?_smp_mflags} %install %make_install -%if !0%{?usrmerged} -mkdir %{buildroot}/sbin -ln -sf %{_sbindir}/{mount.exfat,mount.exfat-fuse} %{buildroot}/sbin -%endif %post if ! grep -q -e '^exfat$' %{_sysconfdir}/filesystems ; then @@ -68,7 +64,7 @@ if ! grep -q exfat_fuse %{_sysconfdir}/filesystems ; then fi %postun -if [ "$1" == "0" ]; then +if [ "$1" = "0" ]; then sed -i -e '/exfat_fuse/d' -e '/^exfat$/d' %{_sysconfdir}/filesystems echo "Deleted 'exfat' and 'exfat_fuse' from the file %{_sysconfdir}/filesystems" fi @@ -76,9 +72,6 @@ fi %files %license COPYING %doc ChangeLog README -%if !0%{?usrmerged} -/sbin/* -%endif %{_sbindir}/mount.exfat %{_sbindir}/mount.exfat-fuse %{_mandir}/man8/mount.exfat-fuse.8%{?ext_man}