From bf0a02c38850e535c775f415518c6cea1a1eca62 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 2 Jun 2021 03:44:39 +0200 Subject: [PATCH 1/5] Rempove superfluous line --- udev/rules.d/91-mountsd.rules | 1 - 1 file changed, 1 deletion(-) diff --git a/udev/rules.d/91-mountsd.rules b/udev/rules.d/91-mountsd.rules index 9396d72..e214fa8 100644 --- a/udev/rules.d/91-mountsd.rules +++ b/udev/rules.d/91-mountsd.rules @@ -11,7 +11,6 @@ # Is something like KERNEL=="mmcblk[1-9]*|sd*|sr*", SUBSYSTEMS=="usb", ATTR{removable}="1" possible and reasonable (means only "removable *media*"?) ? Or without restricting it to USB-attached devices / partitions? SUBSYSTEM!="block", GOTO="mountsd_end" -KERNEL!="mmcblk[1-9]*|sd*|sr*", GOTO="mountsd_end" # Ignore the additions / changes by Jolla per # https://git.sailfishos.org/mer-core/udisks2/blob/master/rpm/0005-Add-udev-rule-for-the-sda-drives.patch From 9af00115296e8bcb6d74a507919285e11d42a470 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 2 Jun 2021 21:26:32 +0200 Subject: [PATCH 2/5] Post release version increase --- rpm/mount-sdcard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/mount-sdcard.spec b/rpm/mount-sdcard.spec index 8d9ae38..c85ed81 100644 --- a/rpm/mount-sdcard.spec +++ b/rpm/mount-sdcard.spec @@ -1,6 +1,6 @@ Name: mount-sdcard Summary: Enhanced mounting scripts for SD-cards -Version: 1.8.0 +Version: 1.8.1 # Since v1.4.2, the release version consists of two or three fields, separated by a dot ("."): # - The first field must contain a natural number greater than zero. # This number may be prefixed by one of {alpha,beta,rc,stable}, e.g. "alpha13". From 7780e282eafa08255aa8ce9bb7559dd8add06634 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 2 Jun 2021 21:29:45 +0200 Subject: [PATCH 3/5] Update mount-sdcard.spec --- rpm/mount-sdcard.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpm/mount-sdcard.spec b/rpm/mount-sdcard.spec index c85ed81..744b18b 100644 --- a/rpm/mount-sdcard.spec +++ b/rpm/mount-sdcard.spec @@ -29,9 +29,9 @@ Requires: udisks2 # Better use direct dependencies on specific versions than indirect ones (here: the line above # versus the one below) in general, but ultimately decided not to do so in this special case # (for commonality across release versions): -Requires: sailfish-version >= 3.2.1 -# Omit anti-dependency on future, untested SFOS versions, until a known conflict exists: -# Requires: sailfish-version < 4.9.9 +Requires: sailfish-version >= 3.4.0 +# Counter-dependency, neccessary for the multiple release branch scheme chosen: +Requires: sailfish-version < 3.4.0 %description %{summary} From 3f1a4cc2a9b895624788771e06dc67d393b0ebab Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 2 Jun 2021 21:33:35 +0200 Subject: [PATCH 4/5] Update mount-sdcard.spec --- rpm/mount-sdcard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/mount-sdcard.spec b/rpm/mount-sdcard.spec index 744b18b..888a01f 100644 --- a/rpm/mount-sdcard.spec +++ b/rpm/mount-sdcard.spec @@ -30,7 +30,7 @@ Requires: udisks2 # versus the one below) in general, but ultimately decided not to do so in this special case # (for commonality across release versions): Requires: sailfish-version >= 3.4.0 -# Counter-dependency, neccessary for the multiple release branch scheme chosen: +# Counter-dependency (neccessary for the multiple release branch scheme chosen): Requires: sailfish-version < 3.4.0 %description From 6c22c0d95483bcdedee33b93a866e64172579225 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 2 Jun 2021 21:38:04 +0200 Subject: [PATCH 5/5] Fix misspelling --- rpm/mount-sdcard.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/mount-sdcard.spec b/rpm/mount-sdcard.spec index 888a01f..ba3e4cf 100644 --- a/rpm/mount-sdcard.spec +++ b/rpm/mount-sdcard.spec @@ -30,7 +30,7 @@ Requires: udisks2 # versus the one below) in general, but ultimately decided not to do so in this special case # (for commonality across release versions): Requires: sailfish-version >= 3.4.0 -# Counter-dependency (neccessary for the multiple release branch scheme chosen): +# Counter-dependency (necessary for the multiple release branch scheme chosen): Requires: sailfish-version < 3.4.0 %description