From df758d48bf8251738cc86a8a9bf6d026274eb3b0 Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 1 Dec 2022 01:07:35 +0100 Subject: [PATCH 1/4] Add devel & '*legacy*' for autobuilding on MRs (#106) --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 604bff84..4076bb1c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,8 @@ on: pull_request: branches: - master + - devel + - '*legacy*' jobs: build: From 81fa1ac75ddf66645d2c7e57c3035b16cfbf738b Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 1 Dec 2022 01:36:23 +0100 Subject: [PATCH 2/4] Fix %version (#107) * Fix %version * Fix-up number two --- rpm/harbour-storeman-installer.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rpm/harbour-storeman-installer.spec b/rpm/harbour-storeman-installer.spec index 4e127e62..cac36ef4 100644 --- a/rpm/harbour-storeman-installer.spec +++ b/rpm/harbour-storeman-installer.spec @@ -6,7 +6,7 @@ Name: harbour-storeman-installer # comprises one of {alpha,beta,rc,release} postfixed with a natural number # greater or equal to 1 (e.g., "beta3"). For details and reasons, see # https://github.com/storeman-developers/harbour-storeman-installer/wiki/Git-tag-format -Version: 1.3.1 +Version: 1.3.2 Release: release1 Group: Applications/System URL: https://github.com/storeman-developers/%{name} @@ -119,8 +119,10 @@ fi #%%{_sysconfdir}/%%{localauthority_dir}/50-%%{name}.pkla %changelog -* Thu Dec 01 2022 olf - 1.3.1-release1 +* Sat Dec 03 2022 olf - 1.3.2-release1 - Refine %%post section of the spec file (#96) +* Thu Dec 01 2022 olf - 1.3.1-release1 +- Fix auto-removing Storeman < 0.3.0 on SailfishOS ≥ 3.1.0 * Tue Nov 29 2022 olf - 1.3.0-release1 - Now automatically removes an installed Storeman 0.2.x when being installed (#95) - Enhance multiple aspects of the spec file (#89, #91, #93) From 93f51fd96090362d2a784214aececf7bf65838f0 Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 1 Dec 2022 02:29:30 +0100 Subject: [PATCH 3/4] Merge commit from v1.3.1 fix-up release (#109) * Try a fix and increase release --- rpm/harbour-storeman-installer.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/harbour-storeman-installer.spec b/rpm/harbour-storeman-installer.spec index cac36ef4..83ac7735 100644 --- a/rpm/harbour-storeman-installer.spec +++ b/rpm/harbour-storeman-installer.spec @@ -23,8 +23,8 @@ Requires: ssu # The oldest SailfishOS release Storeman ≥ 0.2.9 compiles for & the oldest available DoD repo at Sailfish-OBS: Requires: sailfish-version >= 3.1.0 Conflicts: harbour-storeman -Obsoletes: harbour-storeman = 0.2 -Provides: harbour-storeman = 0.3.0~ +Obsoletes: harbour-storeman < 0.3.0 +Provides: harbour-storeman = 0.3.0~0 %define localauthority_dir polkit-1/localauthority/50-local.d %define hicolor_icons_dir %{_datadir}/icons/hicolor From 4a1a38ba3ab0f9b34e1cd03c18933f4c9318cea5 Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 1 Dec 2022 02:35:22 +0100 Subject: [PATCH 4/4] Enhance recent changelog entries and their items (#110) --- rpm/harbour-storeman-installer.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/harbour-storeman-installer.spec b/rpm/harbour-storeman-installer.spec index 83ac7735..490bb7c2 100644 --- a/rpm/harbour-storeman-installer.spec +++ b/rpm/harbour-storeman-installer.spec @@ -122,9 +122,9 @@ fi * Sat Dec 03 2022 olf - 1.3.2-release1 - Refine %%post section of the spec file (#96) * Thu Dec 01 2022 olf - 1.3.1-release1 -- Fix auto-removing Storeman < 0.3.0 on SailfishOS ≥ 3.1.0 +- Fix auto-removing Storeman < 0.3.0 on SailfishOS ≥ 3.1.0 (#109) * Tue Nov 29 2022 olf - 1.3.0-release1 -- Now automatically removes an installed Storeman 0.2.x when being installed (#95) +- Now should automatically remove an installed Storeman < 0.3.0 when being installed (#95) - Enhance multiple aspects of the spec file (#89, #91, #93) - Many small enhancements of comments, strings and other non-code assets - Storeman Installer ≥ 1.3.0 is a prerequisite for Storeman ≥ 0.3.2