From b8213f7c02dcc322b6435a17abe71af4e77504ee Mon Sep 17 00:00:00 2001 From: olf Date: Sun, 29 Jan 2023 02:43:47 +0100 Subject: [PATCH 01/12] Use rpmlintrc (#395) --- rpm/harbour-storeman.rpmlintrc | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/rpm/harbour-storeman.rpmlintrc b/rpm/harbour-storeman.rpmlintrc index 8b137891..1c416129 100644 --- a/rpm/harbour-storeman.rpmlintrc +++ b/rpm/harbour-storeman.rpmlintrc @@ -1 +1,29 @@ - +# 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') +# - 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') +# +# 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[a-z]* rm') From fa8c9e0247727c579ea4f883a8e27d1a6679060e Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 30 Jan 2023 01:08:14 +0100 Subject: [PATCH 02/12] [rpmlintrc] Improve and beautify formatting (#396) --- rpm/harbour-storeman.rpmlintrc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/rpm/harbour-storeman.rpmlintrc b/rpm/harbour-storeman.rpmlintrc index 1c416129..48104541 100644 --- a/rpm/harbour-storeman.rpmlintrc +++ b/rpm/harbour-storeman.rpmlintrc @@ -3,7 +3,7 @@ # 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') @@ -11,7 +11,11 @@ addFilter('invalid-url DistURL') 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+rebuild1+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:') @@ -20,10 +24,11 @@ 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[a-z]* rm') + From 7491c7ab6446dd6b062eb5efad2b94205b927894 Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 30 Jan 2023 03:30:32 +0100 Subject: [PATCH 03/12] Improve harbour-storeman.rpmlintrc (#397) --- rpm/harbour-storeman.rpmlintrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpm/harbour-storeman.rpmlintrc b/rpm/harbour-storeman.rpmlintrc index 48104541..dcf2a4db 100644 --- a/rpm/harbour-storeman.rpmlintrc +++ b/rpm/harbour-storeman.rpmlintrc @@ -6,14 +6,14 @@ # On behalf of Jolla's tar_git / SailfishOS-OBS: # - It re-writes the DistURL, rendering it inconsistent -addFilter('invalid-url DistURL') +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+rebuild1+main.20230129011931.1.g584263a-1.8.1.jolla +# 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: @@ -30,5 +30,5 @@ setBadness('description-line-too-long', 0) 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[a-z]* rm') +addFilter('dangerous-command-in-%post[un]* rm') From b755fe28962c212944a4f1a2401eaaa76e8f1c3c Mon Sep 17 00:00:00 2001 From: olf Date: Mon, 30 Jan 2023 03:34:24 +0100 Subject: [PATCH 04/12] Stubs for v0.3.4 (#398) * [changelog] Stub entry for v0.3.4 * Post release version increase --- rpm/harbour-storeman.changes | 3 +++ rpm/harbour-storeman.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index afd036fa..b001345a 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -1,3 +1,6 @@ +* Mon Jan 30 2023 olf - 0.3.4 +- + * Sat Jan 28 2023 olf - 0.3.3 - Many minor, internal improvements diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec index 043b4474..cfedcd17 100644 --- a/rpm/harbour-storeman.spec +++ b/rpm/harbour-storeman.spec @@ -1,6 +1,6 @@ Name: harbour-storeman Summary: OpenRepos client application for SailfishOS -Version: 0.3.3 +Version: 0.3.4 Release: 1 Group: Applications/System License: MIT From e3236de007a1dd649f16b7f83fab4449bcbaf2a6 Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 9 Feb 2023 14:15:08 +0100 Subject: [PATCH 05/12] Add ceategories --- harbour-storeman.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/harbour-storeman.desktop b/harbour-storeman.desktop index dee9f07e..0573318b 100644 --- a/harbour-storeman.desktop +++ b/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/ From 5f2b2efa2602a4098eac2396ac6457b85b8da004 Mon Sep 17 00:00:00 2001 From: olf Date: Sat, 11 Feb 2023 02:13:07 +0100 Subject: [PATCH 06/12] Update RELEASE to 4.5.0.16 --- .github/workflows/build-sfos4.2_latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-sfos4.2_latest.yml b/.github/workflows/build-sfos4.2_latest.yml index a2b6aac3..28a1d006 100644 --- a/.github/workflows/build-sfos4.2_latest.yml +++ b/.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: From 2d10899007382b8d31c6c02ba9a328ad3c595ded Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 15 Feb 2023 04:43:14 +0100 Subject: [PATCH 07/12] =?UTF-8?q?Define=20(S)RPM=20compression=20sensibly,?= =?UTF-8?q?=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … also taking compatibility into account, see https://github.com/sailfishos-patches/patchmanager/pull/417#issuecomment-1429068156 --- rpm/harbour-storeman.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec index cfedcd17..b9affbce 100644 --- a/rpm/harbour-storeman.spec +++ b/rpm/harbour-storeman.spec @@ -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 From 5ce355d79134743ead4e6ca27f1724bfde9c5426 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 15 Feb 2023 04:48:02 +0100 Subject: [PATCH 08/12] =?UTF-8?q?Change=20ci-on-pull=5Freq=20from=20`armv7?= =?UTF-8?q?hl`=20to=20`i486`=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … see [Patchmanager PR \#417 (comment)](https://github.com/sailfishos-patches/patchmanager/pull/417#issuecomment-1430527430) --- .github/workflows/build-devel.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-devel.yml b/.github/workflows/build-devel.yml index e1fe321a..0c3a6feb 100644 --- a/.github/workflows/build-devel.yml +++ b/.github/workflows/build-devel.yml @@ -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 From f2fad82c4b73afb388ae58c8c4928b2062a1f650 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 15 Feb 2023 04:50:15 +0100 Subject: [PATCH 09/12] Fix forgot'o in commit 5ce355d --- .github/workflows/build-devel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-devel.yml b/.github/workflows/build-devel.yml index 0c3a6feb..097d8de2 100644 --- a/.github/workflows/build-devel.yml +++ b/.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 From 200b221090ac3d7028498658fd873677d36777b3 Mon Sep 17 00:00:00 2001 From: olf Date: Wed, 15 Feb 2023 23:55:06 +0100 Subject: [PATCH 10/12] =?UTF-8?q?Use=20`%if=200%{=3F=5Fchum}`=20to=20enabl?= =?UTF-8?q?e=20Chum=20metadata=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … conditionally, see https://github.com/sailfishos-chum/sailfishos-chum-gui/issues/149#issuecomment-1427147040 --- rpm/harbour-storeman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec index b9affbce..cde39af2 100644 --- a/rpm/harbour-storeman.spec +++ b/rpm/harbour-storeman.spec @@ -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: From cf8380008e5646c3b59c6c159ff787a1fb223516 Mon Sep 17 00:00:00 2001 From: olf Date: Thu, 16 Feb 2023 01:55:00 +0100 Subject: [PATCH 11/12] Fix `Source0:` link --- rpm/harbour-storeman.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec index cde39af2..da365b07 100644 --- a/rpm/harbour-storeman.spec +++ b/rpm/harbour-storeman.spec @@ -8,7 +8,7 @@ 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 @@ -143,4 +143,3 @@ exit 0 %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/mapplauncherd/privileges.d/%{name} %{_datadir}/dbus-1/services/harbour.storeman.service - From 90fcf9a4498046791acbd1f4f64ea861ea9aaf90 Mon Sep 17 00:00:00 2001 From: olf Date: Tue, 7 Mar 2023 04:45:34 +0100 Subject: [PATCH 12/12] Update changelog for v0.3.4 --- rpm/harbour-storeman.changes | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes index b001345a..fe871e93 100644 --- a/rpm/harbour-storeman.changes +++ b/rpm/harbour-storeman.changes @@ -1,5 +1,10 @@ -* Mon Jan 30 2023 olf - 0.3.4 -- +* Tue Mar 07 2023 olf - 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 - 0.3.3 - Many minor, internal improvements