Skip to content

Commit

Permalink
develmaster: First round of commits for release5/2.2.4 (#301)
Browse files Browse the repository at this point in the history
* Post release version increase (#300)

* Add comment

* Enhance comment

* Pick a proper `Group:` tag

* Document `%changelog` format

* Omit  and [the SailfishOS-OBS](https://build.merproject.org/package/show/home:olf:harbour-storeman/harbour-storeman-installer)

* [harbour-storeman-installer.spec] Adapt to new git-tag format

* [harbour-storeman-installer.spec] Improve spelling

* [harbour-storeman-installer.spec] Update comments

* [build.yml] `/` is not covered by `*` wildcard
  • Loading branch information
Olf0 authored May 18, 2023
2 parents e6c62d2 + 624bcc5 commit 86df6f6
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 19 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
tags:
- '*'
- '*/*'
pull_request:
branches:
- master
Expand Down
9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Starting with version 0.2.9, Storeman is built by the help of the SailfishOS-OBS and initially installed by the Storeman Installer (or manually). To update from Storeman <&nbsp;0.2.9 (requires SailfishOS ≥&nbsp;3.1.0), one should reinstall Storeman via the Storeman Installer. After an initial installation of Storeman ≥&nbsp;0.3.0, further updates of Storeman will be performed within Storeman, as usual.

The Storeman Installer works on any SailfishOS release ≥&nbsp;3.1.0 and all supported CPU-architectures (armv7hl, i486 and aarch64). The current Storeman Installer RPM can be obtained from its ["latest release" page at GitHub](https://github.com/storeman-developers/harbour-storeman-installer/releases/latest), [OpenRepos.net](https://openrepos.net/content/olf/storeman-installer) and [the SailfishOS-OBS](https://build.merproject.org/package/show/home:olf:harbour-storeman/harbour-storeman-installer).
The Storeman Installer works on any SailfishOS release ≥&nbsp;3.1.0 and all supported CPU-architectures (armv7hl, i486 and aarch64). The current Storeman Installer RPM can be obtained from its ["latest release" page at GitHub](https://github.com/storeman-developers/harbour-storeman-installer/releases/latest) and [OpenRepos.net](https://openrepos.net/content/olf/storeman-installer).

RPMs of [older Storeman releases are also available at OpenRepos](https://openrepos.net/content/olf/storeman-legacy), e.g., v0.1.8 which works on SailfishOS 2.2.1 and may work on older SailfishOS 2 releases.

Expand All @@ -22,7 +22,7 @@ RPMs of [older Storeman releases are also available at OpenRepos](https://openre

* Initial installation without having Storeman or SailfishOS:Chum already installed
1. Enable "System → Security → Untrusted software → Allow untrusted software" in the SailfishOS Settings app.
2. Download the current Storeman Installer RPM from its ["latest release" page at GitHub](https://github.com/storeman-developers/harbour-storeman-installer/releases/latest), [OpenRepos.net](https://openrepos.net/content/olf/storeman-installer) or the [SailfishOS-OBS](https://build.merproject.org/package/show/home:olf:harbour-storeman/harbour-storeman-installer).
2. Download the current Storeman Installer RPM from its ["latest release" page at GitHub](https://github.com/storeman-developers/harbour-storeman-installer/releases/latest) or [OpenRepos.net](https://openrepos.net/content/olf/storeman-installer).
3. Tap on the "File downloaded" notification on your SailfishOS device or select the downloaded RPM file in a file-manager app and choose "Install" in its pulley menu; then confirm the installation.
4. Preferably disable "Allow untrusted software" again.

Expand All @@ -33,11 +33,6 @@ RPMs of [older Storeman releases are also available at OpenRepos](https://openre
3. Enable olf's repository in the top pulley menu.
4. Install *Storeman Installer*.

* Installation via SailfishOS:Chum GUI application
1. Search for *Installer* in "Applications".
2. Select *Storeman Installer*.
3. Install *Storeman Installer*.

### Features of Storeman Installer

* The Storeman Installer is automatically removed ("uninstalled") when Storeman is being installed.
Expand Down
35 changes: 23 additions & 12 deletions rpm/harbour-storeman-installer.spec
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
Summary: Installs Storeman for SailfishOS
License: LGPL-2.1-only
Name: harbour-storeman-installer
# The Git release tag format must adhere to just <version>. The <version>
# field adheres to semantic versioning and the <release> field comprises a
# natural number greater or equal to 1, which may be prefixed with one of
# {alpha,beta,rc,release} (e.g., "beta3"). For details and reasons, see
# https://github.com/storeman-developers/harbour-storeman-installer/wiki/Git-tag-format
Version: 2.2.3
Release: release4
Group: Applications/System
# The Git tag format must adhere to <release>/<version> since 2023-05-18.
# The <version> tag must adhere to semantic versioning, for details see
# https://semver.org/
Version: 2.2.4
# 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://github.com/Olf0/sfos-upgrade/wiki/Git-tag-format
Release: release5
# 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
URL: https://github.com/storeman-developers/%{name}
# These "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
# 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 the
# name of a correspondingly set Git tag.
Source0: %{url}/archive/%{release}/%{version}/%{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
Expand Down Expand Up @@ -180,6 +190,7 @@ exit 0
%files
%attr(0754,root,ssu) %{_bindir}/%{name}

# Changelog format: https://lists.fedoraproject.org/archives/list/[email protected]/thread/SF4VVE4NBEDQJDJZ4DJ6YW2DTGMWP23E/#6O6DFC6GDOLCU7QC3QJKJ3VCUGAOTD24
%changelog
* Thu Sep 9 1999 olf <[email protected]> - 99.99.99
- See %{url}/releases
Expand Down

0 comments on commit 86df6f6

Please sign in to comment.