qcrypto→sfos220+qcrypto: Alter macro name again

README.md

@@ -40,11 +40,11 @@ Thus *crypto-sdcard* solely protects "data at rest" on SD-cards and other remova
 This is a coarse changelog covering the most relevant changes for each minor release.  The detailed changes of each point release are denoted on [the releases page](https://github.com/Olf0/crypto-sdcard/releases).
 * Planned for v2.0 and later<br />
   The "key"-file path and names are ultimately settled on (please rename your "key"-files accordingly):
-  * For Cryptsetup LUKS: `/etc/amount-encr/<UUID>`
-  * For Cryptsetup "plain": `/etc/amount-encr/<device-name>`
+  * For Cryptsetup LUKS: `/etc/amount-enc/<UUID>`
+  * For Cryptsetup "plain": `/etc/amount-enc/<device-name>`
   * A specific `<UUID>` can be obtained by executing `blkid -c /dev/null -s UUID -o value /dev/<device-name>` with e.g. `mmcblk1p2` as `<device-name>`.
 * v1.7<br />
-  Completely re-write [the Polkit rule file](https://github.com/Olf0/crypto-sdcard/blob/master/polkit-1/localauthority/50-local.d/69-cryptosd.pkla).  Also document the awkward Polkit configuration file format situation in [On-Poklkit.md](https://github.com/Olf0/crypto-sdcard/blob/master/On-Polkit.md).<br />
+  Completely re-wrote [the Polkit rule file](https://github.com/Olf0/crypto-sdcard/blob/master/polkit-1/localauthority/50-local.d/69-cryptosd.pkla).  Also document the awkward Polkit configuration file format situation in [On-Poklkit.md](https://github.com/Olf0/crypto-sdcard/blob/master/On-Polkit.md).<br />
   <sub>Introduce units for manual mounting (and implicit, automatic unlocking / opening of a "crypto container"), which work in "rescue" (Systemd's single user) target / mode: `mnt-cryptosd-luks@<UUID>.service` and `mnt-cryptosd-plain@<device-name>.service`</sub>
 * v1.6<br />
   Refactor and vastly enhance [the Udev rule file](https://github.com/Olf0/crypto-sdcard/blob/master/udev/rules.d/96-cryptosd.rules).

RPM-dependencies_Git-workflow.md

@@ -77,6 +77,9 @@ For *crypto-sdcard*, starting with version 1.3.1, ...
            -----------> sfos321  (second field of release string: sfos321regular)
   ```
   I may convert this to the full, generic scheme, but AFAICS there is little to be gained, as there are no regular commits directly to the *sfos321* "feature & release" branch (in contrast to the *qcrypto* "feature branch"), after the initial commit creating it.  Consequently the commit flow (merge) from the *sfos321* to the *sfos321+qcrypto* branch only happened once (which is nice, because it is implicitly a merge with conflicts).
+
+  ***Edit (2023):*** Also the diagram above has been superseded by a much better one on the wiki page "[Git commit workflow](https://github.com/Olf0/crypto-sdcard/wiki/Git-commit-workflow)".
+
 
 #### Addendum
 [Rubdos developed](https://forum.sailfishos.org/t/release-notes-suomenlinna-4-3-0/8495/242) an elegant and technically more sophisticated implementation of this versioning scheme for compiled software, which solely relies on [a spec-file](https://gitlab.com/whisperfish/whisperfish/-/commit/05e3c9dc6abf823f1939ed8013b1d53628388bfc).

rpm/crypto-sdcard.spec

@@ -1,23 +1,21 @@
-%global min_sfos_rel sfosABC
+%global min_sfos sfosABC
 Name:          crypto-sdcard_sbj
 Summary:       Configuration files for automatic unlocking and mounting encrypted media
 # The version adheres to semantic versioning v2.0.0, see https://semver.org/
 Version:       1.7.4
-# Since version 1.7.3, the release version consists of two or three fields,
+# Since version 1.7.4, the release version consists of two or three fields,
 # separated by dots ("."):
 # - The first field must contain a natural number greater than zero.  This number
 #   should be prefixed by one of {alpha,beta,rc,release}, which results in, e.g.,
 #   "alpha42".
-# - The second field must contain the git branch from which this release is
-#   built; it comprises the minimal required SailfishOS version A.B.C.X in the
-#   format "sfosABC" (the fourth field of a SailfishOS version ("X") is neither
-#   depended upon or denoted) plus if this is a version which utilises
-#   Qualcomm's `qcrypto` kernel module by appending "+qcrypto" to this field.
+# - The second field comprises the minimal required SailfishOS version A.B.C.X in
+#   the format "sfosABC" (the fourth field of a SailfishOS version ("X") is
+#   neither depended upon or denoted).
 # - An optional third field might be used by downstream packagers, who alter the
 #   package but want to retain the exact version number.  It should consist of
 #   the packager's name appended with a natural number greater than zero as the
 #   packaging release number, e.g "jane23".
-Release:       beta2.%{min_sfos_rel}
+Release:       beta2.%{min_sfos}
 # Since v1.7.3, Git tags must adhere to the following format starting (adapted
 # from Storeman's format:
 # https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format ),
@@ -26,8 +24,11 @@ Release:       beta2.%{min_sfos_rel}
 #   `%%{release}`.
 # - The second field is simply the content of the `Version:` tag, i.e.,
 #   `%%{version}`.
-Group:         System/Base
+# The Group tag should comprise one of the groups listed here:
+# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
+Group:         System/Startup Services
 Distribution:  SailfishOS
+# To be set for v2 to "Vendor: meego"!
 Vendor:        olf
 License:       LGPL-2.1-only
 URL:           https://github.com/Olf0/%{name}
@@ -76,7 +77,7 @@ Categories:
 DeveloperName: olf (Olf0)
 Custom:
   Repo: %{url}
-Icon: %{url}/raw/master/icon/smartmedia_mount.256x256.png
+Icon: %{url}/raw/master/.icon/smartmedia_mount.256x256.png
 Url:
   Homepage: https://openrepos.net/content/olf/%{name}
   Help: %{url}/issues
@@ -112,6 +113,8 @@ cp -R polkit-1 systemd udev %{buildroot}%{_sysconfdir}/
 %dir %{_sysconfdir}/%{name}
 %config %{_sysconfdir}/systemd/system/cryptosd.conf
 
+# 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
+