From 7deca66506cb4217d431472b960e75c4cc1e8dbf Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 4 Jan 2025 04:03:31 +0800 Subject: [PATCH] chore(sync): frawhide -> f41 (#2867) * chore(sync): frawhide -> f41 * maybe this * confusion * a * i hate gha now --- .github/workflows/autobuild.yml | 28 ++++++------ .github/workflows/json-build.yml | 26 ++++++----- .../audacity-freeworld.spec | 4 +- anda/apps/envision/envision.spec | 4 +- .../apps/legcord/nightly/legcord-nightly.spec | 4 +- anda/apps/mpv/mpv-nightly.spec | 4 +- .../lightdm-kde-greeter.spec | 4 +- .../golang-github-abenz1267-walker.spec | 2 +- anda/devs/flow/flow-control-nightly.spec | 4 +- .../devs/ghostty/nightly/ghostty-nightly.spec | 4 +- anda/devs/zed/nightly/zed-nightly.spec | 4 +- anda/games/gamescope-legacy/anda.hcl | 4 +- anda/games/gamescope/anda.hcl | 2 +- .../games/prismlauncher-nightly/ci_setup.rhai | 2 + anda/games/prismlauncher/ci_setup.rhai | 2 + anda/langs/nim/nim-nightly/nim-nightly.spec | 4 +- anda/lib/mesa/anda.hcl | 4 +- anda/lib/mesa/mesa.spec | 45 ++----------------- anda/misc/extest/anda.hcl | 4 +- anda/system/mesa-freeworld/anda.hcl | 2 +- .../system/mesa-freeworld/mesa-freeworld.spec | 2 +- anda/system/mesa-freeworld/update.rhai | 10 ++--- anda/system/xpadneo/anda.hcl | 3 ++ anda/system/zenpower3/anda.hcl | 3 ++ anda/tools/buildsys/mise/rust-mise.spec | 4 +- anda/tools/spotx-bash/spotx-bash.spec | 4 +- 26 files changed, 76 insertions(+), 107 deletions(-) create mode 100644 anda/games/prismlauncher-nightly/ci_setup.rhai create mode 100644 anda/games/prismlauncher/ci_setup.rhai diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index bbf3ea172c..1f2a7c61e5 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -52,27 +52,25 @@ jobs: with: fetch-depth: 0 - - name: Checkout latest Mock configs - uses: actions/checkout@v4 - with: - fetch-depth: 0 - repository: terrapkg/mock-configs - path: mock-configs - - name: Set up git repository run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - name: Include custom build template instead of package default + - name: CI Setup Script + if: ${{ matrix.pkg.labels.mock != '1' }} run: | - cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl + dir=$(dirname ${{ matrix.pkg.pkg }}) + if [ -f $dir/ci_setup.rhai ]; then + anda run $dir/ci_setup.rhai --labels script_path=$dir/ci_setup.rhai + fi + + - name: Install Build Dependencies + if: ${{ matrix.pkg.labels.mock != '1' }} + run: | + dir=$(dirname ${{ matrix.pkg.pkg }}) + dnf5 builddep -y ${dir}/*.spec - name: Build with Andaman - run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg - - - name: Build with Andaman (alternate arch) - if: | - matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib'] - run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-i386.cfg + run: anda build ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }} - name: Generating artifact name id: art diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index fd776bbcd6..2098548764 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -23,21 +23,25 @@ jobs: with: fetch-depth: 0 - - name: Checkout latest Mock configs - uses: actions/checkout@v4 - with: - repository: terrapkg/mock-configs - path: mock-configs - - name: Set up git repository run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - name: Include custom build template instead of package default + - name: CI Setup Script + if: ${{ matrix.pkg.labels.mock != '1' }} run: | - cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl + dir=$(dirname ${{ matrix.pkg.pkg }}) + if [ -f $dir/ci_setup.rhai ]; then + anda run $dir/ci_setup.rhai --labels script_path=$dir/ci_setup.rhai + fi + + - name: Install Build Dependencies + if: ${{ matrix.pkg.labels.mock != '1' }} + run: | + dir=$(dirname ${{ matrix.pkg.pkg }}) + dnf5 builddep -y ${dir}/*.spec - name: Build with Andaman - run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg + run: anda build ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }} - name: Generating artifact name id: art @@ -70,8 +74,8 @@ jobs: terra${{ matrix.version }}-source anda-build/rpm/srpm/* - name: Notify Madoguchi (Success) - if: success() + if: success() && github.event_name == 'push' run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA - name: Notify Madoguchi (Failure) - if: cancelled() || failure() + if: ( cancelled() || failure() ) && github.event_name == 'push' run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA diff --git a/anda/apps/audacity-freeworld/audacity-freeworld.spec b/anda/apps/audacity-freeworld/audacity-freeworld.spec index 154c6863d8..e81def5049 100644 --- a/anda/apps/audacity-freeworld/audacity-freeworld.spec +++ b/anda/apps/audacity-freeworld/audacity-freeworld.spec @@ -2,8 +2,8 @@ %global __provides_exclude ^lib-.*.so Name: audacity-freeworld -Version: 3.7.1 -Release: 1%{?dist} +Version: Audacity.3.7.1 +Release: 1%?dist Summary: Multitrack audio editor License: GPLv2 URL: https://www.audacityteam.org/ diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 8eeabeedf1..3e11e20641 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit a651b87cc38ab9a208c9272b4f6e5021a1fbfa66 -%global commit_date 20250103 +%global commit 0adf894b4519824682b6e0886fa1c6853c9b7344 +%global commit_date 20250102 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision diff --git a/anda/apps/legcord/nightly/legcord-nightly.spec b/anda/apps/legcord/nightly/legcord-nightly.spec index 39dce2829a..c36d9fe1d3 100644 --- a/anda/apps/legcord/nightly/legcord-nightly.spec +++ b/anda/apps/legcord/nightly/legcord-nightly.spec @@ -1,5 +1,5 @@ -%global commit e4873a0060127ddaf8f91fb86de219e0d96ea4cf -%global commit_date 20250103 +%global commit b070545d1289e66a02eff10aa2bf5f440eb16aeb +%global commit_date 20250101 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define debug_package %nil diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 4e6fcc70fa..38a4a558ff 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit e01f75e636e73c40ee5b4027bdbbb1c1a2fda217 +%global commit 50042f5ee094a36e38f9ea809408e0b5cbf3b874 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250103 +%global commit_date 20250101 %global ver 0.39.0 Name: mpv-nightly diff --git a/anda/desktops/kde/lightdm-kde-greeter/lightdm-kde-greeter.spec b/anda/desktops/kde/lightdm-kde-greeter/lightdm-kde-greeter.spec index d9fe9e2a08..abfe7a2159 100644 --- a/anda/desktops/kde/lightdm-kde-greeter/lightdm-kde-greeter.spec +++ b/anda/desktops/kde/lightdm-kde-greeter/lightdm-kde-greeter.spec @@ -1,7 +1,7 @@ -%global commit 631b6da2bf2482aa2dc7ceaddbfbb9c566bcf2b4 +%global commit c3f01539e3b036ae940e678f5739b37ca0300ce2 Name: lightdm-kde-greeter -Version: 6.0.1 +Version: 6.0.2 Release: 1%?dist Summary: Login screen using the LightDM framework License: GPL-3.0-or-later diff --git a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec index c00f02ffb9..83bebd6887 100644 --- a/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec +++ b/anda/desktops/waylands/walker/golang-github-abenz1267-walker.spec @@ -21,7 +21,7 @@ Multi-Purpose Launcher with a lot of features. Highly Customizable and fast.} %global godocs README.md cmd/version.txt Name: walker -Release: 2%?dist +Release: 1%?dist Summary: Multi-Purpose Launcher with a lot of features. Highly Customizable and fast License: MIT diff --git a/anda/devs/flow/flow-control-nightly.spec b/anda/devs/flow/flow-control-nightly.spec index c8a73eae2c..f970119817 100644 --- a/anda/devs/flow/flow-control-nightly.spec +++ b/anda/devs/flow/flow-control-nightly.spec @@ -1,6 +1,6 @@ -%global commit 18b0c217fc9691602d1232d0dd578fd357fbabde +%global commit 233e881f95de8f6449e6d22904c55ec8e2192c24 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250103 +%global commit_date 20241225 Name: flow-control-nightly Version: %commit_date.%shortcommit diff --git a/anda/devs/ghostty/nightly/ghostty-nightly.spec b/anda/devs/ghostty/nightly/ghostty-nightly.spec index a91e6efdb7..9d56b4fd09 100644 --- a/anda/devs/ghostty/nightly/ghostty-nightly.spec +++ b/anda/devs/ghostty/nightly/ghostty-nightly.spec @@ -1,6 +1,6 @@ -%global commit a10b45fb1f5835320dc070d60392235663399abf +%global commit 94599102e9fb8247af08cbbbcb7ee25e3d31e1bd %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250103 +%global commit_date 20250102 %global cache_dir %{builddir}/zig-cache diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index 91452c1197..fbf95ca640 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -1,6 +1,6 @@ -%global commit 82492d74a8d0350cba66671c27e282a928fd4c85 +%global commit c11bde7bf4e428be7639aaf9ffc7ea3dc5becf16 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20250103 +%global commit_date 20250102 %global ver 0.169.0 %bcond_with check diff --git a/anda/games/gamescope-legacy/anda.hcl b/anda/games/gamescope-legacy/anda.hcl index 272907ad53..db9bd0608a 100644 --- a/anda/games/gamescope-legacy/anda.hcl +++ b/anda/games/gamescope-legacy/anda.hcl @@ -1,8 +1,6 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "gamescope-legacy.spec" } - labels { - multilib = 1 - } } diff --git a/anda/games/gamescope/anda.hcl b/anda/games/gamescope/anda.hcl index 9aee67abdf..f3bf32281b 100755 --- a/anda/games/gamescope/anda.hcl +++ b/anda/games/gamescope/anda.hcl @@ -1,9 +1,9 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "gamescope.spec" } labels { - multilib = 1 extra = 1 } } diff --git a/anda/games/prismlauncher-nightly/ci_setup.rhai b/anda/games/prismlauncher-nightly/ci_setup.rhai new file mode 100644 index 0000000000..92de03460a --- /dev/null +++ b/anda/games/prismlauncher-nightly/ci_setup.rhai @@ -0,0 +1,2 @@ +import "andax/ci/extra_repos.rhai" as extra_repos; +extra_repos::install(labels); diff --git a/anda/games/prismlauncher/ci_setup.rhai b/anda/games/prismlauncher/ci_setup.rhai new file mode 100644 index 0000000000..92de03460a --- /dev/null +++ b/anda/games/prismlauncher/ci_setup.rhai @@ -0,0 +1,2 @@ +import "andax/ci/extra_repos.rhai" as extra_repos; +extra_repos::install(labels); diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index d94670636c..1d73803d22 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit e8bf6af0da52ce91dd0b5a7474d386d9a66809b9 +%global commit 3dda60a8ce32cb7d5e3e99111399a1550c145176 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.3.1 -%global commit_date 20250103 +%global commit_date 20250101 %global debug_package %nil Name: nim-nightly diff --git a/anda/lib/mesa/anda.hcl b/anda/lib/mesa/anda.hcl index 7714a0b452..80f31c7444 100644 --- a/anda/lib/mesa/anda.hcl +++ b/anda/lib/mesa/anda.hcl @@ -1,9 +1,11 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "mesa.spec" } labels { - multilib = 1 + extra = 1 } + arches = ["x86_64", "i386", "aarch64"] } diff --git a/anda/lib/mesa/mesa.spec b/anda/lib/mesa/mesa.spec index e68c0f0ec5..0458ebd469 100644 --- a/anda/lib/mesa/mesa.spec +++ b/anda/lib/mesa/mesa.spec @@ -1,3 +1,5 @@ +%global _default_patch_fuzz 2 + %global srcname mesa %ifnarch s390x @@ -75,14 +77,6 @@ Release: 3%?dist License: MIT AND BSD-3-Clause AND SGI-B-2.0 URL: http://www.mesa3d.org -# define macro for providing srcname and ver -# %replace_pkg subpackage -%define replace_pkg() \ -Provides: %{srcname}-%1 = %{?epoch:%{epoch}:}%{version}-%{release} \ -Provides: %{srcname}-%1%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} \ -Conflicts: %{srcname}-%1 < %{?epoch:%{epoch}:}%{version}-%{release} \ -Conflicts: %{srcname}-%1%{?_isa} < %{?epoch:%{epoch}:}%{version}-%{release} - Source0: https://archive.mesa3d.org/%{srcname}-%{ver}.tar.xz @@ -199,15 +193,14 @@ BuildRequires: pkgconfig(vulkan) %{summary}. %package filesystem -%replace_pkg filesystem Summary: Mesa driver filesystem Provides: mesa-dri-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: mesa-omx-drivers < %{?epoch:%{epoch}:}%{version}-%{release} %description filesystem %{summary}. %package libGL -%replace_pkg libGL Summary: Mesa libGL runtime libraries Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libglvnd-glx%{?_isa} >= 1:1.3.2 @@ -217,7 +210,6 @@ Recommends: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{re %{summary}. %package libGL-devel -%replace_pkg libGL-devel Summary: Mesa libGL development package Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libglvnd-devel%{?_isa} >= 1:1.3.2 @@ -229,17 +221,16 @@ Recommends: gl-manpages %{summary}. %package libEGL -%replace_pkg libEGL Summary: Mesa libEGL runtime libraries Requires: libglvnd-egl%{?_isa} >= 1:1.3.2 Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Recommends: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + %description libEGL %{summary}. %package libEGL-devel -%replace_pkg libEGL-devel Summary: Mesa libEGL development package Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: libglvnd-devel%{?_isa} >= 1:1.3.2 @@ -251,7 +242,6 @@ Provides: libEGL-devel%{?_isa} %{summary}. %package dri-drivers -%replace_pkg dri-drivers Summary: Mesa-based DRI drivers Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -262,20 +252,8 @@ Recommends: %{name}-va-drivers%{?_isa} %description dri-drivers %{summary}. -%if 0%{?with_omx} -%package omx-drivers -%replace_pkg omx-drivers -Summary: Mesa-based OMX drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description omx-drivers -%{summary}. -%endif - %if 0%{?with_va} %package va-drivers -%replace_pkg va-drivers -Provides: %{srcname}-va-drivers = %{?epoch:%{epoch}:}%{version}-%{release} Summary: Mesa-based VA-API video acceleration drivers Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: %{name}-vaapi-drivers < 22.2.0-5 @@ -286,7 +264,6 @@ Obsoletes: %{name}-vaapi-drivers < 22.2.0-5 %if 0%{?with_vdpau} %package vdpau-drivers -%replace_pkg vdpau-drivers Summary: Mesa-based VDPAU drivers Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -295,7 +272,6 @@ Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rel %endif %package libOSMesa -%replace_pkg libOSMesa Summary: Mesa offscreen rendering libraries Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libOSMesa @@ -305,7 +281,6 @@ Provides: libOSMesa%{?_isa} %{summary}. %package libOSMesa-devel -%replace_pkg libOSMesa-devel Summary: Mesa offscreen rendering development package Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -313,7 +288,6 @@ Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rele %{summary}. %package libgbm -%replace_pkg libgbm Summary: Mesa gbm runtime library Provides: libgbm Provides: libgbm%{?_isa} @@ -327,7 +301,6 @@ Requires: (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{r %{summary}. %package libgbm-devel -%replace_pkg libgbm-devel Summary: Mesa libgbm development package Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libgbm-devel @@ -338,7 +311,6 @@ Provides: libgbm-devel%{?_isa} %if 0%{?with_xa} %package libxatracker -%replace_pkg libxatracker Summary: Mesa XA state tracker Provides: libxatracker Provides: libxatracker%{?_isa} @@ -347,7 +319,6 @@ Provides: libxatracker%{?_isa} %{summary}. %package libxatracker-devel -%replace_pkg libxatracker-devel Summary: Mesa XA state tracker development package Requires: %{name}-libxatracker%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libxatracker-devel @@ -358,7 +329,6 @@ Provides: libxatracker-devel%{?_isa} %endif %package libglapi -%replace_pkg libglapi Summary: Mesa shared glapi Provides: libglapi Provides: libglapi%{?_isa} @@ -372,7 +342,6 @@ Requires: (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{r %if 0%{?with_opencl} %package libOpenCL -%replace_pkg libOpenCL Summary: Mesa OpenCL runtime library Requires: ocl-icd%{?_isa} Requires: libclc%{?_isa} @@ -383,7 +352,6 @@ Requires: opencl-filesystem %{summary}. %package libOpenCL-devel -%replace_pkg libOpenCL-devel Summary: Mesa OpenCL development package Requires: %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -393,24 +361,20 @@ Requires: %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{rele %if 0%{?with_teflon} %package libTeflon -%replace_pkg libTeflon Summary: Mesa TensorFlow Lite delegate - %description libTeflon %{summary}. %endif %if 0%{?with_nine} %package libd3d -%replace_pkg libd3d Summary: Mesa Direct3D9 state tracker %description libd3d %{summary}. %package libd3d-devel -%replace_pkg libd3d-devel Summary: Mesa Direct3D9 state tracker development package Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -419,7 +383,6 @@ Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release %endif %package vulkan-drivers -%replace_pkg vulkan-drivers Summary: Mesa Vulkan drivers Requires: vulkan%{_isa} Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} diff --git a/anda/misc/extest/anda.hcl b/anda/misc/extest/anda.hcl index 9546109527..8c444ab5c5 100644 --- a/anda/misc/extest/anda.hcl +++ b/anda/misc/extest/anda.hcl @@ -1,8 +1,6 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "rust-extest.spec" } - labels { - multilib = 1 - } } diff --git a/anda/system/mesa-freeworld/anda.hcl b/anda/system/mesa-freeworld/anda.hcl index d30486b421..b10d43824d 100644 --- a/anda/system/mesa-freeworld/anda.hcl +++ b/anda/system/mesa-freeworld/anda.hcl @@ -1,9 +1,9 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "mesa-freeworld.spec" } labels { updbranch = 1 - multilib = 1 } } diff --git a/anda/system/mesa-freeworld/mesa-freeworld.spec b/anda/system/mesa-freeworld/mesa-freeworld.spec index 346bea96d5..71678bb6a2 100644 --- a/anda/system/mesa-freeworld/mesa-freeworld.spec +++ b/anda/system/mesa-freeworld/mesa-freeworld.spec @@ -71,7 +71,7 @@ algorithms and decoding only VC1 algorithm. Name: %{srcname}-freeworld Summary: Mesa graphics libraries -%global ver 24.2.8 +%global ver 24.3.0 Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Release: 1%{?dist} License: MIT AND BSD-3-Clause AND SGI-B-2.0 diff --git a/anda/system/mesa-freeworld/update.rhai b/anda/system/mesa-freeworld/update.rhai index 8d6c3e10f3..55ef4263cb 100644 --- a/anda/system/mesa-freeworld/update.rhai +++ b/anda/system/mesa-freeworld/update.rhai @@ -1,7 +1,3 @@ -if !labels.branch.starts_with("f") { - print(`mesa-freeworld: unsupported branch: ${labels.branch}`); - terminate(); -} -let release = labels.branch.to_upper(); -let ver = get(`https://bodhi.fedoraproject.org/updates/?search=mesa&status=stable&releases=${release}&rows_per_page=1&page=1`).json().updates[0].title; -rpm.global("ver", find(`^mesa-([\d.]+)`, ver, 1)); +import "andax/bump_extras.rhai" as bump; + +rpm.global("ver", bump::bodhi("mesa", labels.branch.as_bodhi_ver())); diff --git a/anda/system/xpadneo/anda.hcl b/anda/system/xpadneo/anda.hcl index a05aac8e28..522f0b2ff8 100644 --- a/anda/system/xpadneo/anda.hcl +++ b/anda/system/xpadneo/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "xpadneo.spec" } + labels { + mock = 1 + } } diff --git a/anda/system/zenpower3/anda.hcl b/anda/system/zenpower3/anda.hcl index 288539e071..64d15acce8 100644 --- a/anda/system/zenpower3/anda.hcl +++ b/anda/system/zenpower3/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "zenpower3.spec" } + labels { + mock = 1 + } } diff --git a/anda/tools/buildsys/mise/rust-mise.spec b/anda/tools/buildsys/mise/rust-mise.spec index cfd76491ac..94e25d0a60 100644 --- a/anda/tools/buildsys/mise/rust-mise.spec +++ b/anda/tools/buildsys/mise/rust-mise.spec @@ -4,8 +4,8 @@ %global crate mise Name: rust-mise -Version: 2024.12.14 -Release: %autorelease +Version: 2025.1.0 +Release: 1%?dist Summary: Front-end to your dev env Provides: mise License: MIT diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index b8abf976a7..ceaff27052 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -1,5 +1,5 @@ -%global commit e0fd4704b043941b4ddc0f24bc2b7614a6db23f1 -%global commit_date 20250103 +%global commit fa0ea870b878fa38d6aa33d61d4191d3854d0e71 +%global commit_date 20241221 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: spotx-bash