From b69f8a1cccc28da76bcec9b955a1d584dc7fca6b Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 4 May 2023 03:39:40 +0200 Subject: [PATCH 01/11] Add comment --- rpm/harbour-storeman.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec index fd98fedb..d445ba32 100644 --- a/rpm/harbour-storeman.spec +++ b/rpm/harbour-storeman.spec @@ -8,6 +8,8 @@ Release: release1_%{branch} Group: Software Management/Package Manager License: MIT URL: https://github.com/storeman-developers/%{name} +# Altering the `Vendor:` field breaks the update path on SailfishOS, see +# https://en.opensuse.org/SDB:Vendor_change_update#Disabling_Vendor_stickiness Vendor: meego # The "Source0:" line below requires that the value of %%{name} is also the # project name at GitHub and the value of `%%{release}/%%{version}` is also From 5f2f7ccb4a92b7115acce114badbfe83d72e5fed Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 4 May 2023 03:58:48 +0200 Subject: [PATCH 02/11] Document changelog format --- rpm/harbour-storeman.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index d9e65325..4eb2cffc 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -499,3 +499,5 @@ * Mon Jul 3 2017 Petr Tsymbarovich - 0.0.1 - Initial release + +# Changelog format: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/SF4VVE4NBEDQJDJZ4DJ6YW2DTGMWP23E/#6O6DFC6GDOLCU7QC3QJKJ3VCUGAOTD24 From 6e8dbbf7f1d4608b82a4640c548f965bc1ad34c5 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 6 May 2023 20:39:18 +0200 Subject: [PATCH 03/11] Omit apparently superfluous processing of `%{version}` for `qmake5` (#405) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Omit apparently superfluous processing of … … `%{version}` for `qmake5`. * Add normative comment for `version` and `release` tags * Fix grammar * Shorten by one line * Fix typo --- rpm/harbour-storeman.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec index d445ba32..b9710438 100644 --- a/rpm/harbour-storeman.spec +++ b/rpm/harbour-storeman.spec @@ -1,7 +1,19 @@ %global branch sfosX.Y 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 102. See https://semver.org/ Version: 0.3.5 +# 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/storeman-developers/harbour-storeman/wiki/Git-tag-format Release: release1_%{branch} # The Group tag should comprise one of the groups listed here: # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS @@ -92,7 +104,7 @@ Links: %setup -q %build -%qmake5 VERSION=%(echo '%{version}' | grep -o '^[0-9][0-9]*.[0-9][0-9]*.[0-9][0-9]*') +%qmake5 VERSION=%{version} make %{?_smp_mflags} %install From 61c14e464641593cec0c8a1a371a78af857883f7 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 6 May 2023 20:46:13 +0200 Subject: [PATCH 04/11] Post release version increase --- rpm/harbour-storeman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec index b9710438..2a546ee3 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 102. See https://semver.org/ -Version: 0.3.5 +Version: 0.3.6 # 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 f9a50d3758910d7a6a6ea53ac3e9d3338fb546ac Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 6 May 2023 20:48:18 +0200 Subject: [PATCH 05/11] Add stub for v0.3.6 --- rpm/harbour-storeman.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index 4eb2cffc..33e95437 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -1,3 +1,6 @@ +* Sun May 06 2023 olf - 0.3.6 +- Foo + * Wed May 03 2023 olf - 0.3.5 - Alter git tag format for releases (c504524, bb0da90, c2e9488, a51b66f, 27a608e, 82c81f8, dd6c643, e197605, 5914b1a, ab66732, 8d5b933), see https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format - Add comments to Transifex configuration file `.tx/config.yml` (dd97396) From 122d0ce190ae8780fb09f2a4ef7936039d9076f2 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 7 May 2023 04:56:29 +0200 Subject: [PATCH 06/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 691273ff..231f10f1 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ OpenRepos client application for SailfishOS ## Feature set -### Working with [OpenRepos.net](https://openrepos.net/) +### Working with [OpenRepos](https://openrepos.net/) #### Discover applications - Search for applications - List recently updated applications From bf70d672c60394296ae3b98997616755cdd68b70 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 7 May 2023 17:42:20 +0200 Subject: [PATCH 07/11] =?UTF-8?q?Cease=20pointing=20to=20OpenRepos=20for?= =?UTF-8?q?=20issues=20=E2=80=A6=20(#428)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Cease pointing to OpenRepos for issues … … plus some wording and formatting enhancements. * Enhance wording --- qml/pages/AboutPage.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 03f79bc2..23fe12af 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -50,8 +50,8 @@ Page { wrapMode: Text.WordWrap horizontalAlignment: Qt.AlignHCenter //% "

OpenRepos client application for SailfishOS
 

" - //% "

Storeman is Free Software (FLOSS), distributed under the terms of the MIT license.

" - //% "

Issues shall be reported preferably at GitHub or alternatively at OpenRepos (use the buttons below).

" + //% "

Storeman is Free Software (FLOSS), distributed under the terms of the MIT license.
 

" + //% "

Any issues (bug reports, feature suggestions, help inquiries etc.) shall be filed at GitHub (you may use the button below).

" text: qsTrId("orn-app-description-full").arg("https://github.com/storeman-developers/harbour-storeman/raw/master/LICENSE") onLinkActivated: Qt.openUrlExternally(link) } From 5bc01e14468a278c82a6fcd29a0b5be62e0f113e Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 7 May 2023 19:45:37 +0200 Subject: [PATCH 08/11] Shorten wording (#429) --- qml/pages/AboutPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 23fe12af..f85cf459 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -51,7 +51,7 @@ Page { horizontalAlignment: Qt.AlignHCenter //% "

OpenRepos client application for SailfishOS
 

