Skip to content

Commit

Permalink
develmain: commits for v0.3.1 (#18)
Browse files Browse the repository at this point in the history
* Post release version increase

* Simplify as in Repo Config RPM v0.5.3

* Update license (#15)

* Update license

* Update LICENSE

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update LICENSE

* Change from `armv7hl` to `i486` …
  … see sailfishos-patches/patchmanager#417 (comment)

* Define (S)RPM compression sensibly, … 
  … see sailfishos-patches/patchmanager#417 (comment)

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

* Delete blank line

* Conflict & obsolete sailfishos-chum-repo-config*

* Add icons (#17)

* Add files via upload
  • Loading branch information
Olf0 authored Mar 10, 2023
2 parents 3ca149f + aa63995 commit 77d63ef
Show file tree
Hide file tree
Showing 44 changed files with 1,130 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:
- name: Prepare
run: mkdir RPMS

- name: Build armv7hl on 3.1.0.12
- name: Build i486 on 3.1.0.12
uses: coderus/github-sfos-build@old-stable
with:
release: 3.1.0.12
arch: armv7hl
arch: i486

- name: Upload build result
uses: actions/upload-artifact@v3
Expand Down
Binary file added .icons/108x108/sailfishos-chum-gui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/108x108/sailfishos-chum.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/128x128/sailfishos-chum-gui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/128x128/sailfishos-chum.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/172x172/sailfishos-chum-gui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/172x172/sailfishos-chum.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/256x256/sailfishos-chum-gui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/256x256/sailfishos-chum.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/480x480/sailfishos-chum-gui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/480x480/sailfishos-chum.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/560x560/sailfishos-chum-gui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/560x560/sailfishos-chum.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/86x86/sailfishos-chum-gui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/86x86/sailfishos-chum.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
235 changes: 235 additions & 0 deletions .icons/sailfishos-chum-gui.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/sailfishos-chum-gui_108.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/sailfishos-chum-gui_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/sailfishos-chum-gui_172.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/sailfishos-chum-gui_256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/sailfishos-chum-gui_480.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/sailfishos-chum-gui_560.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/sailfishos-chum-gui_86.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
216 changes: 216 additions & 0 deletions .icons/sailfishos-chum.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/sailfishos-chum_108.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/sailfishos-chum_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .icons/sailfishos-chum_172.png
Binary file added .icons/sailfishos-chum_256.png
Binary file added .icons/sailfishos-chum_480.png
Binary file added .icons/sailfishos-chum_560.png
Binary file added .icons/sailfishos-chum_86.png
400 changes: 400 additions & 0 deletions .icons/sailfishos-chum_combined.svg

Large diffs are not rendered by default.

265 changes: 265 additions & 0 deletions .icons/sailfishos-chum_combined_cleaned.svg

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion .icons/social-media/foo

This file was deleted.

Binary file added .icons/social-media/sailfishos-chum_1280x640.png
Binary file added .icons/social-media/sailfishos-chum_1500x500.png
Binary file added .icons/social-media/sailfishos-chum_960x640.png
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ DAMAGES.
modify it under the terms of the GNU Lesser General Public
License version 2.1 as published by the Free Software Foundation.

This library is distributed in the hope that it will be useful,
This software is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License version 2.1 (LGPLv2.1) for more details.
Expand All @@ -481,4 +481,4 @@ DAMAGES.
Original source of this license in the WWW:
https://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html

That's all there is to it!
That's all there is to it!
14 changes: 10 additions & 4 deletions rpm/sailfishos-chum-gui-installer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,13 @@ Conflicts: sailfishos-chum
Obsoletes: sailfishos-chum
Conflicts: sailfishos-chum-testing
Obsoletes: sailfishos-chum-testing
Conflicts: sailfishos-chum-repo-config
Obsoletes: sailfishos-chum-repo-config
Conflicts: sailfishos-chum-repo-config-testing
Obsoletes: sailfishos-chum-repo-config-testing
Provides: sailfishos-chum-repository

# %%global screenshots_url https://github.com/sailfishos-chum/sailfishos-chum-gui/raw/main/.xdata/screenshots/
# %%global screenshots_url https://github.com/sailfishos-chum/sailfishos-chum-gui/raw/main/.xdata/screenshots
%global logdir %{_localstatedir}/log
%global logfile %{logdir}/%{name}.log.txt

Expand All @@ -74,7 +78,7 @@ SailfishOS:Chum GUI Installer selects, downloads and installs the right variant
of the SailfishOS:Chum GUI application built for the CPU-architecture
of the device and its installed SailfishOS release.

%if "%{?vendor}" == "chum"
%if 0%{?_chum}
PackageName: SailfishOS:Chum GUI Installer
Type: desktop-application
Categories:
Expand All @@ -86,13 +90,16 @@ Categories:
DeveloperName: olf (Olf0)
Custom:
Repo: %{url}
Icon: %{url}/raw/main/.icons/%{name}.svg #Screenshots: - %%{screenshots_url}sailfishos-chum-gui-01.png
Icon: %{url}/raw/main/.icons/sailfishos-chum-gui.svg #Screenshots: - %%{screenshots_url}/sailfishos-chum-gui-01.png
Url:
Homepage: https://openrepos.net/content/olf/sailfishoschum-gui-installer
Help: %{url}/issues
Bugtracker: %{url}/issues
%endif

%define _binary_payload w6.gzdio
%define _source_payload w6.gzdio

%prep
%setup -q

Expand Down Expand Up @@ -165,4 +172,3 @@ exit 0
%changelog
* Thu Sep 9 1999 olf <[email protected]> - 99.99.99
- See %{url}/releases

0 comments on commit 77d63ef

Please sign in to comment.