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:
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
diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
index 03f79bc2..f85cf459 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 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)
}
diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes
index d9e65325..01394e75 100644
--- a/rpm/harbour-storeman.changes
+++ b/rpm/harbour-storeman.changes
@@ -1,3 +1,9 @@
+* 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
- Add comments to Transifex configuration file `.tx/config.yml` (dd97396)
@@ -499,3 +505,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
diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec
index 4f791877..4e1de3bf 100644
--- a/rpm/harbour-storeman.spec
+++ b/rpm/harbour-storeman.spec
@@ -1,13 +1,27 @@
%global branch sfos3.2
Name: harbour-storeman
Summary: OpenRepos client application for SailfishOS
-Version: 0.3.5
+# 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.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
+# 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
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
@@ -90,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
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