From 00d2dfbc272177006ec33fe92b022d14b4a43ce8 Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 4 May 2023 00:44:54 +0200 Subject: [PATCH 1/5] Re-add concluding empty line --- rpm/sfos-upgrade.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpm/sfos-upgrade.spec b/rpm/sfos-upgrade.spec index 5ca9b23..8ca9cbe 100644 --- a/rpm/sfos-upgrade.spec +++ b/rpm/sfos-upgrade.spec @@ -98,3 +98,4 @@ cp bin/* %{buildroot}%{_bindir}/ %changelog * Thu Sep 9 1999 olf - 99.99.99 - See https://github.com/Olf0/sfos-upgrade/releases + From 5de5b7b9e0ac7c7de933ccd168a3f30518b24ccf Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 4 May 2023 03:49:43 +0200 Subject: [PATCH 2/5] Shorten URL in changelog --- 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 8ca9cbe..5db14ef 100644 --- a/rpm/sfos-upgrade.spec +++ b/rpm/sfos-upgrade.spec @@ -97,5 +97,5 @@ cp bin/* %{buildroot}%{_bindir}/ # Changelog format: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/SF4VVE4NBEDQJDJZ4DJ6YW2DTGMWP23E/#6O6DFC6GDOLCU7QC3QJKJ3VCUGAOTD24 %changelog * Thu Sep 9 1999 olf - 99.99.99 -- See https://github.com/Olf0/sfos-upgrade/releases +- See %{url}/releases From b74200740ff544ecdc7f2b982cc69d30ec1933f3 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 6 May 2023 20:29:54 +0200 Subject: [PATCH 3/5] Fix typo --- rpm/sfos-upgrade.spec | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/rpm/sfos-upgrade.spec b/rpm/sfos-upgrade.spec index 5db14ef..43e6880 100644 --- a/rpm/sfos-upgrade.spec +++ b/rpm/sfos-upgrade.spec @@ -1,18 +1,19 @@ Name: sfos-upgrade Summary: Scripts for fail-safe upgrading of SailfishOS at the command line with logging # The Git release tag format must adhere to just since version 3.6.0. -# The field adheres to semantic versioning and the field -# is comprised of {alpha,beta,rc,release} postfixed with a natural number -# greater or equal to 1 (e.g., "beta3") and may additonally be postfixed with a -# plus character ("+"), the name of the packager and a release number chosen by -# her (e.g., "rc2+jane4"). `{alpha|beta|rc|release}` indicates the expected -# status of the software. No other identifiers shall be used for any published -# version, but for the purpose of testing infrastructure other nonsensical -# identifiers as `adud` may be used, which do *not* trigger a 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 +# The tag must adhere to semantic versioning, for details see +# https://semver.org/ Version: 3.11.0 +# 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 +# number chosen by her (e.g., "rc2+jane4"). `{alpha|beta|rc|release}` +# indicates the expected status of the software. No other identifiers shall be +# used for any published version, but for the purpose of testing infrastructure +# other nonsensual identifiers as `adud` may be used, which do *not* trigger a +# 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: beta1 # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS From b9ccfff1616badd7c1e75c59a4165b70da378978 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 17 May 2023 04:05:56 +0200 Subject: [PATCH 4/5] [sfos-upgrade.spec] Move Vendor tag --- 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 43e6880..7c57355 100644 --- a/rpm/sfos-upgrade.spec +++ b/rpm/sfos-upgrade.spec @@ -19,11 +19,11 @@ Release: beta1 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Applications/System Distribution: SailfishOS -License: LGPL-2.1-only -URL: https://github.com/Olf0/%{name} # Altering the `Vendor:` field breaks the update path on SailfishOS, see # https://en.opensuse.org/SDB:Vendor_change_update#Disabling_Vendor_stickiness Vendor: olf +License: LGPL-2.1-only +URL: https://github.com/Olf0/%{name} # The "Source0:" line below requires that the value of %%{name} is also the # project name at GitHub and the value of %%{version} is also the name of a # correspondingly set git-tag. From 0a95dfa151edacb1b69b1458567ef7b0fce52f0d Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 18 May 2023 19:03:30 +0200 Subject: [PATCH 5/5] [sfos-upgrade.spec] Call it `rc` --- 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 7c57355..e756301 100644 --- a/rpm/sfos-upgrade.spec +++ b/rpm/sfos-upgrade.spec @@ -14,7 +14,7 @@ Version: 3.11.0 # 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: beta1 +Release: rc1 # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Applications/System