From 942b181a0a185ffc1e10879e64fae93b3a1a64a1 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 18 May 2022 03:04:37 +0200 Subject: [PATCH 1/5] spec file: Post release version increase to 1.2.9 (#71) --- rpm/harbour-storeman-installer.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rpm/harbour-storeman-installer.spec b/rpm/harbour-storeman-installer.spec index 7204f224..731f812e 100644 --- a/rpm/harbour-storeman-installer.spec +++ b/rpm/harbour-storeman-installer.spec @@ -1,7 +1,7 @@ Summary: Installs Storeman for SailfishOS License: MIT Name: harbour-storeman-installer -Version: 1.2.8 +Version: 1.2.9 Release: release1 Group: Applications/System URL: https://github.com/storeman-developers/%{name} @@ -90,6 +90,8 @@ ssu ur %{hicolor_icons_dir}/*/apps/%{name}.png %changelog +* Sun May 15 2022 olf - 1.2.9-release1 +- Foo * Sun May 15 2022 olf - 1.2.8-release1 - Requires: sailfish-version >= 3.1.0 (#61), because this is the oldest SailfishOS release any Storeman version installed by Storeman Installer will work on. * Sun Apr 10 2022 olf - 1.2.7-release1 From abe0b5d9066a6e979cb4677239b7adfd48469a85 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 22 May 2022 03:37:10 +0200 Subject: [PATCH 2/5] Overhaul comments in spec file (#72) --- rpm/harbour-storeman-installer.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/rpm/harbour-storeman-installer.spec b/rpm/harbour-storeman-installer.spec index 731f812e..3cf6fce3 100644 --- a/rpm/harbour-storeman-installer.spec +++ b/rpm/harbour-storeman-installer.spec @@ -1,11 +1,22 @@ Summary: Installs Storeman for SailfishOS License: MIT Name: harbour-storeman-installer +# The Git release tag format is - since version 1.2.9. +# 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"). For details and reasons, see +# https://github.com/Olf0/sfos-upgrade/wiki/Git-tag-format Version: 1.2.9 Release: release1 Group: Applications/System URL: https://github.com/storeman-developers/%{name} -Source: https://github.com/storeman-developers/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +# These "Source:" lines below require that the value of %{name} is also the +# project name at GitHub and the value of %{version}-%{release} is also the +# name of a correspondingly set git-tag. +# Alternative links, which also download ${projectname}-${tagname}.tar.gz: +# Source: https://github.com/storeman-developers/%{name}/archive/%{version}-%{release}.tar.gz +# Source: https://github.com/storeman-developers/%{name}/archive/refs/tags/%{version}-%{release}.tar.gz +Source: https://github.com/storeman-developers/%{name}/archive/%{version}-%{release}/%{name}-%{version}-%{release}.tar.gz BuildArch: noarch BuildRequires: desktop-file-utils Requires: ssu From 0f4df714169368ed710543fd7bfd12be60203820 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 22 May 2022 04:47:11 +0200 Subject: [PATCH 3/5] spec file: Revert BS from PR #72 (#73) --- rpm/harbour-storeman-installer.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rpm/harbour-storeman-installer.spec b/rpm/harbour-storeman-installer.spec index 3cf6fce3..6d8e4e31 100644 --- a/rpm/harbour-storeman-installer.spec +++ b/rpm/harbour-storeman-installer.spec @@ -1,22 +1,22 @@ Summary: Installs Storeman for SailfishOS License: MIT Name: harbour-storeman-installer -# The Git release tag format is - since version 1.2.9. +# The Git release tag format must adhere to just since version 1.2.6. # 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"). For details and reasons, see -# https://github.com/Olf0/sfos-upgrade/wiki/Git-tag-format +# https://github.com/storeman-developers/harbour-storeman-installer/wiki/Git-tag-format Version: 1.2.9 Release: release1 Group: Applications/System URL: https://github.com/storeman-developers/%{name} -# These "Source:" lines below require that the value of %{name} is also the -# project name at GitHub and the value of %{version}-%{release} is also the -# name of a correspondingly set git-tag. +# These "Source:" lines below require 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. # Alternative links, which also download ${projectname}-${tagname}.tar.gz: -# Source: https://github.com/storeman-developers/%{name}/archive/%{version}-%{release}.tar.gz -# Source: https://github.com/storeman-developers/%{name}/archive/refs/tags/%{version}-%{release}.tar.gz -Source: https://github.com/storeman-developers/%{name}/archive/%{version}-%{release}/%{name}-%{version}-%{release}.tar.gz +# Source: https://github.com/storeman-developers/${name}/archive/${version}.tar.gz +# Source: https://github.com/storeman-developers/${name}/archive/refs/tags/${version}.tar.gz +Source: https://github.com/storeman-developers/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: desktop-file-utils Requires: ssu From 425efc2cde93a99cdf311b791d9270c57f4f7751 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 28 May 2022 19:08:33 +0200 Subject: [PATCH 4/5] pkcon expects options before the command, see (#74) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … https://www.systutorials.com/docs/linux/man/1-pkcon/ --- bin/harbour-storeman-installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/harbour-storeman-installer b/bin/harbour-storeman-installer index a25e34f2..56eb7594 100644 --- a/bin/harbour-storeman-installer +++ b/bin/harbour-storeman-installer @@ -1,4 +1,4 @@ #!/bin/sh pkcon repo-set-data harbour-storeman-obs refresh-now true -pkcon install -y harbour-storeman +pkcon -y install harbour-storeman From 5adfd091d08961113b0610488ad7803fe56f2cfe Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 4 Jun 2022 01:50:29 +0200 Subject: [PATCH 5/5] spec file: Update `%changelog` section for 1.2.9 (#75) --- 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 6d8e4e31..57e52d14 100644 --- a/rpm/harbour-storeman-installer.spec +++ b/rpm/harbour-storeman-installer.spec @@ -101,8 +101,8 @@ ssu ur %{hicolor_icons_dir}/*/apps/%{name}.png %changelog -* Sun May 15 2022 olf - 1.2.9-release1 -- Foo +* Sat Jun 04 2022 olf - 1.2.9-release1 +- pkcon expects options before the command (#74) * Sun May 15 2022 olf - 1.2.8-release1 - Requires: sailfish-version >= 3.1.0 (#61), because this is the oldest SailfishOS release any Storeman version installed by Storeman Installer will work on. * Sun Apr 10 2022 olf - 1.2.7-release1