master→sfos4.2: Changes for v0.3.6 (#432) (#435)

* Add comment

* Document changelog format

* Omit apparently superfluous processing of `%{version}` for `qmake5` (#405)

* Add normative comment for `version` and `release` tags

* Fix grammar

* Shorten by one line

* Fix typo

* Post release version increase

* Add stub for v0.3.6

* Update README.md

* Cease pointing to OpenRepos for issues plus some wording and formatting enhancements. (#428)

* Enhance wording

* Shorten wording (#429)

* 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*_`

* [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 <nemo@pgxperiiia10>

* [harbour-storeman.changes] Start listing changes for v0.3.6

---------

Co-authored-by: Peter G <[email protected]>
Co-authored-by: nephros <nemo@pgxperiiia10>

.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:

.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:

.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:

.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:

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

qml/pages/AboutPage.qml

@@ -50,8 +50,8 @@ Page {
  wrapMode: Text.WordWrap
  horizontalAlignment: Qt.AlignHCenter
  //% "<p>OpenRepos client application for SailfishOS<br />&nbsp;</p>"
- //% "<p>Storeman is Free Software (FLOSS), distributed under the terms of the <a href='%1'>MIT&nbsp;license</a>.</p>"
- //% "<p>Issues shall be reported preferably at GitHub or alternatively at OpenRepos (use the buttons below).</p>"
+ //% "<p>Storeman is Free Software (FLOSS), distributed under the terms of the <a href='%1'>MIT&nbsp;license</a>.<br />&nbsp;</p>"
+ //% "<p>Any issues (bug reports, feature suggestions, help requests etc.) shall be filed at GitHub (you may use the button below).</p>"
  text: qsTrId("orn-app-description-full").arg("https:/storeman-developers/harbour-storeman/raw/master/LICENSE")
  onLinkActivated: Qt.openUrlExternally(link)
  }

rpm/harbour-storeman.changes

@@ -1,3 +1,9 @@
+* Wed Jun 21 2023 olf <[email protected]> - 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 <[email protected]> - 0.3.5
 - Alter git tag format for releases (c504524, bb0da90, c2e9488, a51b66f, 27a608e, 82c81f8, dd6c643, e197605, 5914b1a, ab66732, 8d5b933), see https:/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 <[email protected]> - 0.0.1
 - Initial release
+
+# Changelog format: https://lists.fedoraproject.org/archives/list/[email protected]/thread/SF4VVE4NBEDQJDJZ4DJ6YW2DTGMWP23E/#6O6DFC6GDOLCU7QC3QJKJ3VCUGAOTD24

rpm/harbour-storeman.spec

@@ -1,13 +1,27 @@
 %global branch sfos4.2
 Name: harbour-storeman
 Summary: OpenRepos client application for SailfishOS
-Version: 0.3.5
+# The <version> 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 <release> 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:/storeman-developers/harbour-storeman/wiki/Git-tag-format
 Release: release1_%{branch}
 # The Group tag should comprise one of the groups listed here:
 # https:/mer-tools/spectacle/blob/master/data/GROUPS
 Group: Software Management/Package Manager
 License: MIT
 URL: https:/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

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