From 7d25f698b60ca2a42fd0370df4df9c87d67cec0c Mon Sep 17 00:00:00 2001 From: Gil Date: Sat, 18 Jan 2025 20:52:35 -0600 Subject: [PATCH] Change (Anki): Move to Extras, minor dep changes (#3045) * Move to Extras Signed-off-by: Gil * Change (anki-bin): Allow mpv-nightly to satisfy mpv dependency On the right branch this time?? Signed-off-by: Gil * Change (anki): Allow mpv-nightly to satisfy mpv recommendation Signed-off-by: Gil * Fix: Cursed GitHub formatting?? * Forgot to update the rel... Signed-off-by: Gil * Change: Move to Extras Signed-off-by: Gil * fix(anki-bin): specify required protobuf version --------- Signed-off-by: Gil Co-authored-by: sadlerm4 --- anda/apps/anki-bin/anda.hcl | 3 +++ anda/apps/anki-bin/anki-bin.spec | 21 ++++++++++++--------- anda/apps/anki/anda.hcl | 3 +++ anda/apps/anki/anki.spec | 2 +- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/anda/apps/anki-bin/anda.hcl b/anda/apps/anki-bin/anda.hcl index 3398b0b813..6df0e27da9 100644 --- a/anda/apps/anki-bin/anda.hcl +++ b/anda/apps/anki-bin/anda.hcl @@ -3,4 +3,7 @@ project pkg { rpm { spec = "anki-bin.spec" } + labels { + subrepo = "extras" + } } diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec index 6500b693c8..c76b7af704 100644 --- a/anda/apps/anki-bin/anki-bin.spec +++ b/anda/apps/anki-bin/anki-bin.spec @@ -4,26 +4,29 @@ Name: anki-bin Version: 24.11 -Release: 1%?dist +Release: 2%?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 URL: https://apps.ankiweb.net/ -BuildRequires: python3-pip rpm_macro(fdupes) cargo -Requires: python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson -Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema -Requires: python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash -Requires: libxcrypt-compat hicolor-icon-theme sox mpv -ExclusiveArch: x86_64 +BuildRequires: python3-pip rpm_macro(fdupes) cargo +Requires: python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson +Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema +Requires: python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash +Requires: python3-protobuf >= 4.21 +Requires: libxcrypt-compat hicolor-icon-theme sox +Requires: (mpv or mpv-nightly) + +ExclusiveArch: x86_64 Conflicts: anki %ifarch x86_64 Source0: %xurl %elifarch aarch64 -Source0: %aurl +Source0: %aurl %endif Source1: %qurl Source2: https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/runanki.py Source3: https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.desktop -Source4: https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.png +Source4: https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.png Source5: https://raw.githubusercontent.com/ankitects/anki/%{version}/LICENSE Source6: https://raw.githubusercontent.com/ankitects/anki/%{version}/README.md diff --git a/anda/apps/anki/anda.hcl b/anda/apps/anki/anda.hcl index 7da31b7cbe..049c80465a 100644 --- a/anda/apps/anki/anda.hcl +++ b/anda/apps/anki/anda.hcl @@ -3,4 +3,7 @@ project pkg { rpm { spec = "anki.spec" } + labels { + subrepo = "extras" + } } diff --git a/anda/apps/anki/anki.spec b/anda/apps/anki/anki.spec index 70d60641d5..7845ed6b0d 100644 --- a/anda/apps/anki/anki.spec +++ b/anda/apps/anki/anki.spec @@ -9,7 +9,7 @@ BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-sen BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-webengine Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt6-webengine -Recommends: mpv +Recommends: (mpv or mpv-nightly) Obsoletes: anki <= 2.1.15 Conflicts: anki-qt5 Patch0: 0001-No-update.patch