master→sfos3.3: commits for v0.3.4 (#402)

* Use rpmlintrc (#395)

* [rpmlintrc] Improve and beautify formatting (#396)

* Improve harbour-storeman.rpmlintrc (#397)

* Stubs for v0.3.4 (#398)

* [changelog] Stub entry for v0.3.4

* Post release version increase

* Add categories to desktop file

* Update RELEASE to 4.5.0.16 in CI configuration

* Define (S)RPM compression sensibly, …
  … also taking compatibility into account, see sailfishos-patches/patchmanager#417 (comment)

* Change ci-on-pull_req from `armv7hl` to `i486` …
  … see [Patchmanager PR \#417 (comment)](sailfishos-patches/patchmanager#417 (comment))

* Fix forgot'o in commit 5ce355d

* Use `%if 0%{?_chum}` to enable Chum metadata …
  … conditionally, see sailfishos-chum/sailfishos-chum-gui#149 (comment)

* Fix `Source0:` link in spec file

* Update changelog for v0.3.4

.github/workflows/build-devel.yml

@@ -1,4 +1,4 @@
-name: CI - devel branch on SFOS 3.3.0 (armv7hl)
+name: CI - devel branch on SFOS 3.3.0 (i486)
 
 env:
   RELEASE: 3.3.0.14
@@ -29,11 +29,11 @@ jobs:
     - name: Prepare
       run: mkdir RPMS
 
-    - name: Build armv7hl
+    - name: Build i486
       uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
-        arch: armv7hl
+        arch: i486
 
     - name: Upload build result
       uses: actions/upload-artifact@v3

.github/workflows/build-sfos4.2_latest.yml

@@ -1,7 +1,7 @@
 name: CI - sfos4.2 branch on latest SFOS (aarch64,armv7hl,i486)
 
 env:
-  RELEASE: 4.4.0.68
+  RELEASE: 4.5.0.16
   # See https://hub.docker.com/r/coderus/sailfishos-platform-sdk/tags
 
 on:

harbour-storeman.desktop

@@ -4,6 +4,7 @@ X-Nemo-Application-Type=silica-qt5
 Icon=harbour-storeman
 Exec=harbour-storeman
 Name=Storeman
+Categories=System;Utility;Network;Settings;PackageManager;
 
 [X-HarbourBackup]
 BackupPathList=.config/harbour-storeman/:.local/share/harbour-storeman/

rpm/harbour-storeman.changes

@@ -1,3 +1,11 @@
+* Tue Mar 07 2023 olf <Olf0@users.noreply.github.com> - 0.3.4
+- Use rpmlintrc file (#394, #396, #397)
+- Update changelog file (#398, #400)
+- Update and improve CI configuration (5f2b2ef, 5ce355d, f2fad82)
+- Add categories to desktop file (e3236de)
+- Use `%if 0%{?_chum}` to enable Chum metadata (200b221)
+- Fix `Source0:` link in spec file (cf83800)
+
 * Sat Jan 28 2023 olf <Olf0@users.noreply.github.com> - 0.3.3
 - Many minor, internal improvements
 

rpm/harbour-storeman.rpmlintrc

@@ -1 +1,34 @@
+# References: An exceptionally comprehensive example rpmlintrc file
+# https://github.com/coreos/tectonic-rpms/blob/master/rpmlint-config
+# but adheres to the old syntax, not the new TOML one: https://toml.io/en/
+# See also https://fedoraproject.org/wiki/Common_Rpmlint_issues and
+# https://en.opensuse.org/openSUSE:Packaging_checks#Building_Packages_in_spite_of_errors
+
+# On behalf of Jolla's tar_git / SailfishOS-OBS:
+# - It re-writes the DistURL, rendering it inconsistent
+addFilter('invalid-url DistURL obs:')
+# - It has a limited list of FLOSS-licenses, most SDPX-IDs are missing
+addFilter('invalid-license')
+# - It extracts strange changelog entries out of Git, if a %%changelog section is used
+addFilter('incoherent-version-in-changelog')
+# - It sometimes re-writes the %version-%release strings of package names, 
+#   when referencing (only) a branch (i.e., not a git tag), for example,
+#   0.5.2-1 to 0.5.2+main.20230129011931.1.g584263a-1.8.1.jolla
+addFilter('filename-too-long-for-joliet')
+
+# On behalf of the SailfishOS:Chum specification:
+# - which re-uses the spec file tag "Url:"
+addFilter('tag-in-description Url:')
+# - which also re-uses the spec file tag "Icon:"
+addFilter('tag-in-description Icon:')
+# - which makes one easily do
+addFilter('description-line-too-long')
+setBadness('description-line-too-long', 0)
+
+# On our own behalf:
+# - This is how it ought to be
+addFilter('obsolete-not-provided harbour-storeman-installer')
+addFilter('unversioned Obsoletes: Obsoletes:  *harbour-storeman-installer')
+# - This is also how it ought to be
+addFilter('dangerous-command-in-%post[un]* rm')
 

rpm/harbour-storeman.spec

@@ -1,14 +1,14 @@
 Name:           harbour-storeman
 Summary:        OpenRepos client application for SailfishOS
-Version:        0.3.3
+Version:        0.3.4
 Release:        1
 Group:          Applications/System
 License:        MIT
 URL:            https://github.com/storeman-developers/%{name}
 # The "Source0:" line below requires 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.
-Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        %{url}/archive/sfosX.Y_release/%{version}-%{release}/%{name}-%{version}.tar.gz
 # Note that the rpmlintrc file must be named so according to
 # https://en.opensuse.org/openSUSE:Packaging_checks#Building_Packages_in_spite_of_errors
 Source99:       %{name}.rpmlintrc
@@ -47,7 +47,7 @@ Obsoletes:      %{name}-installer
 Storeman manages repositories and applications from OpenRepos.net
 on your SailfishOS device.
 
-%if "%{?vendor}" == "chum"
+%if 0%{?_chum}
 PackageName: Storeman for SailfishOS
 Type: desktop-application
 Categories:
@@ -76,6 +76,11 @@ Url:
   Donation: https://openrepos.net/donate
 %endif
 
+# Define (S)RPM compression sensibly, also taking compatibility into account, see
+# https://github.com/sailfishos-patches/patchmanager/pull/417#issuecomment-1429068156
+%define _source_payload w6.gzdio
+%define _binary_payload w2.xzdio
+
 %prep
 %setup -q
 
@@ -138,4 +143,3 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/mapplauncherd/privileges.d/%{name}
 %{_datadir}/dbus-1/services/harbour.storeman.service
-