From f290e6ad02a434d7484ae4f08e8561f604c1330a Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 20 Jun 2023 14:54:49 +0800 Subject: [PATCH 01/29] fix(ci): autobuild build json-build (#596) * fix(ci): autobuild Signed-off-by: madomado * fix(ci): build Signed-off-by: madomado * fix: json-build Signed-off-by: madomado * Update autobuild.yml Signed-off-by: madomado --------- Signed-off-by: madomado --- .github/workflows/autobuild.yml | 6 +++--- .github/workflows/build.yml | 2 +- .github/workflows/json-build.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 0e144665d5..e2f86b6051 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -79,10 +79,10 @@ jobs: - name: Notify Madoguchi (Success) if: success() && github.event_name == 'push' - run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} - name: Notify Madoguchi (Failure) if: ( cancelled() || failure() ) && github.event_name == 'push' - run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} - name: Lint RPMs and SRPMs id: lint @@ -153,7 +153,7 @@ jobs: - name: Create commit comment if: success() && env.err == 'true' - uses: peter-evans/commit-comment@v1 + uses: peter-evans/commit-comment@v2 with: body: | [run_id: ${{github.run_id}}](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}}) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55d8213e5d..a1531ad333 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,4 +63,4 @@ jobs: run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} - name: Notify Madoguchi (Failure) if: ( cancelled() || failure() ) && github.event_name == 'push' - run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index 971da70095..6c7fdc1ebb 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -49,7 +49,7 @@ jobs: - name: Notify Madoguchi (Success) if: success() && github.event_name == 'push' - run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} - name: Notify Madoguchi (Failure) if: ( cancelled() || failure() ) && github.event_name == 'push' - run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} From 060c8422042ecdb3126b9efa6ff8e3d6e6b46aba Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 20 Jun 2023 20:23:53 +0800 Subject: [PATCH 02/29] bump: libappimage (#597) Upstream uses the tag `1.0.4-5` and GitHub treats it as if it's earlier than `1.0.4`. Therefore, update.rhai is temporarily disabled. --- anda/lib/libappimage/libappimage.spec | 3 ++- anda/lib/libappimage/{update.rhai => update.rhai.bak} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename anda/lib/libappimage/{update.rhai => update.rhai.bak} (100%) diff --git a/anda/lib/libappimage/libappimage.spec b/anda/lib/libappimage/libappimage.spec index f47b533de2..63797c4507 100644 --- a/anda/lib/libappimage/libappimage.spec +++ b/anda/lib/libappimage/libappimage.spec @@ -1,4 +1,4 @@ -%global libver 1.0.4 +%global libver 1.0.4-5 # replace - with ~ %global libver_format %(v=%{libver}; sed -e 's/-/~/' <<< $v) @@ -49,6 +49,7 @@ developing applications that use %{name}. echo "#include " > a.h cat src/libappimage/utils/hashlib.h >> a.h mv a.h src/libappimage/utils/hashlib.h +rm docs/{make.bat,.gitignore} %build diff --git a/anda/lib/libappimage/update.rhai b/anda/lib/libappimage/update.rhai.bak similarity index 100% rename from anda/lib/libappimage/update.rhai rename to anda/lib/libappimage/update.rhai.bak From c9b0e35fa9b76c53c371473d45857477338408fd Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 20 Jun 2023 16:18:14 +0000 Subject: [PATCH 03/29] bump: zellij --- anda/rust/zellij/rust-zellij.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/rust/zellij/rust-zellij.spec b/anda/rust/zellij/rust-zellij.spec index 9f2d0ba340..959a79848b 100644 --- a/anda/rust/zellij/rust-zellij.spec +++ b/anda/rust/zellij/rust-zellij.spec @@ -5,7 +5,7 @@ %global crate zellij Name: rust-zellij -Version: 0.37.1 +Version: 0.37.2 Release: 1%{?dist} Summary: Terminal workspace with batteries included From 0455e3b2346005ac44844bb25fcad74d5e684ee7 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 20 Jun 2023 20:36:29 +0000 Subject: [PATCH 04/29] bump: ruff --- anda/python/ruff/python3-ruff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec index 319c3c3821..d4e4d87d64 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/python/ruff/python3-ruff.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.0.272 +Version: 0.0.273 Release: 1%{?dist} Summary: An extremely fast Python linter, written in Rust License: MIT From 6c3daed8cb19b1ad6e470d92637ff922d051c9de Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 20 Jun 2023 22:43:52 +0000 Subject: [PATCH 05/29] bump: felix --- anda/rust/felix/rust-felix.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/rust/felix/rust-felix.spec b/anda/rust/felix/rust-felix.spec index c288355612..3ea2f34f2c 100644 --- a/anda/rust/felix/rust-felix.spec +++ b/anda/rust/felix/rust-felix.spec @@ -2,7 +2,7 @@ %global crate felix Name: rust-felix -Version: 2.4.0 +Version: 2.4.1 Release: 1%{?dist} Summary: Tui file manager with vim-like key mapping From 299d270f27fc66c81938b83c2216c75ed73e607b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 21 Jun 2023 01:20:09 +0000 Subject: [PATCH 06/29] bump: discord-canary-openasar discord-canary sass --- .../apps/discord-canary-openasar/discord-canary-openasar.spec | 4 ++-- anda/apps/discord-canary/discord-canary.spec | 4 ++-- anda/others/sass/sass.spec | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 3d8c0c4f62..17db8c4ff7 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: discord-canary-openasar -Version: 0.0.160 -Release: 2%{?dist} +Version: 0.0.161 +Release: 1%{?dist} Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms URL: https://github.com/GooseMod/OpenAsar diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index a8ed52c7fa..de2878575b 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: discord-canary -Version: 0.0.160 -Release: 2%{?dist} +Version: 0.0.161 +Release: 1%{?dist} Summary: Free Voice and Text Chat for Gamers URL: discord.com Source0: https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz diff --git a/anda/others/sass/sass.spec b/anda/others/sass/sass.spec index 72d9171d5a..79d09accd0 100644 --- a/anda/others/sass/sass.spec +++ b/anda/others/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.63.4 +Version: 1.63.5 Release: 1%{?dist} Summary: The reference implementation of Sass, written in Dart License: MIT From 27e2da96ef3ad3b6de9eb4e0ef29088d96663700 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 21 Jun 2023 01:28:51 +0000 Subject: [PATCH 07/29] bump(nightly): latte-dock-nightly nim-nightly vala-nightly --- anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec | 2 +- anda/nim/nim-nightly/nim-nightly.spec | 2 +- anda/vala/vala-nightly/vala-nightly.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec index 8fc4ee6a4f..178fd9b0bd 100644 --- a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec +++ b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/KDE/latte-dock/ -%global commit 4cc612284dd3ae76e2159cd846cf137fde802d52 +%global commit b58cdd7882dfa7d5c13848364f1bc974131d9d09 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} diff --git a/anda/nim/nim-nightly/nim-nightly.spec b/anda/nim/nim-nightly/nim-nightly.spec index f9706a568b..c39da0cb31 100644 --- a/anda/nim/nim-nightly/nim-nightly.spec +++ b/anda/nim/nim-nightly/nim-nightly.spec @@ -1,5 +1,5 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 2054f1c3a9c78ac13593e90845807e9e64f22553 +%global commit db41f04ab0734b0ac5267b46f306b0a311f7fc71 %global ver 1.9.5 %global debug_package %nil diff --git a/anda/vala/vala-nightly/vala-nightly.spec b/anda/vala/vala-nightly/vala-nightly.spec index cb5b033337..355b711442 100644 --- a/anda/vala/vala-nightly/vala-nightly.spec +++ b/anda/vala/vala-nightly/vala-nightly.spec @@ -3,7 +3,7 @@ %global priority 90 %global real_name vala -%global commit 123a29b5838fb769f28e71f510f707f8d9bca7dc +%global commit ad2fe714f6a6f4a9b4fff6f4b59a4294506125e3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git From 0b65bc7926b67d0e16de4e107a87be53b0814353 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 21 Jun 2023 04:17:03 +0000 Subject: [PATCH 08/29] bump: osu-lazer ruff --- anda/games/osu-lazer/osu-lazer.spec | 2 +- anda/python/ruff/python3-ruff.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index b12d711e7a..1de9fc6a4e 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: osu-lazer -Version: 2023.617.0 +Version: 2023.621.0 Release: 1%{?dist} Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec index d4e4d87d64..f7cd2d45ab 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/python/ruff/python3-ruff.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.0.273 +Version: 0.0.274 Release: 1%{?dist} Summary: An extremely fast Python linter, written in Rust License: MIT From 0371c3c832952744ba3fee8232bd91302b0e3c4b Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 21 Jun 2023 05:14:05 +0000 Subject: [PATCH 09/29] bump: golang-github-fyshos-fynedesk --- .../golang-github-fyshos-fynedesk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/desktops/golang-github-fyshos-fynedesk/golang-github-fyshos-fynedesk.spec b/anda/desktops/golang-github-fyshos-fynedesk/golang-github-fyshos-fynedesk.spec index 8ccf3ed5a3..0ab7cb8262 100644 --- a/anda/desktops/golang-github-fyshos-fynedesk/golang-github-fyshos-fynedesk.spec +++ b/anda/desktops/golang-github-fyshos-fynedesk/golang-github-fyshos-fynedesk.spec @@ -5,7 +5,7 @@ # https://github.com/FyshOS/fynedesk %global goipath github.com/FyshOS/fynedesk -Version: 0.3.0 +Version: 0.2.0 %gometa -f @@ -17,7 +17,7 @@ A full desktop environment for Linux/Unix using Fyne.} %global godocs AUTHORS README.md CHANGELOG.md Name: %{goname} -Release: %autorelease +Release: 1%{?dist} Summary: A full desktop environment for Linux/Unix using Fyne License: BSD-3-Clause From 7f1431001fe0eac5e46f9f1da88c57502fb5a7a4 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 21 Jun 2023 05:36:24 +0000 Subject: [PATCH 10/29] bump: golang-github-fyshos-fynedesk --- .../golang-github-fyshos-fynedesk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/golang-github-fyshos-fynedesk/golang-github-fyshos-fynedesk.spec b/anda/desktops/golang-github-fyshos-fynedesk/golang-github-fyshos-fynedesk.spec index 0ab7cb8262..3d344a0595 100644 --- a/anda/desktops/golang-github-fyshos-fynedesk/golang-github-fyshos-fynedesk.spec +++ b/anda/desktops/golang-github-fyshos-fynedesk/golang-github-fyshos-fynedesk.spec @@ -5,7 +5,7 @@ # https://github.com/FyshOS/fynedesk %global goipath github.com/FyshOS/fynedesk -Version: 0.2.0 +Version: 0.3.0 %gometa -f From 0b5fa625c31579fbfe1fce44ac56d9f8bb29f4a2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 21 Jun 2023 12:28:25 +0000 Subject: [PATCH 11/29] bump: moby-compose --- anda/moby-extras/moby-compose/moby-compose.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/moby-extras/moby-compose/moby-compose.spec b/anda/moby-extras/moby-compose/moby-compose.spec index 9251a8ac22..c027fe16cb 100644 --- a/anda/moby-extras/moby-compose/moby-compose.spec +++ b/anda/moby-extras/moby-compose/moby-compose.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: moby-compose -Version: 2.18.1 +Version: 2.19.0 Release: 1%{?dist} Summary: Define and run multi-container applications with Docker From c9d9be8d8dbb348572ddfeca749ae038ddff22ca Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 21 Jun 2023 12:55:14 +0000 Subject: [PATCH 12/29] bump: youki --- anda/rust/youki/youki.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/rust/youki/youki.spec b/anda/rust/youki/youki.spec index acb3f72068..f9c243346b 100644 --- a/anda/rust/youki/youki.spec +++ b/anda/rust/youki/youki.spec @@ -1,6 +1,6 @@ Name: youki -Version: 0.0.5 -Release: 2%{?dist} +Version: 0.1.0 +Release: 1%{?dist} Summary: A container runtime written in Rust License: Apache-2.0 From 181611d7a2eb8bc118cfdff7c039f8b08ea0fbbc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 21 Jun 2023 19:11:10 +0000 Subject: [PATCH 13/29] bump: discord-ptb-openasar discord-ptb --- anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec | 4 ++-- anda/apps/discord-ptb/discord-ptb.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index 74ab8915e8..8209a66337 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: discord-ptb-openasar -Version: 0.0.42 -Release: 2%{?dist} +Version: 0.0.43 +Release: 1%{?dist} Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms URL: https://github.com/GooseMod/OpenAsar diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index bcd769d1f3..3f74aa55d5 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: discord-ptb -Version: 0.0.42 -Release: 2%{?dist} +Version: 0.0.43 +Release: 1%{?dist} Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com Source0: https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz From 33d34575942c5bab93a12543dd2187f75f0431dc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 21 Jun 2023 22:12:58 +0000 Subject: [PATCH 14/29] bump: sass --- anda/others/sass/sass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/others/sass/sass.spec b/anda/others/sass/sass.spec index 79d09accd0..f98d1c1c85 100644 --- a/anda/others/sass/sass.spec +++ b/anda/others/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.63.5 +Version: 1.63.6 Release: 1%{?dist} Summary: The reference implementation of Sass, written in Dart License: MIT From c4accee04174cf9515a26da0f40a85814b0d83af Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 22 Jun 2023 01:21:29 +0000 Subject: [PATCH 15/29] bump: apparmor electron --- anda/lib/apparmor/apparmor.spec | 2 +- anda/tools/electron/electron.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/apparmor/apparmor.spec b/anda/lib/apparmor/apparmor.spec index 207d2ee9ff..87ef32a7bf 100644 --- a/anda/lib/apparmor/apparmor.spec +++ b/anda/lib/apparmor/apparmor.spec @@ -3,7 +3,7 @@ %bcond_with tests Name: apparmor -Version: 3.1.5 +Version: 3.1.6 Release: 1%{?dist} Summary: AppArmor userspace components diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 5258011610..78ed3f3ffd 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -6,7 +6,7 @@ %endif Name: electron -Version: 25.1.1 +Version: 25.2.0 Release: 1%{?dist} Summary: Build cross platform desktop apps with web technologies License: MIT From e4488ef5a99b0b834440a1a5a58eacf795b14f44 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 22 Jun 2023 01:37:06 +0000 Subject: [PATCH 16/29] bump(nightly): nim-nightly vala-nightly --- anda/nim/nim-nightly/nim-nightly.spec | 2 +- anda/vala/vala-nightly/vala-nightly.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/nim/nim-nightly/nim-nightly.spec b/anda/nim/nim-nightly/nim-nightly.spec index c39da0cb31..26f9076c96 100644 --- a/anda/nim/nim-nightly/nim-nightly.spec +++ b/anda/nim/nim-nightly/nim-nightly.spec @@ -1,5 +1,5 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit db41f04ab0734b0ac5267b46f306b0a311f7fc71 +%global commit ac7b8b678c9e8eff70bb8147d411664470a882fd %global ver 1.9.5 %global debug_package %nil diff --git a/anda/vala/vala-nightly/vala-nightly.spec b/anda/vala/vala-nightly/vala-nightly.spec index 355b711442..95a97dd716 100644 --- a/anda/vala/vala-nightly/vala-nightly.spec +++ b/anda/vala/vala-nightly/vala-nightly.spec @@ -3,7 +3,7 @@ %global priority 90 %global real_name vala -%global commit ad2fe714f6a6f4a9b4fff6f4b59a4294506125e3 +%global commit 83d66f14eca60fe11dfa25f4e7f1bbab497933c9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git From 50951d0771715781a15d1c5f871581e36a1f7a2c Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 22 Jun 2023 16:20:41 +0800 Subject: [PATCH 17/29] fix: manrope (#603) --- anda/fonts/manrope/.gitignore | 4 ---- anda/fonts/manrope/README.md | 3 --- anda/fonts/manrope/manrope-fonts.spec | 25 +++++++++++-------------- anda/fonts/manrope/update.rhai | 8 ++++++++ 4 files changed, 19 insertions(+), 21 deletions(-) delete mode 100644 anda/fonts/manrope/.gitignore delete mode 100644 anda/fonts/manrope/README.md create mode 100644 anda/fonts/manrope/update.rhai diff --git a/anda/fonts/manrope/.gitignore b/anda/fonts/manrope/.gitignore deleted file mode 100644 index ad8d3e2ce3..0000000000 --- a/anda/fonts/manrope/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.tar.gz -*.zip -*.rpm -*.log \ No newline at end of file diff --git a/anda/fonts/manrope/README.md b/anda/fonts/manrope/README.md deleted file mode 100644 index a00893803b..0000000000 --- a/anda/fonts/manrope/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# manrope-fonts - -Manrope – modern geometric sans-serif, packaged for use in tauOS diff --git a/anda/fonts/manrope/manrope-fonts.spec b/anda/fonts/manrope/manrope-fonts.spec index ad5687874b..1e50271c7c 100644 --- a/anda/fonts/manrope/manrope-fonts.spec +++ b/anda/fonts/manrope/manrope-fonts.spec @@ -1,19 +1,20 @@ +%global commit ffa0fdf363527c9993b8836cce48cd12bd2b81ba + Summary: A modernist sans serif font Name: manrope-fonts -Version: 1 -Release: 3%{?dist} +Version: 4.505 +Release: 1%{?dist} License: OFL-1.1 -URL: https://manropefont.com/ +URL: https://github.com/sharanda/manrope -Source0: https://manropefont.com/manrope.zip -Source1: README.md +Source0: %url/archive/%commit.tar.gz BuildArch: noarch %description Manrope – modern geometric sans-serif %prep -yes A | %autosetup -c +%autosetup -n manrope-%commit %build @@ -23,24 +24,20 @@ install -pm 644 fonts/otf/*.otf %{buildroot}%{_datadir}/fonts/manrope install -pm 644 fonts/ttf/*.ttf %{buildroot}%{_datadir}/fonts/manrope install -pm 644 fonts/variable/Manrope* %{buildroot}%{_datadir}/fonts/manrope -install -pm 0644 %SOURCE1 README.md - -# Install licenses -mkdir -p licenses -install -pm 0644 %SOURCE1 licenses/LICENSE - %files %doc README.md %doc documentation.html -%license licenses/LICENSE +%license OFL.txt %{_datadir}/fonts/manrope/* %changelog +* Thu Jun 22 2023 windowsboy111 - 4.505-1 +- Bump version and fix sources + * Tue Jan 10 2023 Cappy Ishihara - 1-3 - Ported from tauOS - * Sat May 14 2022 Jamie Murphy - 1-1 - Fix specfile diff --git a/anda/fonts/manrope/update.rhai b/anda/fonts/manrope/update.rhai new file mode 100644 index 0000000000..29cb3cfb3c --- /dev/null +++ b/anda/fonts/manrope/update.rhai @@ -0,0 +1,8 @@ +let readme = get("https://raw.githubusercontent.com/sharanda/manrope/master/README.md"); +let ver = find("## Changelog\n- v (.+?) \\/", readme, 1); +if ver != find("Version:\\s*([\\d.]+)\n" rpm.f, 1) { + let req = new_req("https://api.github.com/repos/sharanda/manrope/commits/HEAD"); + let sha = req.get().json().sha; + rpm.global("commit", sha); + rpm.version(ver); +} From 9c3af0555f3a6f296c93f437a25211c159f034df Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Thu, 22 Jun 2023 16:10:18 +0700 Subject: [PATCH 18/29] feature: Configure caching (#599) * Configure cache * use local build template * no dnf5??? * Revert "no dnf5???" This reverts commit f00e21ee6567fc96c515721389be8a515f779d4e. * add rpmfusion, use pkg name for cache too * let's try this --- .github/workflows/autobuild.yml | 15 +++++++- .github/workflows/build.yml | 11 +++++- .github/workflows/json-build.yml | 11 +++++- anda/mock-configs/terra.tpl | 64 +++++++++++++++++++++++++++----- 4 files changed, 86 insertions(+), 15 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index e2f86b6051..ef116581d4 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -54,8 +54,19 @@ jobs: - name: Set up git repository run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - name: Build with Anda - run: anda build ${{ matrix.pkg.pkg }} --package rpm -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} + - name: Cache buildroot + id: br-cache + uses: actions/cache@v3 + with: + path: /var/cache + key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }} + + - name: Include custom build template instead of package default + run: | + cp -v anda/mock-configs/terra.tpl /etc/mock/templates/terra.tpl + + - name: Build with Andaman + run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg - name: Generating artifact name id: art diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1531ad333..c32859b301 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,8 +36,15 @@ jobs: - name: Set up git repository run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - name: Build with Anda - run: anda build ${{ matrix.pkg }}pkg --package rpm -c terra-${{ matrix.version }}-${{ matrix.arch }} + - name: Cache buildroot + id: br-cache + uses: actions/cache@v3 + with: + path: /var/cache + key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }} + + - name: Build with Andaman + run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg - name: Generating artifact name id: art diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index 6c7fdc1ebb..986f6da5c7 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -25,8 +25,15 @@ jobs: - name: Set up git repository run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - name: Build with Anda - run: anda build ${{ matrix.pkg.pkg }} --package rpm -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} + - name: Cache buildroot + id: br-cache + uses: actions/cache@v3 + with: + path: /var/cache + key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }} + + - name: Build with Andaman + run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg - name: Generating artifact name id: art diff --git a/anda/mock-configs/terra.tpl b/anda/mock-configs/terra.tpl index 2643cdb247..3df59f2726 100644 --- a/anda/mock-configs/terra.tpl +++ b/anda/mock-configs/terra.tpl @@ -2,11 +2,16 @@ config_opts['root'] = 'terra-{{ releasever }}-{{ target_arch }}' config_opts['dist'] = 'fc{{ releasever }}' # only useful for --resultdir variable subst config_opts['macros']['%dist'] = '.fc{{ releasever }}' config_opts['chroot_setup_cmd'] = 'install @buildsys-build' -config_opts['package_manager'] = 'dnf' +config_opts['package_manager'] = 'dnf5' config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['mirrored'] = True +config_opts['plugin_conf']['tmpfs_enable'] = True +config_opts['plugin_conf']['root_cache_enable'] = True +config_opts['plugin_conf']['yum_cache_enable'] = True +config_opts['plugin_conf']['ccache_enable'] = True +config_opts['plugin_conf']['ccache_opts']['compress'] = 'on' # repos -config_opts['dnf.conf'] = """ +dnf_conf = """ [main] keepcache=1 @@ -37,13 +42,50 @@ enabled=1 enabled_metadata=1 metadata_expire=4h -[local] -name=local -baseurl=https://lapis.ultramarine-linux.org/kojifiles/repos/um{{ releasever }}-build/latest/$basearch/ -cost=2000 -enabled={{ not mirrored }} -skip_if_unavailable=False -assumeyes=True +# RPMFusion +# We do not check GPG keys, because I can't find a direct link to the GPG key + +[rpmfusion-free] +name=RPM Fusion for Fedora $releasever - Free +#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch +enabled=1 +metadata_expire=14d +type=rpm-md +gpgcheck=0 +repo_gpgcheck=0 + +[rpmfusion-free-updates] +name=RPM Fusion for Fedora $releasever - Free - Updates +#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch +enabled=1 +enabled_metadata=1 +type=rpm-md +gpgcheck=0 +repo_gpgcheck=0 + +[rpmfusion-nonfree] +name=RPM Fusion for Fedora $releasever - Nonfree +#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch +enabled=1 +enabled_metadata=1 +metadata_expire=14d +type=rpm-md +gpgcheck=0 +repo_gpgcheck=0 + +[rpmfusion-nonfree-updates] +name=RPM Fusion for Fedora $releasever - Nonfree - Updates +#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch +enabled=1 +enabled_metadata=1 +type=rpm-md +gpgcheck=0 +repo_gpgcheck=0 + {% if mirrored %} [fedora] @@ -177,3 +219,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=False {% endif %} """ + + +config_opts['dnf.conf'] = dnf_conf +config_opts['dnf5.conf'] = dnf_conf \ No newline at end of file From fd88cb5faa03699ae2929d19d5ea77c9bed07d13 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 22 Jun 2023 11:36:21 +0000 Subject: [PATCH 19/29] bump: gitoxide --- anda/rust/gitoxide/rust-gitoxide.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/rust/gitoxide/rust-gitoxide.spec b/anda/rust/gitoxide/rust-gitoxide.spec index 301ac1623c..f5443da083 100644 --- a/anda/rust/gitoxide/rust-gitoxide.spec +++ b/anda/rust/gitoxide/rust-gitoxide.spec @@ -4,8 +4,8 @@ %global crate gitoxide Name: rust-gitoxide -Version: 0.26.0 -Release: %autorelease +Version: 0.27.0 +Release: 1%{?dist} Summary: Command-line application for interacting with git repositories License: MIT OR Apache-2.0 From b32593e29286cdd4e9989f5fb1bfe8d85fd07444 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 22 Jun 2023 17:36:19 +0000 Subject: [PATCH 20/29] bump: ruff --- anda/python/ruff/python3-ruff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec index f7cd2d45ab..a326b05ba9 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/python/ruff/python3-ruff.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.0.274 +Version: 0.0.275 Release: 1%{?dist} Summary: An extremely fast Python linter, written in Rust License: MIT From 2b31a1a4ce906c645829e9d2b79bc0050f92e2f8 Mon Sep 17 00:00:00 2001 From: lleyton Date: Thu, 22 Jun 2023 15:39:21 -0700 Subject: [PATCH 21/29] fix: use step summary instead of comment (#608) * fix: use step summary instead of comment * fix: use different variables for lint and install err --- .github/workflows/autobuild.yml | 61 +++++++++------------------------ 1 file changed, 17 insertions(+), 44 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index ef116581d4..79e83223ea 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -99,11 +99,11 @@ jobs: id: lint if: success() run: | - echo 'err=false' >> $GITHUB_ENV + echo 'LINT_ERR=false' >> $GITHUB_ENV rpmlint anda-build/ > rpmlint.txt || f=1 if [[ $f -eq 1 ]]; then EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) - echo "esc_lint_out<<$EOF" >> $GITHUB_ENV + echo "ESC_LINT_OUT<<$EOF" >> $GITHUB_ENV cat rpmlint.txt | sed 's/`/\\`/g' >> $GITHUB_ENV echo $EOF >> $GITHUB_ENV echo "lint_out<<$EOF" >> $GITHUB_ENV @@ -111,13 +111,14 @@ jobs: cat rpmlint.txt >> $GITHUB_ENV echo '```' >> $GITHUB_ENV echo $EOF >> $GITHUB_ENV - echo 'err=true' >> $GITHUB_ENV + echo 'LINT_ERR=true' >> $GITHUB_ENV fi - name: Try to install package id: dnf if: success() run: | + echo 'INSTALL_ERR=false' >> $GITHUB_ENV touch out for f in anda-build/rpm/rpms/*.rpm; do dnf in --downloadonly -y $f > $f.dnfout.txt 2>&1 || fail=1 @@ -127,55 +128,27 @@ jobs: cat $f.dnfout.txt >> out echo '```' >> out echo >> out - echo 'err=true' >> $GITHUB_ENV + echo 'INSTALL_ERR=true' >> $GITHUB_ENV fi done cat out EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) - echo "esc_dnf_out<<$EOF" >> $GITHUB_ENV + echo "ESC_DNF_OUT<<$EOF" >> $GITHUB_ENV cat out | sed 's/`/\\`/g' >> $GITHUB_ENV echo $EOF >> $GITHUB_ENV echo "dnf_out<<$EOF" >> $GITHUB_ENV cat out >> $GITHUB_ENV echo $EOF >> $GITHUB_ENV - - name: Comment RPMLint/DNF output (PR) - if: success() && github.event_name == 'pull_request' - uses: actions/github-script@v6 - with: - script: | - let out = ""; - if (`${{ env.esc_lint_out }}`.trim() != "") { - out += "## 🔨 Lint: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n"; - out += `\`\`\`\n${{ env.esc_lint_out }}\n\`\`\`\n`; - } - if (`${{ env.esc_dnf_out }}`.trim() != "") { - out += "## ❌ DNF: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n"; - out += `${{ env.esc_dnf_out }}`; - } - if (out != "") { - github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: out, - }); - } + - name: Generate RPMLint/DNF summary + if: success() + run: | + if [[ $LINT_ERR == "true" ]]; then + echo "## ❌ Lint: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY + echo "```\n${{ env.ESC_LINT_OUT }}\n```\n"; + fi - - name: Create commit comment - if: success() && env.err == 'true' - uses: peter-evans/commit-comment@v2 - with: - body: | - [run_id: ${{github.run_id}}](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}}) - # Built RPM: ${{matrix.pkg.pkg}} (${{matrix.pkg.arch}}.fc${{matrix.version}}) - ## Lint - If you see anything below, RPMLint returned with a non-zero exit code. - - ${{ env.lint_out }} - - ## DNF - Output of `dnf in --downloadonly ...`. - If you see anything below, DNF returned with a non-zero exit code. - - ${{ env.dnf_out }} + if [[ $INSTALL_ERR == "true" ]]; then + echo "## ❌ DNF: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY + echo "${{ env.ESC_DNF_OUT }}" >> $GITHUB_STEP_SUMMARY + fi From a9fd570de90c0fd710b781a79cc332a8961dc501 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 23 Jun 2023 07:07:28 +0800 Subject: [PATCH 22/29] fix: youki (#600) * fix: youki * fdupes the right thing Signed-off-by: madomado --------- Signed-off-by: madomado --- anda/rust/youki/youki.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anda/rust/youki/youki.spec b/anda/rust/youki/youki.spec index f9c243346b..0c55cdce51 100644 --- a/anda/rust/youki/youki.spec +++ b/anda/rust/youki/youki.spec @@ -49,8 +49,7 @@ pushd crates/ %install install -D -m 0755 target/release/youki %{buildroot}%{_bindir}/youki -%fdupes %buildroot/usr/share/doc/youki/docs -rm %buildroot/usr/share/doc/youki/docs/.gitignore +%fdupes docs/ %files %license LICENSE From 8b77dddc180a9ceee507b1a72d31e876dd77ed54 Mon Sep 17 00:00:00 2001 From: lleyton Date: Thu, 22 Jun 2023 16:10:17 -0700 Subject: [PATCH 23/29] fix: escape newlines in job summary (#609) --- .github/workflows/autobuild.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 79e83223ea..52bca6aba7 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -143,12 +143,14 @@ jobs: - name: Generate RPMLint/DNF summary if: success() run: | + # Remind me to make all of this not weird later ~ lleyton + if [[ $LINT_ERR == "true" ]]; then - echo "## ❌ Lint: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY - echo "```\n${{ env.ESC_LINT_OUT }}\n```\n"; + echo -e "## ❌ Lint: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY + echo -e "```\n${{ env.ESC_LINT_OUT }}\n```\n" >> $GITHUB_STEP_SUMMARY fi if [[ $INSTALL_ERR == "true" ]]; then - echo "## ❌ DNF: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY + echo -e "## ❌ DNF: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY echo "${{ env.ESC_DNF_OUT }}" >> $GITHUB_STEP_SUMMARY fi From c939b27a02a9ed564127e699163005ae731d9f97 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 23 Jun 2023 01:45:24 +0000 Subject: [PATCH 24/29] bump(nightly): latte-dock-nightly nim-nightly vala-nightly --- anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec | 2 +- anda/nim/nim-nightly/nim-nightly.spec | 2 +- anda/vala/vala-nightly/vala-nightly.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec index 178fd9b0bd..f150f7c5c2 100644 --- a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec +++ b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/KDE/latte-dock/ -%global commit b58cdd7882dfa7d5c13848364f1bc974131d9d09 +%global commit 5c2158b96913db2733132ac4b8f06ea153ca0034 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} diff --git a/anda/nim/nim-nightly/nim-nightly.spec b/anda/nim/nim-nightly/nim-nightly.spec index 26f9076c96..b64017ac6a 100644 --- a/anda/nim/nim-nightly/nim-nightly.spec +++ b/anda/nim/nim-nightly/nim-nightly.spec @@ -1,5 +1,5 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit ac7b8b678c9e8eff70bb8147d411664470a882fd +%global commit 88114948c41f38d7366dc8d80abc09f00c2492fa %global ver 1.9.5 %global debug_package %nil diff --git a/anda/vala/vala-nightly/vala-nightly.spec b/anda/vala/vala-nightly/vala-nightly.spec index 95a97dd716..dc9df2fc6c 100644 --- a/anda/vala/vala-nightly/vala-nightly.spec +++ b/anda/vala/vala-nightly/vala-nightly.spec @@ -3,7 +3,7 @@ %global priority 90 %global real_name vala -%global commit 83d66f14eca60fe11dfa25f4e7f1bbab497933c9 +%global commit e9a6d92c00b734ab689493b7fc1874db227067c7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git From 640c4f527e8314c371e57635d66662ff06ba7d8e Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Fri, 23 Jun 2023 08:56:38 +0200 Subject: [PATCH 25/29] add: uwufetch (#607) * add: uwufetch * fix(uwufetch): address concerns * fix(uwufetch): macro explosion --- anda/others/uwufetch/anda.hcl | 5 +++++ anda/others/uwufetch/update.rhai | 1 + anda/others/uwufetch/uwufetch.spec | 33 ++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 anda/others/uwufetch/anda.hcl create mode 100644 anda/others/uwufetch/update.rhai create mode 100644 anda/others/uwufetch/uwufetch.spec diff --git a/anda/others/uwufetch/anda.hcl b/anda/others/uwufetch/anda.hcl new file mode 100644 index 0000000000..69406c2907 --- /dev/null +++ b/anda/others/uwufetch/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "uwufetch.spec" + } +} diff --git a/anda/others/uwufetch/update.rhai b/anda/others/uwufetch/update.rhai new file mode 100644 index 0000000000..ff156f789b --- /dev/null +++ b/anda/others/uwufetch/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("TheDarkBug/uwufetch")); diff --git a/anda/others/uwufetch/uwufetch.spec b/anda/others/uwufetch/uwufetch.spec new file mode 100644 index 0000000000..6b46034594 --- /dev/null +++ b/anda/others/uwufetch/uwufetch.spec @@ -0,0 +1,33 @@ +Name: uwufetch +Version: 2.1 +Release: 1%?dist +Summary: A meme system info tool for Linux, based on nyan/uwu trend on r/linuxmasterrace. +License: GPL-3.0 +URL: https://github.com/TheDarkBug/uwufetch +BuildRequires: make gcc git anda-srpm-macros + +%description +A meme system info tool for (almost) all your Linux/Unix-based systems, based on the nyan/UwU trend on r/linuxmasterrace. + +%prep +git clone https://github.com/TheDarkBug/uwufetch.git . +git checkout %{version} + +%build +%make_build + +%install +make install DESTDIR=%{?buildroot}%{_prefix} +mkdir %{?buildroot}%{_libdir} +mv %{?buildroot}%{_prefix}/lib/libfetch.so %{?buildroot}%{_libdir}/libfetch.so +rm -rf %{?buildroot}%{_includedir} + +%files +%{_prefix}/lib/uwufetch/* +%{_libdir}/libfetch.so +%{_mandir}/man1/uwufetch.1.gz +%{_bindir}/uwufetch + +%changelog +* Thu Jun 22 2023 Alyxia Sother +- Initial package. \ No newline at end of file From b3011a3740a743e1a65de0d13b84fbb29c6734f2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 24 Jun 2023 01:43:52 +0000 Subject: [PATCH 26/29] bump(nightly): latte-dock-nightly --- anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec index f150f7c5c2..91243ae922 100644 --- a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec +++ b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/KDE/latte-dock/ -%global commit 5c2158b96913db2733132ac4b8f06ea153ca0034 +%global commit 6532af166f2c6524827c8e1c22af6b9c2accc11f %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} From e9b578961bed5b60a1debad80494faf3993c8278 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 24 Jun 2023 12:29:56 +0000 Subject: [PATCH 27/29] bump: iosevka-fusion --- anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec index 83c9153670..31d66cddb7 100644 --- a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec +++ b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: iosevka-fusion-fonts -Version: 24.1.3 +Version: 24.1.4 Release: 1%{?dist} Summary: A custom font based on iosevka From d40bf9a55151123633192cfc90fb69998a8d1292 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 24 Jun 2023 13:36:42 +0000 Subject: [PATCH 28/29] bump: sarasa-gothic --- anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec index 48a371dce2..3b4eaf3474 100644 --- a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec +++ b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec @@ -1,6 +1,6 @@ Name: sarasa-gothic-fonts -Version: 0.41.2 -Release: 2%{?dist} +Version: 0.41.3 +Release: 1%{?dist} URL: https://github.com/be5invis/Sarasa-Gothic Source0: %url/releases/download/v%version/sarasa-gothic-ttc-%version.7z Source1: %url/releases/download/v%version/sarasa-gothic-super-ttc-%version.7z From 258fefb5a9c09e98161549ce59930200aaa69fbc Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sat, 24 Jun 2023 22:52:58 +0700 Subject: [PATCH 29/29] disable tmpfs plugin (#610) Signed-off-by: Cappy Ishihara --- anda/mock-configs/terra.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anda/mock-configs/terra.tpl b/anda/mock-configs/terra.tpl index 3df59f2726..7216aae9d8 100644 --- a/anda/mock-configs/terra.tpl +++ b/anda/mock-configs/terra.tpl @@ -5,7 +5,6 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build' config_opts['package_manager'] = 'dnf5' config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['mirrored'] = True -config_opts['plugin_conf']['tmpfs_enable'] = True config_opts['plugin_conf']['root_cache_enable'] = True config_opts['plugin_conf']['yum_cache_enable'] = True config_opts['plugin_conf']['ccache_enable'] = True @@ -222,4 +221,4 @@ skip_if_unavailable=False config_opts['dnf.conf'] = dnf_conf -config_opts['dnf5.conf'] = dnf_conf \ No newline at end of file +config_opts['dnf5.conf'] = dnf_conf