From b4b26fa5c5c4136ba6ef46d6cc8df4eb9190b77d Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 21 Sep 2023 00:25:36 +0200 Subject: [PATCH 1/3] [sfos-upgrade.spec] Post release version increase --- rpm/sfos-upgrade.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/sfos-upgrade.spec b/rpm/sfos-upgrade.spec index 0b2de7b..2f2743f 100644 --- a/rpm/sfos-upgrade.spec +++ b/rpm/sfos-upgrade.spec @@ -3,7 +3,7 @@ Summary: Scripts for fail-safe upgrading of SailfishOS at the command lin # The Git tag format must adhere to / since 2023-05-18. # The tag must adhere to semantic versioning, for details see # https://semver.org/ -Version: 3.11.2 +Version: 3.11.3 # The tag comprises one of {alpha,beta,rc,release} postfixed with a # natural number greater or equal to 1 (e.g., "beta3") and may additionally be # postfixed with a plus character ("+"), the name of the packager and a release From 1915d225435a5d62502382ce61baaa507086ad28 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 27 Sep 2023 03:22:12 +0200 Subject: [PATCH 2/3] [post_sfos-upgrade9 Add missed `then` --- bin/post_sfos-upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/post_sfos-upgrade b/bin/post_sfos-upgrade index 806194a..def6446 100644 --- a/bin/post_sfos-upgrade +++ b/bin/post_sfos-upgrade @@ -80,6 +80,7 @@ then printf '\n' fi # Not executing either zypper or pkcon but both, because refreshing both of their caches is an important aspect. if command -v pkcon > /dev/null 2>&1 # Is usually installed, but PackageKit is deliberately not specified as a dependency. +then # This may have become superfluous with SFOS 3.2.0, see # https://together.jolla.com/question/214572/changelog-320-torronsuo/#214572-packagekit # Would need to investigate, but refreshing twice will do no harm, anyway. From 98ab7e5813685740b7ce72f477d7db77f5d467b7 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 27 Sep 2023 03:23:20 +0200 Subject: [PATCH 3/3] [sfos-upgrade.spec] Pre fix-up release version lowering --- rpm/sfos-upgrade.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/sfos-upgrade.spec b/rpm/sfos-upgrade.spec index 2f2743f..9737507 100644 --- a/rpm/sfos-upgrade.spec +++ b/rpm/sfos-upgrade.spec @@ -3,7 +3,7 @@ Summary: Scripts for fail-safe upgrading of SailfishOS at the command lin # The Git tag format must adhere to / since 2023-05-18. # The tag must adhere to semantic versioning, for details see # https://semver.org/ -Version: 3.11.3 +Version: 3.11.2 # The tag comprises one of {alpha,beta,rc,release} postfixed with a # natural number greater or equal to 1 (e.g., "beta3") and may additionally be # postfixed with a plus character ("+"), the name of the packager and a release @@ -14,7 +14,7 @@ Version: 3.11.3 # build at GitHub and OBS, when configured accordingly; mind the sorting # (`adud` < `alpha`). For details and reasons, see # https://github.com/Olf0/sfos-upgrade/wiki/Git-tag-format -Release: release1 +Release: release2 # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Applications/System