From b52fb9e9975a69babb0fab56b439995779aa0523 Mon Sep 17 00:00:00 2001 From: madomado Date: Tue, 27 May 2025 23:31:45 +0800 Subject: [PATCH] chore(sync): frawhide -> f41 (#5064) --- anda/apps/anki-bin/anki-bin.spec | 8 +++--- .../apps/nekoray/Sagernet.SingBox.Version.txt | 2 +- anda/apps/nekoray/nekoray.spec | 2 +- anda/devs/shibuya/python-shibuya.spec | 25 +++++++++++++++---- anda/devs/zed/nightly/zed-nightly.spec | 2 +- anda/games/inputplumber/inputplumber.spec | 2 +- anda/games/steam/steam.spec | 5 ---- anda/langs/go/albius/albius.spec | 4 +-- anda/langs/nim/nim/nim.spec | 4 --- anda/langs/zig/master/zig-master.spec | 4 +-- anda/lib/tdlib/tdlib-nightly.spec | 2 +- anda/misc/extest/rust-extest.spec | 2 +- anda/tools/arduino-cli/arduino-cli.spec | 4 +-- .../arduino-create-agent.spec | 4 +-- anda/tools/buildsys/anda/rust-anda.spec | 2 +- anda/tools/cuda-gcc/cuda-gcc.spec | 4 +-- anda/tools/gcm-core/gcm-core.spec | 1 + .../modern-colorthief/modern-colorthief.spec | 2 -- anda/tools/spotx-bash/spotx-bash.spec | 2 +- 19 files changed, 43 insertions(+), 38 deletions(-) diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec index d301686613..92d8980fca 100644 --- a/anda/apps/anki-bin/anki-bin.spec +++ b/anda/apps/anki-bin/anki-bin.spec @@ -1,9 +1,9 @@ -%global xurl https://files.pythonhosted.org/packages/c7/cb/fa787ddcea10823b8a77713f6dd4d6cea6b17fe632bede3bf2d988dff7dc/anki-25.02.1-cp39-abi3-manylinux_2_35_x86_64.whl -%global aurl https://files.pythonhosted.org/packages/6b/b2/514364b7a8de44a9f22ddc9ec50439e0fe404f0e7e63b64dbb3ca8ebac21/anki-25.02.1-cp39-abi3-manylinux_2_35_aarch64.whl -%global qurl https://files.pythonhosted.org/packages/66/3f/ffa764b5262c8166c84e701cc333a62f8108d8200647be4a8230c1397e3e/aqt-25.02.1-py3-none-any.whl +%global xurl https://files.pythonhosted.org/packages/32/51/cf365e03f3820f8b8adfd11717c38b3fcc167d08c0e53591dbfc702b2292/anki-25.02.5-cp39-abi3-manylinux_2_35_x86_64.whl +%global aurl https://files.pythonhosted.org/packages/c9/9d/6e27cec817c7f0f208e880f78585071eedc1bfd4294ebbae4ac5e49bf98d/anki-25.02.5-cp39-abi3-manylinux_2_35_aarch64.whl +%global qurl https://files.pythonhosted.org/packages/5e/8b/2651dcd76e3a670bc0ae95e462ad0776c3bcb9cc2b0b19eaa9cb8f92b709/aqt-25.02.5-py3-none-any.whl Name: anki-bin -Version: 25.02.1 +Version: 25.02.5 Release: 1%?dist Summary: Flashcard program for using space repetition learning (Installed with wheel) License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5 diff --git a/anda/apps/nekoray/Sagernet.SingBox.Version.txt b/anda/apps/nekoray/Sagernet.SingBox.Version.txt index 40faed9aa4..12410289c4 100644 --- a/anda/apps/nekoray/Sagernet.SingBox.Version.txt +++ b/anda/apps/nekoray/Sagernet.SingBox.Version.txt @@ -1 +1 @@ -1.11.8 +v1.11.11 \ No newline at end of file diff --git a/anda/apps/nekoray/nekoray.spec b/anda/apps/nekoray/nekoray.spec index 9e247a4632..f797f302ac 100644 --- a/anda/apps/nekoray/nekoray.spec +++ b/anda/apps/nekoray/nekoray.spec @@ -1,7 +1,7 @@ %global gomodulesmode GO111MODULE=on Name: nekoray Version: 4.3.5 -Release: 0%{?autorelease} +Release: 1%?dist Summary: Qt based cross-platform GUI proxy configuration manager (backend: sing-box) URL: https://github.com/Mahdi-zarei/nekoray License: GPLv3 diff --git a/anda/devs/shibuya/python-shibuya.spec b/anda/devs/shibuya/python-shibuya.spec index a4dd57276d..1913c7225e 100644 --- a/anda/devs/shibuya/python-shibuya.spec +++ b/anda/devs/shibuya/python-shibuya.spec @@ -1,11 +1,12 @@ %global pypi_name shibuya %global _description %{expand: A responsive, good looking with modern design documentation theme for Sphinx, with great supports for many sphinx extensions.} +# I would love to enable the docs but Fedora has stopped maintaining their jupyter-sphinx package with 42 and it is required to build them %bcond docs 0 Name: python-%{pypi_name} Version: 2025.4.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A clean, responsive, and customizable Sphinx documentation theme with light/dark mode License: BSD-3-Clause URL: https://shibuya.lepture.com @@ -15,11 +16,17 @@ Source0: https://github.com/lepture/shibuya/archive/refs/tags/%{version}. Source0: %{pypi_source} %endif BuildRequires: python3-devel +BuildRequires: python3-rpm-macros BuildRequires: python3dist(babel) +BuildRequires: python3dist(pip) BuildRequires: python3dist(setuptools) BuildRequires: python3dist(sphinx) %if %{with docs} +BuildRequires: python3dist(jupyter-sphinx) +BuildRequires: python3dist(myst-parser) BuildRequires: python3dist(shibuya) +BuildRequires: python3dist(sphinx-copybutton) +BuildRequires: python3dist(sphinx-design) %endif BuildArch: noarch Packager: Gilver E. @@ -68,23 +75,31 @@ This package contains the official docs for Shibuya. rm -rf %{pypi_name}.egg-info %build -%py3_build +%pyproject_wheel %if %{with docs} -PYTHONPATH=${PWD} sphinx-build docs build/_html -b dirhtml -a +sphinx-build docs build/_html -b dirhtml -a +pybabel extract -F babel.cfg src/shibuya/theme -o src/shibuya/locale/sphinx.pot +for l in de en es fr ja ko pt pt_BR zh zh_TW; do +pybabel init -D sphinx -i src/shibuya/locale/sphinx.pot -d src/shibuya/locale -l $l +pybabel update -D sphinx -i src/shibuya/locale/sphinx.pot -d src/shibuya/locale -l $l +pybabel compile -D sphinx -d src/shibuya/locale +done %endif %install -%py3_install +%pyproject_install %files -n python3-%{pypi_name} %license LICENSE %doc README.md %{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info +%{python3_sitelib}/%{pypi_name}-%{version}.dist-info/ %if %{with docs} %files -n python3-%{pypi_name}-doc +%doc build/_html/* +%doc src/shibuya/locale/{de,en,es,fr,ja,ko,pt,pt_BR,zh,zh_TW} %endif %changelog diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec index de78342cb3..3b6fad5ff8 100644 --- a/anda/devs/zed/nightly/zed-nightly.spec +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -15,7 +15,7 @@ Name: zed-nightly Version: %ver^%commit_date.%shortcommit -Release: 2%?dist +Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor SourceLicense: AGPL-3.0-only AND Apache-2.0 AND GPL-3.0-or-later License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 AND ISC) AND AGPL.3.0-only AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR MIT OR Apache-2.0) AND BSD-2-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CC0-1.0 AND GPL-3.0-or-later AND (ISC AND (Apache-2.0 OR ISC) AND OpenSSL) AND (ISC AND (Apache-2.0 OR ISC)) AND ISC AND (MIT AND (MIT OR Apache-2.0)) AND (MIT AND BSD-3-Clause) AND (MIT OR Apache-2.0 OR CC0-1.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT) AND Zlib diff --git a/anda/games/inputplumber/inputplumber.spec b/anda/games/inputplumber/inputplumber.spec index 3eaa7edaf9..c743fa9591 100644 --- a/anda/games/inputplumber/inputplumber.spec +++ b/anda/games/inputplumber/inputplumber.spec @@ -1,7 +1,7 @@ %global __brp_mangle_shebangs %{nil} Name: inputplumber -Version: 0.58.1 +Version: 0.58.2 Release: 1%?dist Summary: Open source input router and remapper daemon for Linux License: GPL-3.0-or-later diff --git a/anda/games/steam/steam.spec b/anda/games/steam/steam.spec index 4b085f77cb..3e3dc00710 100644 --- a/anda/games/steam/steam.spec +++ b/anda/games/steam/steam.spec @@ -132,8 +132,6 @@ Recommends: gobject-introspection Requires: steam-devices Requires: steam-device-rules -# Fix upgrading from old versions -Obsoletes: %{name} <= %{?epoch:%{epoch}:}1.0.0.82-1%{?dist}.x86_64 # Workaround for GNOME issues with libei Recommends: (extest-%{name} if gnome-shell) @@ -148,9 +146,6 @@ This package contains the installer for the Steam software distribution service. Summary: Fix for keyboard/mouse/tablet being detected as joystick in Linux Obsoletes: steam-devices < %{version}-%{release} BuildArch: noarch -# Fix upgrading from old versions -Obsoletes: %{name} <= %{?epoch:%{epoch}:}1.0.0.82-1%{?dist}.x86_64 -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description device-rules This package contains fixes for devices being detected incorrectly by Steam. diff --git a/anda/langs/go/albius/albius.spec b/anda/langs/go/albius/albius.spec index 35f0f7c4e0..84760fad7a 100644 --- a/anda/langs/go/albius/albius.spec +++ b/anda/langs/go/albius/albius.spec @@ -1,6 +1,6 @@ %define debug_package %nil -%global commit e5c90d2e7406cc7c9652a49bd8eb67771a76eedf -%global commit_date 20241128 +%global commit e540d74a68f824996afad62cb9bbe17089b4fb3a +%global commit_date 20250306 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: albius diff --git a/anda/langs/nim/nim/nim.spec b/anda/langs/nim/nim/nim.spec index 7d3aad639f..2b4be8494f 100644 --- a/anda/langs/nim/nim/nim.spec +++ b/anda/langs/nim/nim/nim.spec @@ -71,10 +71,6 @@ koch tools -t:-fPIE -l:-pie & nim c -d:danger -t:-fPIE -l:-pie nimsuggest/nimsuggest.nim & wait -%ifarch x86_64 -sed -i '/ diff --git a/anda/tools/arduino-create-agent/arduino-create-agent.spec b/anda/tools/arduino-create-agent/arduino-create-agent.spec index 44ca64a82a..45d90793de 100644 --- a/anda/tools/arduino-create-agent/arduino-create-agent.spec +++ b/anda/tools/arduino-create-agent/arduino-create-agent.spec @@ -20,7 +20,6 @@ Packager: Owen Zimmerman URL: %{gourl} Source: %{url}/archive/%{version}.tar.gz -Patch0: update.patch BuildRequires: anda-srpm-macros %description %{common_description} @@ -29,10 +28,11 @@ BuildRequires: anda-srpm-macros %prep %goprep -%autopatch -p1 %go_prep_online %build +sed -E '/^func Start\(/,/^\}$/s@return start\(src\)@return ""@' -i updater/updater.go +sed -E '\?r.POST\("/update", updateHandler\)?d' -i main.go %define gomodulesmode GO111MODULE=on %gobuild -o %{gobuilddir}/bin/arduino-create-agent %{goipath} diff --git a/anda/tools/buildsys/anda/rust-anda.spec b/anda/tools/buildsys/anda/rust-anda.spec index 43996367dd..07766df05a 100644 --- a/anda/tools/buildsys/anda/rust-anda.spec +++ b/anda/tools/buildsys/anda/rust-anda.spec @@ -5,7 +5,7 @@ %global crate anda Name: rust-anda -Version: 0.4.9 +Version: 0.4.12 Release: 1%?dist Summary: Andaman Build toolchain diff --git a/anda/tools/cuda-gcc/cuda-gcc.spec b/anda/tools/cuda-gcc/cuda-gcc.spec index 22782a497d..8c6b392ec9 100644 --- a/anda/tools/cuda-gcc/cuda-gcc.spec +++ b/anda/tools/cuda-gcc/cuda-gcc.spec @@ -5,8 +5,8 @@ %endif Name: cuda-gcc -Version: 13.3.1 -Release: 3%{?dist} +Version: 14.2.1 +Release: 2%?dist Summary: GNU Compiler Collection CUDA compatibility package License: BSD URL: http://gcc.gnu.org diff --git a/anda/tools/gcm-core/gcm-core.spec b/anda/tools/gcm-core/gcm-core.spec index 70115b23a9..0f6863423a 100644 --- a/anda/tools/gcm-core/gcm-core.spec +++ b/anda/tools/gcm-core/gcm-core.spec @@ -7,6 +7,7 @@ Name: gcm-core Version: 2.6.1 + Release: 1%?dist Summary: Secure, cross-platform Git credential storage diff --git a/anda/tools/modern-colorthief/modern-colorthief.spec b/anda/tools/modern-colorthief/modern-colorthief.spec index 8727ef3b0d..6520327e91 100644 --- a/anda/tools/modern-colorthief/modern-colorthief.spec +++ b/anda/tools/modern-colorthief/modern-colorthief.spec @@ -25,8 +25,6 @@ BuildRequires: python3dist(modern-colorthief) BuildRequires: python3dist(myst-parser) BuildRequires: python3dist(shibuya) BuildRequires: python3dist(sphinx) -%elif %{with test} -BuildRequires: python3dist(modern-colorthief) %endif %if %{with test} %if 0%{?fedora} <= 42 diff --git a/anda/tools/spotx-bash/spotx-bash.spec b/anda/tools/spotx-bash/spotx-bash.spec index 195e8d5a53..30ac7b8e79 100644 --- a/anda/tools/spotx-bash/spotx-bash.spec +++ b/anda/tools/spotx-bash/spotx-bash.spec @@ -33,4 +33,4 @@ install -Dm 755 spotx.sh %buildroot%{_bindir}/spotx %changelog * Sat Dec 14 2024 Its-J -- Package SpotX-Bash +- Package SpotX-Bash \ No newline at end of file