From e8d718f795abb95efd5f8ba618ce0df511582d28 Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 25 Nov 2024 02:03:48 +0100 Subject: [PATCH 1/2] =?UTF-8?q?`devel`=E2=86=92`init-v0.7.3`:=20Rebase=20(?= =?UTF-8?q?#506)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [harbour-storeman.spec] Fix, comment and enhance `%post` scriptlet … (#505) * [harbour-storeman.spec] Fix, comment and enhance `%post` scriptlet by copying the changes from Storeman Installer v2.2.8 to v2.3.0; see Storeman Installer PR #319 for details. * [harbour-storeman.spec] Create a second, fixed v0.7.2 release * [harbour-storeman.changes] Update for a second v0.7.2 release --- rpm/harbour-storeman.changes | 6 ++---- rpm/harbour-storeman.spec | 14 ++++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index 0b07ebae..446d7dc3 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -1,8 +1,6 @@ -* Thu Nov 14 2024 olf - 0.7.3 -- - -* Mon Nov 11 2024 olf - 0.7.2 +* Mon Nov 25 2024 olf - 0.7.2 - Rework OBS repository handling, part 2: Improve (#498) +- Fix, comment and enhance `%post` scriptlet (#505) * Mon Nov 04 2024 olf - 0.7.1 - Handle `harbour-storeman-obs` SailfishOS-OBS-repository for self-updating well, when Storeman was not installed by the Storeman Installer diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec index afc4db19..c24ebfa3 100644 --- a/rpm/harbour-storeman.spec +++ b/rpm/harbour-storeman.spec @@ -3,7 +3,7 @@ Name: harbour-storeman Summary: OpenRepos client application for SailfishOS # The tag must adhere to semantic versioning: Among multiple other # reasons due to its use for `qmake5` in line 107. See https://semver.org/ -Version: 0.7.3 +Version: 0.7.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: 0.7.3 # build at GitHub and OBS, when configured accordingly; mind the sorting # (`adud` < `alpha`). For details and reasons, see # https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format -Release: release1_%{branch} +Release: release2_%{branch} # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS Group: Software Management/Package Manager @@ -132,15 +132,15 @@ VERSION_ID='' source %{_sysconfdir}/os-release sailfish_version="$(echo "$VERSION_ID" | cut -s -f 1-3 -d '.' | tr -d '.')" # sailfish_version must be an all numerical string of at least three digits: -if ! echo "sailfish_version" | grep -q '^[0-9][0-9][0-9][0-9]*$' -then - echo "Error: VERSION_ID=$VERSION_ID => sailfish_version=$sailfish_version" >&2 +if [ $(echo "$sailfish_version" | grep -c '^[0-9][0-9][0-9][0-9]*$') != 1 ] +then echo "Error: VERSION_ID=$VERSION_ID => sailfish_version=$sailfish_version" >&2 else # Ensure that the repo config is correct: If it is missing or a fixed # SFOS-release number was used, set it anew. release_macro="$(grep '^harbour-storeman-obs=' %{_sysconfdir}/ssu/ssu.ini | grep -o '/[[:graph:]][[:graph:]][[:graph:]][[:graph:]]*/$' | grep -o '%%(release[[:alpha:]]*)')" if [ $sailfish_version -ge 460 ] && [ "$release_macro" != '%%(releaseMajorMinor)' ] then + # No `ssu rr harbour-storeman-obs` needed, because an `ssu ar ` overwrites an extant entry. ssu ar harbour-storeman-obs 'https://repo.sailfishos.org/obs/home:/olf:/harbour-storeman/%%(releaseMajorMinor)_%%(arch)/' ssu_ur=yes elif [ $sailfish_version -lt 460 ] && [ "$release_macro" != '%%(release)' ] @@ -149,9 +149,7 @@ else ssu_ur=yes fi fi -if [ $ssu_ur = yes ] -then ssu ur -fi +[ $ssu_ur = yes ] && ssu ur # BTW, `ssu`, `rm -f`, `mkdir -p` etc. *always* return with "0" ("success"), hence # no appended `|| true` needed to satisfy `set -e` for failing commands outside of # flow control directives (if, while, until etc.). Furthermore Fedora Docs etc. From e713d64640270a21fa01c600d976f1feb1960e5d Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 25 Nov 2024 02:06:45 +0100 Subject: [PATCH 2/2] [harbour-storeman.changes] Update placeholder date for v0.7.3 (#507) [harbour-storeman.changes] Update placeholder date for v0.7.3 --- rpm/harbour-storeman.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index 446d7dc3..652e38a2 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -1,3 +1,6 @@ +* Wed Nov 27 2024 olf - 0.7.3 +- + * Mon Nov 25 2024 olf - 0.7.2 - Rework OBS repository handling, part 2: Improve (#498) - Fix, comment and enhance `%post` scriptlet (#505)