From d562057470a681a55ecef15fe83dbdfa2e2a3c06 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Fri, 4 Oct 2024 22:57:15 +0700 Subject: [PATCH 1/8] moby-addons: do not hard-depend on Docker (#2185) --- anda/docker/moby-buildx/moby-buildx.spec | 12 ++++++------ anda/docker/moby-compose/moby-compose.spec | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/anda/docker/moby-buildx/moby-buildx.spec b/anda/docker/moby-buildx/moby-buildx.spec index f925d5ee86..7ce35cf753 100644 --- a/anda/docker/moby-buildx/moby-buildx.spec +++ b/anda/docker/moby-buildx/moby-buildx.spec @@ -12,8 +12,11 @@ Source0: %{url}/archive/refs/tags/v%{version}.tar.gz BuildRequires: go-rpm-macros BuildRequires: git-core BuildRequires: gcc -Requires: docker +BuildRequires: anda-srpm-macros + Provides: docker-buildx = %{version}-%{release} +Provides: docker-buildx-cli = %{version}-%{release} + %description buildx is a Docker CLI plugin for extended build capabilities with BuildKit. @@ -21,18 +24,15 @@ buildx is a Docker CLI plugin for extended build capabilities with BuildKit. %prep %autosetup -n buildx-%{version} -go mod download %build export CGO_ENABLED=1 -go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -w -extldflags '--static-pie'" \ - -buildmode=pie -tags 'osusergo,netgo,static_build' -v -x \ - -o docker-buildx ./cmd/buildx +%go_build_online ./cmd/buildx %install -install -D -m 0755 docker-buildx %{buildroot}%{_libexecdir}/docker/cli-plugins/docker-buildx +install -D -m 0755 build/bin/cmd/buildx %{buildroot}%{_libexecdir}/docker/cli-plugins/docker-buildx %files diff --git a/anda/docker/moby-compose/moby-compose.spec b/anda/docker/moby-compose/moby-compose.spec index b5a622131f..83d994e5da 100644 --- a/anda/docker/moby-compose/moby-compose.spec +++ b/anda/docker/moby-compose/moby-compose.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: moby-compose -Version: 2.29.7 -Release: 1%?dist +Version: 2.29.2 +Release: 2%?dist Summary: Define and run multi-container applications with Docker License: Apache-2.0 @@ -13,7 +13,6 @@ Source0: %{url}archive/refs/tags/v%{version}.tar.gz BuildRequires: go-rpm-macros BuildRequires: git-core BuildRequires: docker -Requires: docker Provides: docker-compose = %{version}-%{release} Provides: docker-compose-cli = %{version}-%{release} From c717690b807c77de169a2eee30187c7f0460556e Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Oct 2024 16:32:19 +0000 Subject: [PATCH 2/8] bump: moby-compose --- anda/docker/moby-compose/moby-compose.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/docker/moby-compose/moby-compose.spec b/anda/docker/moby-compose/moby-compose.spec index 83d994e5da..41345763f3 100644 --- a/anda/docker/moby-compose/moby-compose.spec +++ b/anda/docker/moby-compose/moby-compose.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: moby-compose -Version: 2.29.2 -Release: 2%?dist +Version: 2.29.7 +Release: 1%?dist Summary: Define and run multi-container applications with Docker License: Apache-2.0 From abba745158660a1cf1b15e9344dc235b71f6f9d6 Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 5 Oct 2024 01:52:24 +0800 Subject: [PATCH 3/8] fix(nim): actually copy dist folder to the goddamn %buildroot (#2194) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(nim): include dist dir * fix(nim): cp -r * fix(nim): actually copy dist folder to the goddamn %buildroot I'm so sorry I didn't test this properly… --- anda/langs/nim/nim-nightly/nim-nightly.spec | 2 +- anda/langs/nim/nim/nim.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 8b1b6a7dde..8c360cafd6 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -124,7 +124,7 @@ ln -s %_prefix/lib/nim %buildroot%_prefix/lib/nim/lib || true rm -rf %buildroot/nim || true rm %buildroot%_bindir/*.bat || true -cp -r dist %_datadir/nim/ +cp -r dist %buildroot%_datadir/nim/ %files diff --git a/anda/langs/nim/nim/nim.spec b/anda/langs/nim/nim/nim.spec index f1a36ffa00..a34e96daa2 100644 --- a/anda/langs/nim/nim/nim.spec +++ b/anda/langs/nim/nim/nim.spec @@ -118,7 +118,7 @@ rm -rf %buildroot/nim || true rm %buildroot%_bindir/*.bat || true rm -rf %buildroot%_bindir/empty.txt -cp -r dist %_datadir/nim/ +cp -r dist %buildroot%_datadir/nim/ %files From 0404053703ed35286884563682a7ad8b3841d441 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Oct 2024 18:55:35 +0000 Subject: [PATCH 4/8] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index e03eae98b5..d0c3faec86 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.500 +Version: 0.0.499 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 4f5a3f6b62..f750624fe6 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.500 +Version: 0.0.499 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 90ef710ca8529241c44d9df677be22c2c0b9cb23 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 4 Oct 2024 19:57:43 +0000 Subject: [PATCH 5/8] bump: lomiri-system-settings --- .../lomiri-system-settings/lomiri-system-settings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 7d0bdadb59..2617db72a2 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit b50e4de107ed43e44a8d28538f977938ea43a78f +%global commit a46c39abf0b38ca396dc27d0096f6805f2250d39 %forgemeta Name: lomiri-system-settings From e85ba2ea578c7b25d966ee5634ae3228d559673c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 5 Oct 2024 01:15:39 +0000 Subject: [PATCH 6/8] bump: ruffle --- anda/apps/ruffle/ruffle-nightly.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec index 4fe824082c..86667de2cb 100644 --- a/anda/apps/ruffle/ruffle-nightly.spec +++ b/anda/apps/ruffle/ruffle-nightly.spec @@ -1,4 +1,4 @@ -%global ver 2024-10-04 +%global ver 2024-10-05 %global goodver %(echo %ver | sed 's/-//g') %global __brp_mangle_shebangs %{nil} %bcond_without mold From 7d050da0a30ee96216dca6f47befaba164e5e25f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 5 Oct 2024 01:27:07 +0000 Subject: [PATCH 7/8] bump(nightly): mpv nightly --- anda/apps/mpv/mpv-nightly.spec | 4 ++-- anda/devs/zed/nightly/zed-nightly.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 9e15d1557d..9d2c0ccb31 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 216abbc12149668c71e400c19d1f60a507fb68c8 +%global commit 493cab7efc1d80bb780d6eacffb316e7f5313154 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20241004 +%global commit_date 20241005 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 662196bec0..4416f13daa 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 6635758009842dcf901fe341082e496549cb8577 +%global commit 7608000df8c2e70b0381c7d933197242a3cd24ee %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20241004 +%global commit_date 20241005 %global ver 0.157.0 %bcond_with check From 7d283bba350ef29fd72a37750d88c7b164830bff Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 5 Oct 2024 02:29:29 +0000 Subject: [PATCH 8/8] bump: lsp-dsp --- anda/lib/lsp-dsp/liblsp-dsp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/lsp-dsp/liblsp-dsp.spec b/anda/lib/lsp-dsp/liblsp-dsp.spec index dba228b83a..6581dbee06 100644 --- a/anda/lib/lsp-dsp/liblsp-dsp.spec +++ b/anda/lib/lsp-dsp/liblsp-dsp.spec @@ -3,8 +3,8 @@ #define _empty_manifest_terminate_build 0 Name: liblsp-dsp -Version: 1.0.25 -Release: 1%dist +Version: 1.0.26 +Release: 1%?dist Summary: DSP library for signal processing License: LGPL-3.0 #Group: System/Libraries