" //% "

Storeman is Free Software (FLOSS), distributed under the terms of the MIT license.
 

" - //% "

Any issues (bug reports, feature suggestions, help inquiries etc.) shall be filed at GitHub (you may use the button below).

" + //% "

Any issues (bug reports, feature suggestions, help requests etc.) shall be filed at GitHub (you may use the button below).

" text: qsTrId("orn-app-description-full").arg("https://github.com/storeman-developers/harbour-storeman/raw/master/LICENSE") onLinkActivated: Qt.openUrlExternally(link) } From 1be72ac0eef2da3e48cdd28cb9444924816e0942 Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 21 May 2023 19:49:46 +0200 Subject: [PATCH 09/11] Omit `test*_` tag for building (#430) * [build-sfos4.2_latest.yml] Omit `test*_` * [build-sfos4.2.yml] Omit `test*_` * [build-sfos3.3.yml] Omit `test*_` * [build-sfos3.3.yml] Remove empty line * [build-sfos3.1.yml] Omit `test*_` --- .github/workflows/build-sfos3.1.yml | 1 - .github/workflows/build-sfos3.3.yml | 2 -- .github/workflows/build-sfos4.2.yml | 1 - .github/workflows/build-sfos4.2_latest.yml | 1 - 4 files changed, 5 deletions(-) diff --git a/.github/workflows/build-sfos3.1.yml b/.github/workflows/build-sfos3.1.yml index 14edd30d..f510c808 100644 --- a/.github/workflows/build-sfos3.1.yml +++ b/.github/workflows/build-sfos3.1.yml @@ -10,7 +10,6 @@ on: - 'rc*_sfos3.2/*' - 'beta*_sfos3.2/*' - 'alpha*_sfos3.2/*' - - 'test*_sfos3.2/*' - 'sfos3.2/*' pull_request: branches: diff --git a/.github/workflows/build-sfos3.3.yml b/.github/workflows/build-sfos3.3.yml index 4f9d36f7..74a22fb5 100644 --- a/.github/workflows/build-sfos3.3.yml +++ b/.github/workflows/build-sfos3.3.yml @@ -1,6 +1,5 @@ name: CI - sfos3.3 branch on SFOS 3.3.0 (armv7hl,i486) & SFOS 4.0.1 (aarch64) - env: RELEASE: 3.3.0.14 @@ -11,7 +10,6 @@ on: - 'rc*_sfos3.3/*' - 'beta*_sfos3.3/*' - 'alpha*_sfos3.3/*' - - 'test*_sfos3.3/*' - 'sfos3.3/*' pull_request: branches: diff --git a/.github/workflows/build-sfos4.2.yml b/.github/workflows/build-sfos4.2.yml index 256ce03b..21b3bbc1 100644 --- a/.github/workflows/build-sfos4.2.yml +++ b/.github/workflows/build-sfos4.2.yml @@ -10,7 +10,6 @@ on: - 'rc*_sfos4.2/*' - 'beta*_sfos4.2/*' - 'alpha*_sfos4.2/*' - - 'test*_sfos4.2/*' - 'sfos4.2/*' pull_request: branches: diff --git a/.github/workflows/build-sfos4.2_latest.yml b/.github/workflows/build-sfos4.2_latest.yml index 71dd76de..f41fa4dd 100644 --- a/.github/workflows/build-sfos4.2_latest.yml +++ b/.github/workflows/build-sfos4.2_latest.yml @@ -11,7 +11,6 @@ on: - 'rc*_sfos4.2/*' - 'beta*_sfos4.2/*' - 'alpha*_sfos4.2/*' - - 'test*_sfos4.2/*' - 'sfos4.2/*' pull_request: branches: From 942f10fe3562cd1b35433315dac18d67966387ee Mon Sep 17 00:00:00 2001 From: Peter G Date: Tue, 20 Jun 2023 12:41:30 +0200 Subject: [PATCH 10/11] [Packaging] Only package qm files (#431) * [Packaging] Only package qm files Before this change, Storeman rpms contained translations/README.md, translations.pri, and .ts files, all of which are unnecessary in an installed app. * Be more specific about the file ending --------- Co-authored-by: nephros --- translations/translations.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/translations.pri b/translations/translations.pri index 29e89a45..46f44d45 100644 --- a/translations/translations.pri +++ b/translations/translations.pri @@ -30,7 +30,7 @@ qm.CONFIG = target_predeps no_link QMAKE_EXTRA_COMPILERS += qm -translations.files = $$OUT_PWD/translations +translations.files = $$OUT_PWD/translations/*.qm translations.path = $$PREFIX/share/$$TARGET INSTALLS += translations From 87d4b04576c74384fceb1821b1c7de79f569178e Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 21 Jun 2023 02:49:07 +0200 Subject: [PATCH 11/11] [harbour-storeman.changes] Start listing changes for v0.3.6 --- rpm/harbour-storeman.changes | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index 33e95437..01394e75 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -1,5 +1,8 @@ -* Sun May 06 2023 olf - 0.3.6 -- Foo +* Wed Jun 21 2023 olf - 0.3.6 +- Omit apparently superfluous processing of `%{version}` for qmake5 in the spec file (#405) +- Some minor documentation and strings improvements (#428, #429, #430) +- Cease CI building on git tags matching `test*_` (#430) +- Trim packaging by omitting i18n files which are superfluous in the final RPM (#431; detected, analysed and implemented by @nephros) * Wed May 03 2023 olf - 0.3.5 - Alter git tag format for releases (c504524, bb0da90, c2e9488, a51b66f, 27a608e, 82c81f8, dd6c643, e197605, 5914b1a, ab66732, 8d5b933), see https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format