devel→master: Final commits for v0.4.2.-rc1 (#44)

* [filecase.ts] Fix spelling of FileCase (#42) * [.gitignore] Add missed space character * [filecase.spec] Revert 3bdfb03 * [build-on-tags.yml] Fix using the wrong action-branch for SFOS < 4.1.0 (#43) * [filecase.spec] Release first beta still without `Vendor` set * [README.md] Align screenshots in table * [README.md] Relative image links * [build-on-tags.yml] Lower highest target release from `4.4.0.68` to `4.3.0.12` * [filecase.spec] Set release to `rc1` instead of `beta1`
sailfishos-applications · Oct 29, 2023 · d47f244 · d47f244
2 parents f7106d0 + fcc7913
commit d47f244
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git a/.github/workflows/build-on-tags.yml b/.github/workflows/build-on-tags.yml
@@ -47,20 +47,14 @@ jobs:
     - name: Prepare
       run: mkdir RPMS
 
-    - name: Build aarch64 on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
-      with:
-        release: ${{ env.RELEASE }}
-        arch: aarch64
-
     - name: Build armv7hl on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: armv7hl
 
     - name: Build i486 on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: i486
@@ -97,13 +91,13 @@ jobs:
       run: mkdir RPMS
 
     - name: Build armv7hl on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: armv7hl
 
     - name: Build i486 on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: i486
@@ -140,19 +134,19 @@ jobs:
       run: mkdir RPMS
 
     - name: Build aarch64 on 4.0.1.45
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: 4.0.1.45
         arch: aarch64
 
     - name: Build armv7hl on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: armv7hl
 
     - name: Build i486 on ${{ env.RELEASE }}
-      uses: coderus/github-sfos-build@master
+      uses: coderus/github-sfos-build@old-stable
       with:
         release: ${{ env.RELEASE }}
         arch: i486
@@ -168,7 +162,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       # For the available docker images, see https://github.com/CODeRUS/docker-sailfishos-platform-sdk
-      RELEASE: 4.4.0.68
+      RELEASE: 4.3.0.12
       # Do not wait up to the default of 10 minutes for network timeouts in a workflow which runs ca. 10 minutes.
       SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
     steps:

diff --git a/.gitignore b/.gitignore
@@ -27,7 +27,7 @@ Makefile*
 *.autosave
 *.list
 
-#QtCtreator Qml
+# QtCtreator Qml
 *.qmlproject.user
 *.qmlproject.user.*
 

diff --git a/README.md b/README.md
@@ -30,12 +30,12 @@ If you want to translate FileCase to a language it does not support yet or impro
 |       |       |       |       |       |
 | :---: | :---: | :---: | :---: | :---: |
 |       |       |       |       |       |
-| ![View files and directories](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-001.jpg) | ![Select files and directories](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-002.jpg) | ![View file properties with media preview](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-003.jpg) | ![Storage locations](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-004.jpg) | ![Cloud storage locations](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-005.jpg) |
-| <sub>View files and directories</sub> | <sub>Select files and directories</sub>  | <sub>View file properties with media preview</sub> | <sub>Storage locations</sub> | <sub>Cloud storage locations</sub> |
+| ![View files and directories](./.xdata/screenshots/screenshot-001.jpg?raw=true) | ![Select files and directories](./.xdata/screenshots/screenshot-002.jpg?raw=true) | ![View file properties with media preview](./.xdata/screenshots/screenshot-003.jpg?raw=true) | ![Storage locations](./.xdata/screenshots/screenshot-004.jpg?raw=true) | ![Cloud storage locations](./.xdata/screenshots/screenshot-005.jpg?raw=true) |
+| <sub>View files and directories</sub> | <sub>Select files and directories</sub>  | <sub>View file properties,<br />with media preview</sub> | <sub>Storage locations</sub> | <sub>Cloud storage locations</sub> |
 |       |       |       |       |       |
 |       |       |       |       |       |
-| ![Settings page](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-006.jpg) | ![Share page](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-007.jpg) | ![Creating archive files](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-008.jpg) | ![Extracting archive files](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-009.jpg) | ![Transfers page](https://github.com/sailfishos-applications/filecase/raw/master/.xdata/screenshots/screenshot-010.jpg) |
-| <sub>Settings page</sub> | <sub>Share page</sub>  | <sub>Creating archive files</sub> | <sub>Extracting archive files</sub> | <sub>Transfers page</sub> |
+| ![Settings page](./.xdata/screenshots/screenshot-006.jpg?raw=true) | ![Share page](./.xdata/screenshots/screenshot-007.jpg?raw=true) | ![Creating archive files](./.xdata/screenshots/screenshot-008.jpg?raw=true) | ![Extracting archive files](./.xdata/screenshots/screenshot-009.jpg?raw=true) | ![Transfers page](./.xdata/screenshots/screenshot-010.jpg?raw=true) |
+| <sub>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Settings&nbsp;page&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</sub> | <sub>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Share&nbsp;page&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</sub>  | <sub>&nbsp;Creating&nbsp;archive&nbsp;files&nbsp;</sub> | <sub>Extracting&nbsp;archive&nbsp;files</sub> | <sub>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Transfers&nbsp;page&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</sub> |
 |       |       |       |       |       |
 
 ## History of FileCase

diff --git a/rpm/filecase.spec b/rpm/filecase.spec
@@ -11,8 +11,8 @@ Summary:    An advanced file-manager for SailfishOS
 # The <version> tag must adhere to semantic versioning: Among multiple other
 # reasons due to its use for `qmake5` in line 107.  See https://semver.org/
 Version:    0.4.2
-# The <release> tag *may* comprise one of {alpha,beta,rc,release} postfixed with
-# a natural number greater or equal to 1 (e.g., "beta3") and may additionally be
+# The <release> tag comprisees 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
@@ -21,20 +21,20 @@ Version:    0.4.2
 # 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:    beta1
+Release:    rc1
 # The Group tag should comprise one of the groups listed here:
 # https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
 Group:      Applications/File
 License:    MPL-2.0-no-copyleft-exception
 URL:        https://github.com/sailfishos-applications/%{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
+#Vendor:     meego
 # The "Source0:" line below requires that the value of %%{name} is also the
-# project name at GitHub and the value of `%%{version}-%%{release}` is also
+# project name at GitHub and the value of `%%{release}/%%{version}` is also
 # the name of a correspondingly set Git tag.  For details and reasons, see
 # https://github.com/storeman-developers/harbour-storeman/wiki/Git-tag-format
-Source0:    %{url}/archive/%{version}-%{release}/%{name}-%{version}.tar.gz
+Source0:    %{url}/archive/%{release}/%{version}/%{name}-%{version}.tar.gz
 # Note that the rpmlintrc file MUST be named exactly so according to
 # https://en.opensuse.org/openSUSE:Packaging_checks#Building_Packages_in_spite_of_errors
 Source99:   %{name}.rpmlintrc