higher priority for sources too

.backportrc.json

@@ -2,7 +2,7 @@
   "repoOwner": "terrapkg",
   "repoName": "packages",
   "resetAuthor": true,
-  "targetBranchChoices": ["el10", "f40", "f41", "f42", "frawhide"],
+  "targetBranchChoices": ["f39", "f40", "frawhide"],
   "branchLabelMapping": {
     "^sync-(.+)$": "$1"
   }

.devcontainer/Dockerfile

@@ -0,0 +1,9 @@
+ARG VARIANT="rawhide"
+FROM fedora:${VARIANT}
+
+RUN useradd -m vscode
+RUN groupadd mock
+RUN usermod -aG mock vscode
+RUN echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode
+RUN curl -Lo /etc/yum.repos.d/terra.repo https://raw.githubusercontent.com/terrapkg/subatomic-repos/main/terra.repo
+RUN dnf -y install git mock createrepo_c anda terra-mock-configs

.devcontainer/devcontainer.json

@@ -1,15 +1,18 @@
 {
-  "name": "Terra Devcontainer",
-  "image": "ghcr.io/terrapkg/builder:f42",
-  "runArgs": ["--privileged"],
-  "features": {
-    "ghcr.io/devcontainers/features/common-utils:2": {}
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": ["rhaiscript.vscode-rhai"]
-    }
+  "name": "Fedora",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "args": { "VARIANT": "rawhide" }
   },
   "remoteUser": "vscode",
-  "onCreateCommand": "sudo usermod -a -G mock vscode"
+  "runArgs": [
+    "--privileged"
+  ],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "rhaiscript.vscode-rhai"
+      ]
+    }
+  }
 }

.github/workflows/autobuild.yml

@@ -6,23 +6,24 @@ on:
     paths:
       - anda/**
     branches:
-      - f42
+      - frawhide
   pull_request:
     branches:
-      - f42
+      - frawhide
   merge_group:
     branches:
-      - f42
+      - frawhide
   workflow_dispatch:
   workflow_call:
 
 jobs:
   manifest:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
+
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
     container:
-      image: ghcr.io/terrapkg/builder:f42
+      image: ghcr.io/terrapkg/builder:frawhide
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Set workspace as safe
@@ -39,9 +40,9 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["42"]
+        version: ["rawhide"]
       fail-fast: false
-    runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }}
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
     container:
       image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
       options: --cap-add=SYS_ADMIN --privileged
@@ -89,20 +90,18 @@ jobs:
       - name: Upload packages to subatomic
         if: github.event_name == 'push'
         run: |
-          subrepo="${{ matrix.pkg.labels.subrepo }}"
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }} anda-build/rpm/rpms/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }} anda-build/rpm/rpms/*
 
       - name: Upload source packages to subatomic
         if: github.event_name == 'push'
         run: |
-          subrepo="${{ matrix.pkg.labels.subrepo }}"
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }}-source anda-build/rpm/srpm/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/*
 
       - name: Notify Madoguchi (Success)
         if: success() && github.event_name == 'push'

.github/workflows/bootstrap.yml

@@ -7,40 +7,26 @@ jobs:
   bootstrap:
     strategy:
       matrix:
-        version: ["42"]
+        version: ["rawhide"]
         arch: ["x86_64", "aarch64"]
       fail-fast: true
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
       image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Install repositories
         run: |
-          dnf5 swap -y --setopt=install_weak_deps=False systemd-standalone-sysusers systemd
-          dnf5 install -y --setopt=install_weak_deps=False curl wget git-core openssl-devel cargo podman fuse-overlayfs dnf5-plugins rpmbuild script
+          dnf5 install -y --setopt=install_weak_deps=False curl wget git-core openssl-devel cargo podman fuse-overlayfs
+          dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/tools/buildsys/{anda,subatomic}/*.spec
+
+      - name: Install Anda
+        run: cargo install anda
 
       - uses: actions/checkout@v4
         with:
           ref: f${{ matrix.version }}
           fetch-depth: 1
-
-      - name: Build anda-srpm-macros
-        run: |
-          mkdir -p anda-build/rpm/rpms
-          rpmbuild -bb anda/terra/srpm-macros/*.spec --undefine=_disable_source_fetch -D "_sourcedir $(pwd)/anda/terra/srpm-macros/" -D "_rpmdir $(pwd)/anda-build/rpm/rpms/"
-          mv ./anda-build/rpm/rpms/*/anda-*.rpm ./anda-build/rpm/rpms/
-          dnf5 install -y ./anda-build/rpm/rpms/anda-*.rpm
-
-      - name: Install build dependencies
-        run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/tools/buildsys/{anda,subatomic}/*.spec
-
-      - name: Install Anda
-        run: |
-          rpmbuild -bb anda/tools/buildsys/anda/*.spec --undefine=_disable_source_fetch -D "_sourcedir $(pwd)/anda/tools/buildsys/anda/" -D "_rpmdir $(pwd)/anda-build/rpm/rpms/"
-          mv ./anda-build/rpm/rpms/*/anda-*.rpm ./anda-build/rpm/rpms/
-          dnf5 install -y ./anda-build/rpm/rpms/anda-*.rpm
-
       - name: Build terra-mock-configs
         run: |
           echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV
@@ -50,16 +36,16 @@ jobs:
       - name: Install terra-mock-configs
         run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
 
-      - name: Build trra-release
-        run: anda build -rrpmbuild anda/terra/release/pkg
+      - name: Build anda-srpm-macros
+        run: anda build -rrpmbuild anda/terra/srpm-macros/pkg
 
       - name: Build Subatomic
         run: anda build -rrpmbuild anda/tools/buildsys/subatomic/pkg
       - name: Install Subatomic
         run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
 
-      - name: Tidy up output directory
-        run: rmdir anda-build/rpm/rpms/{noarch,aarch64,x86_64} | true
+      - name: Build Andaman
+        run: anda build -rrpmbuild anda/tools/buildsys/anda/pkg
 
       - name: Upload packages to subatomic
         run: |

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
       pkgs: ${{ steps.parsing.outputs.pkgs }}
       builder: ${{ inputs.custom_builder }}
       arch: ${{ steps.parsing.outputs.arch }}
-    runs-on: ubuntu-22.04
+    runs-on: "ubuntu-latest"
     steps:
       - name: Parse Input
         id: parsing
@@ -44,10 +44,10 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["42"]
+        version: ["rawhide"]
         arch: ${{ fromJson(needs.parse.outputs.arch) }}
       fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-22.04' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
     container:
       image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
       options: --cap-add=SYS_ADMIN --privileged
@@ -60,8 +60,15 @@ jobs:
       - name: Set up git repository
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
+      - name: CI Setup Script
+        run: |
+          dir=${{ matrix.pkg }}
+          if [ -f $dir/ci_setup.rhai ]; then
+            anda run $dir/ci_setup.rhai --labels script_path=$dir/ci_setup.rhai
+          fi
+
       - name: Build with Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/${{ matrix.pkg }}pkg
+        run: anda build -rrpmbuild anda/${{ matrix.pkg }}pkg
 
       - name: Generating artifact name
         id: art

.github/workflows/json-build.yml

@@ -11,9 +11,9 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(inputs.packages) }}
-        version: ["42"]
+        version: ["rawhide"]
       fail-fast: false
-    runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }}
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
       image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
       options: --cap-add=SYS_ADMIN --privileged
@@ -60,19 +60,17 @@ jobs:
 
       - name: Upload packages to subatomic
         run: |
-          subrepo="${{ matrix.pkg.labels.subrepo }}"
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }} anda-build/rpm/rpms/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }} anda-build/rpm/rpms/*
 
       - name: Upload source packages to subatomic
         run: |
-          subrepo="${{ matrix.pkg.labels.subrepo }}"
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }}-source anda-build/rpm/srpm/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/*
 
       - name: Notify Madoguchi (Success)
         if: success()

.github/workflows/sync.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   backport:
     name: Backport/sync PR
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     if: github.event.pull_request.merged
     steps:
       - name: Install SSH signing key

.github/workflows/update-branch.yml

@@ -6,17 +6,16 @@ on:
 
 jobs:
   autoupdate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         branch:
           - frawhide
           - f40
           - f41
-          - f42
           - el10
     container:
-      image: ghcr.io/terrapkg/builder:f42
+      image: ghcr.io/terrapkg/builder:frawhide
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
@@ -34,7 +33,10 @@ jobs:
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run Update
-        run: anda update --filters updbranch=1 --labels branch=${{ matrix.branch }}
+        run: |
+          nbranch="${{ matrix.branch }}"
+          [ "$nbranch" = 'frawhide' ] && nbranch='f42'
+          anda update --filters updbranch=1 --labels branch=${{ matrix.branch }},nbranch=$nbranch
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RUST_BACKTRACE: full

.github/workflows/update-comps.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - frawhide
-      - f42
       - f41
       - f40
       - el10
@@ -14,9 +13,9 @@ on:
 
 jobs:
   update-comps:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f42
+      image: ghcr.io/terrapkg/builder:frawhide
     steps:
       - uses: actions/checkout@v4
       - name: Push to subatomic

.github/workflows/update-nightly.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   autoupdate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     container:
       image: ghcr.io/terrapkg/builder:frawhide
       options: --cap-add=SYS_ADMIN --privileged

.github/workflows/update-weekly.yml

@@ -1,12 +1,12 @@
 name: Weekly Update
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: "0 0 * * 0"
   workflow_dispatch:
 
 jobs:
   autoupdate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     container:
       image: ghcr.io/terrapkg/builder:frawhide
       options: --cap-add=SYS_ADMIN --privileged
@@ -25,7 +25,7 @@ jobs:
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run Weekly Update
-        run: anda update --filters weekly=$(date "+%w")
+        run: anda update --filters weekly=1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RUST_BACKTRACE: full

.github/workflows/update.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   autoupdate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     container:
       image: ghcr.io/terrapkg/builder:frawhide
       options: --cap-add=SYS_ADMIN --privileged

anda/apps/anki-bin/anda.hcl

@@ -3,7 +3,4 @@ project pkg {
 	rpm {
 		spec = "anki-bin.spec"
 	}
-        labels {
-        subrepo = "extras"
-       }
 }

anda/apps/anki-bin/anki-bin.spec

@@ -1,32 +1,29 @@
-%global xurl https://files.pythonhosted.org/packages/68/9c/7685bd012e597332f8ce379a31b0d58dd4eae960da96ff43e9fcd978c93f/anki-25.02-cp39-abi3-manylinux_2_35_x86_64.whl
-%global aurl https://files.pythonhosted.org/packages/da/36/741cef7b7fce943d187784549fd8de8152986067d9226f384959c07770a7/anki-25.02-cp39-abi3-manylinux_2_35_aarch64.whl
-%global qurl https://files.pythonhosted.org/packages/2c/bc/763589b97aa5c91acf3d834beaa473c25ca7f335c7b40954fd0d5fd41ddc/aqt-25.02-py3-none-any.whl
+%global xurl https://files.pythonhosted.org/packages/ef/fa/6c86371d0e3b71129d2a79e63fc3fdc17733c9ebbf77345c62caad8c9fca/anki-24.11-cp39-abi3-manylinux_2_28_x86_64.whl
+%global aurl https://files.pythonhosted.org/packages/58/6e/9f2d4853a83e57cea48ccae3bc2d887bf7c0550042185e156bab23f524bf/anki-24.11-cp39-abi3-manylinux_2_31_aarch64.whl
+%global qurl https://files.pythonhosted.org/packages/40/3c/b70ef91f1dad8248332971c0cbb2922277512789cadc33cb16233e360a56/aqt-24.11-py3-none-any.whl
 
 Name:			anki-bin
-Version:		25.02
+Version:		24.11
 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
 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:               python3-protobuf >= 4.21
-Requires:               libxcrypt-compat hicolor-icon-theme sox
-Requires:               (mpv or mpv-nightly)
-
-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:       libxcrypt-compat hicolor-icon-theme sox mpv 
+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
 
@@ -60,8 +57,6 @@ rm -rf %buildroot%_bindir/{distro,flask,jsonschema,markdown_py,normalizer,send2t
 %license LICENSE
 %doc README.md
 %_bindir/anki
-%_bindir/pyuic6
-%_bindir/pylupdate6
 /usr/lib/python*/site-packages/_aqt/
 /usr/lib/python*/site-packages/anki-%{version}.dist-info/
 /usr/lib/python*/site-packages/anki/

anda/apps/anki-qt5/anki-qt5.spec

@@ -1,5 +1,5 @@
 Name:           anki-qt5
-Version:        25.02
+Version:        24.11
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 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

anda/apps/anki/anda.hcl

@@ -3,7 +3,4 @@ project pkg {
 	rpm {
 		spec = "anki.spec"
 	}
-        labels {
-                subrepo = "extras"
-        }
 }

anda/apps/anki/anki.spec

@@ -1,5 +1,5 @@
 Name:           anki
-Version:        25.02
+Version:        24.11
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 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
@@ -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 or mpv-nightly)
+Recommends:     mpv
 Obsoletes:      anki <= 2.1.15
 Conflicts:      anki-qt5
 Patch0:         0001-No-update.patch

anda/apps/audacity-freeworld/audacity-freeworld.spec

@@ -1,11 +1,8 @@
 %global __requires_exclude ^lib-.*.so            
 %global __provides_exclude ^lib-.*.so
 
-%global ver Audacity-3.7.3
-%global sanitized_ver %(echo %{ver} | sed 's/Audacity-//g')
-
 Name:    audacity-freeworld
-Version: %{sanitized_ver}
+Version: Audacity.3.7.1
 Release: 1%?dist
 Summary: Multitrack audio editor
 License: GPLv2
@@ -749,4 +746,4 @@ rm -f %{buildroot}%{_prefix}/%{realname}
 - New upstream version 1.2.0-pre3
 
 * Sat Oct 25 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:1.2.0-pre2.fdr.1
-- First Fedora release
+- First Fedora release

anda/apps/audacity-freeworld/update.rhai

@@ -1,4 +1 @@
-rpm.global("ver", gh("audacity/audacity"));
-if rpm.changed() {
-    rpm.release();
-}
+rpm.version(gh("audacity/audacity"));

anda/apps/authy/anda.hcl

@@ -1,5 +1,5 @@
 project pkg {
 	rpm {
-		spec = "sndio.spec"
+		spec = "authy.spec"
 	}
 }

anda/apps/authy/authy.spec

@@ -0,0 +1,54 @@
+%define debug_package %nil
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
+
+Name: authy
+Version: 2.5.0
+Release: 1%{?dist}
+Summary: Two factor authentication desktop application
+License: Unlicense
+URL: https://authy.com/
+Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_23.snap
+Requires: gtk3
+Requires: nss
+BuildRequires: squashfs-tools desktop-file-utils
+
+%description
+%{summary}.
+
+%prep
+unsquashfs -q -f -d snap %{SOURCE0}
+
+%build
+
+%install
+install -d %buildroot%_datadir/authy
+cp -r snap/. %buildroot%_datadir/authy
+
+sed -i 's|${SNAP}/meta/gui/icon.png|authy|g' %buildroot%_datadir/authy/meta/gui/authy.desktop
+install -Dm644 %buildroot%_datadir/authy/meta/gui/authy.desktop -t %buildroot%_datadir/applications
+install -Dm644 %buildroot%_datadir/authy/meta/gui/icon.png %buildroot%_datadir/pixmaps/authy.png
+
+rm -rf %buildroot%_datadir/authy/{data-dir,gnome-platform,lib,meta,scripts,usr,*.sh}
+
+install -d %buildroot%_bindir
+ln -s %_datadir/authy/authy %buildroot%_bindir
+
+%check
+desktop-file-validate %buildroot%_datadir/applications/authy.desktop
+
+%files
+%_datadir/authy/
+%_bindir/authy
+%_datadir/applications/authy.desktop
+%_datadir/pixmaps/authy.png
+
+%changelog
+* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.3.0-2
+- Use /usr/share/ instead of /opt/
+
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 2.2.1-2
+- Initial release

anda/apps/authy/update.rhai.bak

@@ -0,0 +1,5 @@
+let req = new_req("https://api.snapcraft.io/v2/snaps/info/authy");
+req.head("Snap-Device-Series", "16");
+let obj = json(req.get())["channel-map"][0];
+rpm.version(obj.version);
+rpm.source(0, obj.download.url);

anda/apps/blackbox-terminal/anda.hcl

@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "blackbox-terminal.spec"
+	}
+}

anda/apps/blackbox-terminal/blackbox-terminal.spec

@@ -0,0 +1,58 @@
+Name:           blackbox-terminal
+Version:        0.14.0
+Release:        1%{?dist}
+Summary:        A beautiful GTK 4 terminal
+License:        GPL-3.0
+URL:            https://gitlab.gnome.org/raggesilver/blackbox
+BuildRequires:  vala meson gettext 
+BuildRequires:  pkgconfig(gtk4) >= 4.6.2
+BuildRequires:  pkgconfig(gio-2.0) >= 2.50
+BuildRequires:  libadwaita-devel >= 1.1
+BuildRequires:  pkgconfig(pqmarble) >= 2
+BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.69.0
+BuildRequires:  pkgconfig(json-glib-1.0) >= 1.4.4
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.9.12
+BuildRequires:  pkgconfig(librsvg-2.0) >= 2.54.0
+BuildRequires:  pkgconfig(libpcre2-8)
+BuildRequires:  pkgconfig(graphene-gobject-1.0)
+BuildRequires:  pkgconfig(gee-0.8)
+BuildRequires:  desktop-file-utils libappstream-glib cmake
+Source0:        %url/-/archive/v%version/blackbox-v%version.tar.gz
+
+%description
+%{summary}.
+
+%prep
+%autosetup -p1 -n blackbox-v%version
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+%check
+appstream-util validate-relax --nonet %buildroot/%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
+
+%files
+%doc README.md
+%license COPYING
+%_bindir/blackbox
+%_bindir/terminal-toolbox
+%_datadir/applications/com.raggesilver.BlackBox.desktop
+%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
+%_datadir/blackbox/
+%_datadir/glib-2.0/schemas/com.raggesilver.BlackBox.gschema.xml
+%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-fullscreen-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-show-headerbar-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/external-link-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/settings-symbolic.svg
+%_datadir/icons/hicolor/scalable/apps/com.raggesilver.BlackBox.svg
+%_datadir/locale/*/LC_MESSAGES/blackbox.mo
+
+
+
+%changelog
+* Sun Oct 23 2022 windowsboy111 <windowsboy111@fyralabs.com>
+- Initial package

anda/apps/blackbox-terminal/update.rhai

@@ -0,0 +1,4 @@
+let txt = get("https://gitlab.gnome.org/api/v4/projects/20397/releases/");
+let ver = txt.json_arr()[0].tag_name;
+ver.crop(1);
+rpm.version(ver);

anda/apps/coolercontrol/coolercontrol.spec

@@ -8,8 +8,8 @@ for background device management, as well as a GUI to expertly customize your se
 %global __brp_mangle_shebangs %{nil}
 
 Name:           coolercontrol
-Version:        2.0.1
-Release:        2%?dist
+Version:        1.4.5
+Release:        1%?dist
 Summary:        Cooling device control for Linux
 License:        GPL-3.0-or-later
 URL:            https://gitlab.com/coolercontrol/coolercontrol
@@ -21,19 +21,19 @@ Requires:       hicolor-icon-theme
 Requires:       webkit2gtk4.1
 Requires:       libappindicator-gtk3
 Requires:       coolercontrold
-BuildRequires:  nodejs-npm libdrm-devel curl wget file mold
+BuildRequires:  git-core make nodejs-npm libdrm-devel curl wget file mold
 BuildRequires:  systemd-rpm-macros anda-srpm-macros cargo >= 1.75.0 cargo-rpm-macros
-BuildRequires:  binutils bison cmake flex gcc gcc-c++ libtool strace
+BuildRequires:  autoconf automake binutils bison flex gcc gcc-c++ gdb libtool pkgconf strace
+BuildRequires:  pkgconfig(webkit2gtk-4.1) pkgconfig(openssl) pkgconfig(librsvg-2.0)
+BuildRequires:  libappindicator-gtk3-devel
+BuildRequires:  python3-devel python3-wheel python3-liquidctl python3-setproctitle python3-fastapi python3-uvicorn python3-pip
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
-BuildRequires:  cmake(Qt6)
-BuildRequires:  cmake(Qt6WebEngineWidgets)
 %description %_desc
 
 %package liqctld
 Summary:        CoolerControl daemon for interacting with liquidctl devices on a system level
 Requires:       coolercontrold
-BuildRequires:  python3-devel python3-wheel python3-liquidctl python3-setproctitle python3-fastapi python3-uvicorn python3-pip
 %description liqctld %_desc
 coolercontrol-liqctld is a CoolerControl daemon for interacting with liquidctl devices on a system level, and is
 installed as the coolercontrol-liqctld application. Its main purpose is to wrap the underlying
@@ -43,8 +43,6 @@ It also enables parallel device communication and access to specific device prop
 %package -n coolercontrold
 Summary:        Monitor and control your cooling devices.
 Requires:       coolercontrol-liqctld
-BuildRequires:  pkgconfig(webkit2gtk-4.1) pkgconfig(openssl) pkgconfig(librsvg-2.0)
-BuildRequires:  libappindicator-gtk3-devel
 %description -n coolercontrold %_desc
 coolercontrold is the main daemon containing the core logic for interfacing with devices, and installed as
 "coolercontrold". It is meant to run in the background as a system daemon. It handles all device
@@ -61,31 +59,33 @@ popd
 
 pushd coolercontrol-ui
 npm ci --prefer-offline &
+pushd src-tauri
+%cargo_prep_online &
+popd
 popd
 
 wait
 
 
 %build
-pushd coolercontrol-ui
-npm run build-only &
+pushd coolercontrold
+%{cargo_license_online} > LICENSE.dependencies &
+%cargo_build -- &
 popd
 
 pushd coolercontrol-liqctld
 %pyproject_wheel
 popd
 
-pushd coolercontrol
-%cmake
-%cmake_build &
-popd
-
-pushd coolercontrold
+pushd coolercontrol-ui
+npm run build &
+pushd src-tauri
 %{cargo_license_online} > LICENSE.dependencies &
 wait
-cp -rfp ../coolercontrol-ui/dist/* resources/app/
-%cargo_build
+%cargo_build -f custom-protocol
 popd
+popd
+
 
 %install
 pushd coolercontrol-liqctld
@@ -99,8 +99,9 @@ install -Dpm755 target/rpm/coolercontrold %buildroot%_bindir/coolercontrold
 install -Dpm644 LICENSE.dependencies %buildroot%_datadir/licenses/coolercontrold/LICENSE.dependencies
 popd
 
-pushd coolercontrol/
-%cmake_install
+pushd coolercontrol-ui/src-tauri
+install -Dpm755 target/rpm/coolercontrol %buildroot%_bindir/coolercontrol
+install -Dpm644 LICENSE.dependencies %buildroot%_datadir/licenses/%name/LICENSE.dependencies
 popd
 
 install -Dpm644 packaging/systemd/coolercontrol-liqctld.service %buildroot%_unitdir/coolercontrol-liqctld.service
@@ -134,6 +135,7 @@ appstream-util validate-relax --nonet %buildroot%_metainfodir/%rdnn.metainfo.xml
 %files
 %doc README.md
 %license LICENSE
+%license LICENSE.dependencies
 %_bindir/coolercontrol
 %_datadir/applications/%rdnn.desktop
 %_datadir/metainfo/%rdnn.metainfo.xml

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.618
+Version:        0.0.555
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms

anda/apps/discord-canary/discord-canary.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-canary
-Version:        0.0.618
+Version:        0.0.555
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com

anda/apps/discord-openasar/discord-openasar.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-openasar
-Version:        0.0.88
+Version:        0.0.78
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms

anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-ptb-openasar
-Version:        0.0.135
+Version:        0.0.124
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms

anda/apps/discord-ptb/discord-ptb.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-ptb
-Version:        0.0.135
+Version:        0.0.124
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com

anda/apps/discord/discord.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:			discord
-Version:		0.0.88
+Version:		0.0.78
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com

anda/apps/envision/envision.spec

@@ -1,8 +1,8 @@
-%global commit e117986715e1e9ef955009ad7f03ec110aa14940
-%global commit_date 20250303
+%global commit 1c3b4decb50593268c16cf8b47397fb3a7a87c9d
+%global commit_date 20250105
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
-Name:           envision-nightly
+Name:           envision
 Version:        %commit_date.%shortcommit
 Release:        1%?dist
 Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
@@ -23,7 +23,6 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  glib2-devel
 BuildRequires:  git-core
 Recommends:     android-tools
-Conflicts:      envision
 
 %description
 %summary.

anda/apps/feishin/feishin.spec

@@ -6,14 +6,14 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:			feishin
-Version:		0.12.3
+Version:		0.12.1
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
 URL:			https://github.com/jeffvli/feishin
 Source0:		%url/archive/refs/tags/v%version.tar.gz
 Requires:		fuse mpv
-BuildRequires:	nodejs20-npm jq libxcrypt-compat
+BuildRequires:	nodejs-npm jq libxcrypt-compat
 
 %description
 %summary.
@@ -38,13 +38,9 @@ Keywords=Music;Jellyfin;Audio;Stream;Sonixd
 EOF
 
 %build
-export PATH="$PATH:$(pwd)/bin"
-mkdir bin
-ln -s /usr/bin/node-20 bin/node
-ln -s /usr/bin/npm-20 bin/npm
-npm-20 install --legacy-peer-deps
-npm-20 run postinstall
-npm-20 run build
+npm install --legacy-peer-deps
+npm run postinstall
+npm run build
 %ifarch x86_64
 
 %define a linux
@@ -52,7 +48,7 @@ npm-20 run build
 %define a arm64
 %endif
 
-npx-20 electron-builder --linux dir --%a
+npx electron-builder --linux dir --%a
 
 %install
 mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir

anda/apps/fontviewer/fontviewer.spec

@@ -1,19 +1,23 @@
+%global commit d530f26d60dc105e44fdc8ac7f30a2f667bc1e4f
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20241224
+
 Name:           fontviewer
-Epoch:          1
-Version:        1.1.0
+Version:        %{commit_date}.git~%{shortcommit}
 Release:        1%?dist
 Summary:        View and install fonts
 
 License:        GPL-2.0
 URL:            https://github.com/chocolateimage/%{name}
-Source0:        %{url}/archive/v%{version}.tar.gz
+Source0:        %{url}/archive/%{commit}.tar.gz
 
 BuildRequires:  gcc-c++
 BuildRequires:  meson
+BuildRequires:  pkgconfig(cairomm-1.0)
 BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gtkmm-3.0)
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  json-glib-devel
 
 Requires:       gtk3 fontconfig
 
@@ -23,7 +27,7 @@ Packager:       sadlerm <sad_lerm@hotmail.com>
 A platform-agnostic GTK+ 3 alternative to GNOME's Font Viewer
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{commit} -p1
 
 %build
 %meson
@@ -37,4 +41,3 @@ A platform-agnostic GTK+ 3 alternative to GNOME's Font Viewer
 %doc README.md
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/scalable/actions/%{name}-google-symbolic.svg

anda/apps/fontviewer/update.rhai

@@ -1,4 +1,5 @@
-rpm.version(gh("chocolateimage/fontviewer"));
-if rpm.changed() {
-  rpm.release();
-}
+# rpm.global("commit", gh_commit("chocolateimage/fontviewer"));
+# if rpm.changed() {
+#    rpm.release();
+#    rpm.global("commit_date", date());
+# }

anda/apps/komikku/komikku.spec

@@ -5,16 +5,16 @@
 %global pure_protobuf_version 2.0.0
 
 Name:           komikku
-Version:        1.73.0
+Version:        1.67.0
 %forgemeta
-Release:        2%?dist
+Release:        1%?dist
 Summary:        A manga reader for GNOME
 
 BuildArch:      noarch
 
 License:        GPL-3.0-or-later
 URL:            https://valos.gitlab.io/Komikku
-Source0:        https://codeberg.org/valos/%{appname}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        https://codeberg.org/valos/%{appname}/archive/v%{version}.tar.gz#/%{name}-v%{version}.tar.gz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
@@ -92,7 +92,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 
 %files -f %{name}.lang
-%license LICENSES/*
+%license LICENSE
 %doc README.md
 %{_bindir}/%{name}
 %{_datadir}/%{name}/

anda/apps/legcord-bin/anda.hcl

@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "legcord-bin.spec"
+	}
+}

anda/apps/legcord-bin/legcord-bin.spec

@@ -0,0 +1,95 @@
+%define debug_package %nil
+%global _build_id_links none
+
+%ifarch x86_64
+%global src LegCord-%version-linux-x64
+%elifarch aarch64
+%global src LegCord-%version-linux-arm64
+%elifarch armv7l
+%global src LegCord-%version-linux-armv7l
+%endif
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
+
+Name:			legcord-bin
+Version:		1.0.6
+Release:		1%?dist
+License:		OSL-3.0
+Summary:		Custom lightweight Discord client designed to enhance your experience
+URL:			https://github.com/LegCord/LegCord
+Group:			Applications/Internet
+Source0:		%url/releases/download/v%version/%src.zip
+Source1:		legcord.png
+Source2:		https://raw.githubusercontent.com/LegCord/LegCord/v%version/README.md
+Requires:		xdg-utils
+BuildRequires:  unzip
+ExclusiveArch:	x86_64 aarch64 armv7l
+Conflicts:		legcord
+BuildRequires:	add-determinism
+Obsoletes:      armcord < 3.3.2-1
+
+%description
+LegCord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+mkdir legcord
+cd legcord
+unzip %SOURCE0
+
+cat <<EOF > .legcord.desktop
+[Desktop Entry]
+Name=LegCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=%_bindir/legcord
+Icon=legcord
+Categories=Network;InstantMessaging;
+StartupWMClass=legcord
+Keywords=discord;armcord;legcord;vencord;shelter;electron;
+EOF
+
+%build
+
+%install
+cd legcord
+mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name
+cp -a * %buildroot%_datadir/legcord/
+ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord
+ln -s %_datadir/legcord %buildroot%_datadir/armcord
+chmod +x -R %buildroot%_datadir/legcord/*
+chmod 755 %buildroot%_datadir/legcord/legcord
+install -Dm644 .legcord.desktop %buildroot%_datadir/applications/LegCord.desktop
+install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/legcord.png
+install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
+
+# HACK: rpm bug for unability to replace existing files on system.
+%pre
+if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
+  echo "Found old %_datadir/armcord directory, removing…"
+  rm -rf %_datadir/armcord
+fi
+
+%files
+%doc README.md
+%_datadir/legcord
+%_datadir/armcord
+%_bindir/legcord
+%_datadir/applications/LegCord.desktop
+%_datadir/pixmaps/legcord.png
+
+%changelog
+* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
+- Rename to LegCord.
+
+* Sat Jun 17 2023 madonuko <mado@fyralabs.com> - 3.2.0-2
+- Remove libnotify dependency.
+- Fix desktop entry.
+- Set as noarch package because there are not binary files.
+- Use /usr/share/ instead of /opt/
+
+* Sat May 6 2023 madonuko <mado@fyralabs.com> - 3.1.7-1
+- Initial package

anda/apps/legcord-bin/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("LegCord/LegCord"));

anda/apps/legcord/legcord-bin/legcord-bin.spec

@@ -2,44 +2,47 @@
 %global _build_id_links none
 
 %ifarch x86_64
-%global src Legcord-%version-linux-x64
+%global src LegCord-%version-linux-x64
 %elifarch aarch64
-%global src Legcord-%version-linux-arm64
+%global src LegCord-%version-linux-arm64
 %elifarch armv7l
-%global src Legcord-%version-linux-armv7l
+%global src LegCord-%version-linux-armv7l
 %endif
 
 # Exclude private libraries
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
 
-Name:           legcord-bin
-Version:        1.1.1
-Release:        1%?dist
-License:        OSL-3.0
-Summary:        Custom lightweight Discord client designed to enhance your experience
-URL:            https://github.com/Legcord/Legcord
-Group:          Applications/Internet
-Source0:        %url/releases/download/v%version/%src.tar.gz
-Source1:        legcord.png
-Source2:        https://raw.githubusercontent.com/Legcord/Legcord/v%version/README.md
-Requires:       xdg-utils
-ExclusiveArch:  x86_64 aarch64 armv7l
-Conflicts:      legcord
-Conflicts:      legcord-nightly
-BuildRequires:  add-determinism
+Name:			legcord-bin
+Version:		1.0.6
+Release:		1%?dist
+License:		OSL-3.0
+Summary:		Custom lightweight Discord client designed to enhance your experience
+URL:			https://github.com/LegCord/LegCord
+Group:			Applications/Internet
+Source0:		%url/releases/download/v%version/%src.zip
+Source1:		legcord.png
+Source2:		https://raw.githubusercontent.com/LegCord/LegCord/v%version/README.md
+Requires:		xdg-utils
+BuildRequires:  unzip
+ExclusiveArch:	x86_64 aarch64 armv7l
+Conflicts:		legcord
+Conflicts:		legcord-nightly
+BuildRequires:	add-determinism
 Obsoletes:      armcord < 3.3.2-1
 
 %description
-Legcord is a custom client designed to enhance your Discord experience
+LegCord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.
 
 %prep
-%autosetup -n %src
+mkdir legcord
+cd legcord
+unzip %SOURCE0
 
 cat <<EOF > .legcord.desktop
 [Desktop Entry]
-Name=Legcord
+Name=LegCord
 Comment=%summary
 GenericName=Internet Messenger
 Type=Application
@@ -53,6 +56,7 @@ EOF
 %build
 
 %install
+cd legcord
 mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name
 cp -a * %buildroot%_datadir/legcord/
 ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord

anda/apps/legcord/nightly/legcord-nightly.spec

@@ -1,28 +1,28 @@
-%global commit d974d27fb6d424e9c50c95675fa56ae8d952b42b
-%global commit_date 20250317
+%global commit 106ae1ac4251239e56c848667f1e3ffbbb30c762
+%global commit_date 20250105
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %define debug_package %nil
 
-Name:           legcord-nightly
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-License:        OSL-3.0
-Summary:        Custom lightweight Discord client designed to enhance your experience
-URL:            https://github.com/Legcord/Legcord
-Group:          Applications/Internet
-Source0:        %url/archive/%commit/Legcord-%commit.tar.gz
-Source1:        launch.sh
-Packager:       Owen <owen@fyralabs.com>
-Requires:       electron xdg-utils
-Provides:       armcord-nightly
-Obsoletes:      armcord < 3.3.2-1
-Conflicts:      legcord-bin
-Conflicts:      legcord
-BuildArch:      noarch
+Name:		legcord-nightly
+Version:	%commit_date.%shortcommit
+Release:	1%?dist
+License:	OSL-3.0
+Summary:	Custom lightweight Discord client designed to enhance your experience
+URL:		https://github.com/LegCord/LegCord
+Group:		Applications/Internet
+Source0:  %url/archive/%commit/legcord-%commit.tar.gz
+Source1:	launch.sh
+Packager:	Owen <owen@fyralabs.com>
+Requires:	electron xdg-utils
+Provides:   armcord-nightly
+Obsoletes:  armcord < 3.3.2-1
+Conflicts:	legcord-bin
+Conflicts:	legcord
+BuildArch:	noarch
 BuildRequires:  anda-srpm-macros pnpm
 
 %description
-Legcord is a custom client designed to enhance your Discord experience
+legcord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.
 
 %prep
@@ -30,7 +30,7 @@ while keeping everything lightweight.
 
 cat <<EOF > legcord.desktop
 [Desktop Entry]
-Name=Legcord
+Name=LegCord
 Comment=%summary
 GenericName=Internet Messenger
 Type=Application

anda/apps/legcord/stable/legcord.spec

@@ -4,25 +4,25 @@
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
 
-Name:           legcord
-Version:        1.1.1
-Release:        1%?dist
-License:        OSL-3.0
-Summary:        Custom lightweight Discord client designed to enhance your experience
-URL:            https://github.com/Legcord/Legcord
-Group:          Applications/Internet
-Source1:        launch.sh
-Packager:       madonuko <mado@fyralabs.com>
-Requires:       electron xdg-utils
-Provides:       armcord
-Obsoletes:      armcord < 3.3.2-1
-Conflicts:      legcord-bin
-Conflicts:      legcord-nightly
-BuildArch:      noarch
+Name:		legcord
+Version:	1.0.6
+Release:	1%?dist
+License:	OSL-3.0
+Summary:	Custom lightweight Discord client designed to enhance your experience
+URL:		https://github.com/LegCord/LegCord
+Group:		Applications/Internet
+Source1:	launch.sh
+Packager:	madonuko <mado@fyralabs.com>
+Requires:	electron xdg-utils
+Provides:   armcord
+Obsoletes:  armcord < 3.3.2-1
+Conflicts:	legcord-bin
+Conflicts:	legcord-nightly
+BuildArch:	noarch
 BuildRequires:  anda-srpm-macros pnpm
 
 %description
-Legcord is a custom client designed to enhance your Discord experience
+legcord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.
 
 %prep

anda/apps/mpv/mpv-nightly.spec

@@ -1,6 +1,6 @@
-%global commit b31c3d80ab0040cb02a54ee878cb2d95f6ed74e0
+%global commit 44384aad73da69b51c57fc7299457beecfcc1698
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250324
+%global commit_date 20250105
 %global ver 0.39.0
 
 Name:           mpv-nightly
@@ -124,33 +124,6 @@ Requires: mpv-nightly-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description devel
 This package contains development header files and libraries for Mpv.
 
-%package bash-completion
-Summary: MPV Bash completion
-Requires: bash
-Requires: %{name}
-Supplements: (%{name} and bash)
-
-%description bash-completion
-Bash shell completion for MPV.
-
-%package fish-completion
-Summary: MPV Fish completion
-Requires: fish
-Requires: %{name}
-Supplements: (%{name} and fish)
-
-%description fish-completion
-Fish shell completion for MPV.
-
-%package zsh-completion
-Summary: MPV Zsh completion
-Requires: zsh
-Requires: %{name}
-Supplements: (%{name} and zsh)
-
-%description zsh-completion
-Zsh shell completion for MPV.
-
 %prep
 %autosetup -p1 -n mpv-%commit
 sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf
@@ -232,7 +205,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop
 %{_docdir}/mpv/
 %{_bindir}/mpv
 %{_datadir}/applications/mpv.desktop
+%dir %{_datadir}/bash-completion/
+%dir %{_datadir}/bash-completion/completions/
+%{_datadir}/bash-completion/completions/mpv
 %{_datadir}/icons/hicolor/*/apps/mpv*.*
+%dir %{_datadir}/zsh/
+%dir %{_datadir}/zsh/site-functions/
+%{_datadir}/zsh/site-functions/_mpv
 %{_mandir}/man1/mpv.*
 %{_metainfodir}/mpv.metainfo.xml
 %dir %{_sysconfdir}/mpv/
@@ -247,14 +226,5 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop
 %{_libdir}/libmpv.so
 %{_libdir}/pkgconfig/mpv.pc
 
-%files bash-completion
-%{bash_completions_dir}/mpv
-
-%files fish-completion
-%{fish_completions_dir}/mpv.fish
-
-%files zsh-completion
-%{zsh_completions_dir}/_mpv
-
 %changelog
 %autochangelog

anda/apps/neohtop/NeoHtop.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Categories=Utility;
-Comment=A cross-platform system monitor
-Exec=NeoHtop
-Icon=NeoHtop
-Name=NeoHtop
-Terminal=false
-Type=Application

anda/apps/neohtop/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "neohtop.spec"
-    }
-}

anda/apps/neohtop/neohtop.spec

@@ -1,51 +0,0 @@
-%global __brp_mangle_shebangs %{nil}
-
-Name:           neohtop
-Version:        1.1.2
-Release:        1%?dist
-Summary:        System monitoring on steroids
-License:        MIT
-URL:            https://github.com/Abdenasser/neohtop
-Source0:        %url/archive/refs/tags/v%version.tar.gz
-Source1:        NeoHtop.desktop
-Packager:       Owen Zimmerman <owen@fyralabs.com>
-BuildRequires:  rust
-BuildRequires:  nodejs-npm
-BuildRequires:  webkit2gtk4.1-devel
-BuildRequires:  javascriptcoregtk4.1-devel
-BuildRequires:  libsoup3-devel
-BuildRequires:  gtk3-devel
-BuildRequires:  rust-gdk-pixbuf-sys-devel
-BuildRequires:  glib2-devel
-BuildRequires:  openssl-devel
-
-%description
-%summary.
-
-%prep
-%autosetup -n neohtop-%version
-
-%build
-npm install
-npm run tauri build
-
-%install
-install -Dpm755 src-tauri/target/release/NeoHtop %buildroot%_bindir/NeoHtop
-install -Dpm644 %{SOURCE1} %buildroot%{_datadir}/applications/NeoHtop.desktop
-# don't mind the numbers not matching, this is how the offical rpm installs these files
-install -Dpm644 src-tauri/icons/128x128@2x.png %buildroot%{_iconsdir}/hicolor/256x256@2/apps/NeoHtop.png
-install -Dpm644 src-tauri/icons/32x32.png %buildroot%{_iconsdir}/hicolor/32x32/apps/NeoHtop.png
-install -Dpm644 src-tauri/icons/128x128.png %buildroot%{_iconsdir}/hicolor/128x128/apps/NeoHtop.png
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/NeoHtop
-%{_datadir}/applications/NeoHtop.desktop
-%{_iconsdir}/hicolor/256x256@2/apps/NeoHtop.png
-%{_iconsdir}/hicolor/32x32/apps/NeoHtop.png
-%{_iconsdir}/hicolor/128x128/apps/NeoHtop.png
-
-%changelog
-* Sat Feb 15 2025 Owen Zimmerman <owen@fyralabs.com>
-- Initial package

anda/apps/neohtop/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("Abdenasser/neohtop"));

anda/apps/peazip/peazip.spec

@@ -1,138 +0,0 @@
-# can't figure out how to apply usual build flags to lazbuild
-%define debug_package %nil
-
-Name:           peazip
-Version:        10.3.0
-Release:        3%?dist
-Summary:        Free Zip / Unzip software and Rar file extractor. Cross-platform file and archive manager
-License:        LGPL-3.0-only
-URL:            https://peazip.github.io
-Source0:        https://github.com/peazip/PeaZip/archive/refs/tags/%version.tar.gz
-# holy smoke this is written in pascal?
-BuildRequires:  lazarus-tools
-BuildRequires:  lazarus-lcl-gtk2
-BuildRequires:  lazarus-lcl-gtk3
-BuildRequires:  lazarus-lcl-qt5
-BuildRequires:  lazarus-lcl-qt6
-Requires:       (peazip-gtk2 or peazip-gtk3 or peazip-gtk4 or peazip-qt5 or peazip-qt6)
-Requires:       p7zip brotli zstd
-Suggests:       (peazip-gtk4 if gtk4)
-Suggests:       (peazip-qt5 if qt5-qtbase)
-Suggests:       (peazip-qt6 if qt6-qtbase)
-
-%description
-PeaZip is a free file archiver utility and rar extractor for Linux, macOS, and
-Windows, which works with 200+ archive types and variants (7z, ace, arc, bz2,
-cab, gz, iso, paq, pea, rar, tar, wim, zip, zipx...), handles spanned archives
-(001, r01, z01...), supports multiple archive encryption standards, file
-hashing, exports tasks as console scripts.
-
-%package gtk2
-Summary: GTK2 version of peazip
-Requires: peazip
-RemovePathPostFixes: .gtk2
-%description gtk2
-GTK2 version of peazip.
-%package gtk3
-Summary: GTK3 version of peazip
-Requires: peazip
-RemovePathPostFixes: .gtk3
-%description gtk3
-GTK3 version of peazip.
-%package qt5
-Summary: Qt5 version of peazip
-Requires: peazip
-RemovePathPostFixes: .qt5
-%description qt5
-Qt5 version of peazip.
-%package qt6
-Summary: Qt6 version of peazip
-Requires: peazip
-RemovePathPostFixes: .qt6
-%description qt6
-Qt6 version of peazip.
-
-
-%package -n pea
-Summary: Engine for PEA file format support
-%description -n pea
-Engine for PEA file format support.
-
-%package -n pea-gtk2
-Summary: GTK2 version of pea
-Requires: pea
-RemovePathPostFixes: .gtk2
-%description -n pea-gtk2
-GTK2 version of pea.
-%package -n pea-gtk3
-Summary: GTK3 version of pea
-Requires: pea
-RemovePathPostFixes: .gtk3
-%description -n pea-gtk3
-GTK3 version of pea.
-%package -n pea-qt5
-Summary: Qt5 version of pea
-Requires: pea
-RemovePathPostFixes: .qt5
-%description -n pea-qt5
-Qt5 version of pea.
-%package -n pea-qt6
-Summary: Qt6 version of pea
-Requires: pea
-RemovePathPostFixes: .qt6
-%description -n pea-qt6
-Qt6 version of pea.
-
-%prep
-%autosetup -n PeaZip-%version
-
-%build
-cd peazip-sources
-lazbuild --add-package dev/metadarkstyle/metadarkstyle.lpk
-lazbuild --ws=gtk2 dev/project_peach.lpi && cp dev/peazip ../peazip.gtk2
-lazbuild --ws=gtk3 dev/project_peach.lpi && cp dev/peazip ../peazip.gtk3
-lazbuild --ws=qt5 dev/project_peach.lpi && cp dev/peazip ../peazip.qt5
-lazbuild --ws=qt6 dev/project_peach.lpi && cp dev/peazip ../peazip.qt6
-lazbuild --ws=gtk2 dev/project_pea.lpi && cp dev/pea ../pea.gtk2
-lazbuild --ws=gtk3 dev/project_pea.lpi && cp dev/pea ../pea.gtk3
-lazbuild --ws=qt5 dev/project_pea.lpi && cp dev/pea ../pea.qt5
-lazbuild --ws=qt6 dev/project_pea.lpi && cp dev/pea ../pea.qt6
-
-%install
-install -Dm755 peazip.* -t %buildroot%_bindir
-install -Dm755 pea.* -t %buildroot%_bindir
-install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/peazip.desktop -t %{buildroot}%{_datadir}/applications
-install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/*.png -t %{buildroot}%{_datadir}/pixmaps
-install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE6-dolphin/peazip-kde6.desktop -t %{buildroot}%{_datadir}/kio/servicemenus
-install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/Nautilus-scripts/PeaZip/* -t %{buildroot}%{_datadir}/nautilus/scripts/PeaZip
-
-%files
-%doc README.md
-%license LICENSE SECURITY.md
-%{_datadir}/applications/peazip.desktop
-%{_datadir}/pixmaps/peazip*.png
-%{_datadir}/kio/servicemenus/peazip-kde6.desktop
-%dir %{_datadir}/nautilus/scripts/PeaZip
-%{_datadir}/nautilus/scripts/PeaZip/*
-
-%files -n pea
-%doc README.md
-%license LICENSE SECURITY.md
-
-%files gtk2
-%_bindir/peazip.gtk2
-%files gtk3
-%_bindir/peazip.gtk3
-%files qt5
-%_bindir/peazip.qt5
-%files qt6
-%_bindir/peazip.qt6
-
-%files -n pea-gtk2
-%_bindir/pea.gtk2
-%files -n pea-gtk3
-%_bindir/pea.gtk3
-%files -n pea-qt5
-%_bindir/pea.qt5
-%files -n pea-qt6
-%_bindir/pea.qt6

anda/apps/peazip/update.rhai

@@ -1 +0,0 @@
-rpm.version(get("https://raw.githubusercontent.com/peazip/peazip.github.io/master/autoupdate.txt"));

anda/apps/ruffle/desktop_file_patch.diff

@@ -0,0 +1,11 @@
+--- a/desktop/packages/linux/rs.ruffle.Ruffle.desktop
++++ b/desktop/packages/linux/rs.ruffle.Ruffle.desktop
+@@ -47,7 +47,7 @@ Comment[zh_CN]=播放 Flash 游戏和动画
+ Comment[zh_TW]=播放 Flash 遊戲和動畫
+ Comment=Play Flash games & movies
+ Icon=rs.ruffle.Ruffle
+-Exec=ruffle %u
++Exec=ruffle_desktop %u
+ MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie
+ Categories=AudioVideo;Player;Graphics;Viewer;VectorGraphics;Game
+ Keywords[ar]=الفلاش;swf;مشغل;محاكي;رَسْت

anda/apps/ruffle/ruffle-nightly.spec

@@ -1,4 +1,4 @@
-%global ver 2025-03-24
+%global ver 2025-01-05
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -14,6 +14,7 @@ Summary:        A Flash Player emulator written in Rust
 License:        Apache-2.0 OR MIT
 URL:            https://ruffle.rs/
 Source0:        https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-%ver.tar.gz
+Patch0:         desktop_file_patch.diff
 Provides:       ruffle
 BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  anda-srpm-macros mold
@@ -39,8 +40,6 @@ Packager:       madonuko <mado@fyralabs.com>
 %prep
 %autosetup -n ruffle-nightly-%ver -p1
 %cargo_prep_online
-sed -iE 's@^Exec=ruffle %%u$@Exec=ruffle_desktop %%u@' desktop/packages/linux/rs.ruffle.Ruffle.desktop
-cat desktop/packages/linux/rs.ruffle.Ruffle.desktop
 
 %build
 %{cargo_license_online} > LICENSE.dependencies

anda/apps/sticky/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "sticky.spec"
-  }
-}

anda/apps/sticky/point-executable-to-sitepackages-directory.patch

@@ -1,9 +0,0 @@
-diff --git a/usr/bin/sticky b/usr/bin/sticky
-index 7425e9c..a00e755 100755
---- a/usr/bin/sticky
-+++ b/usr/bin/sticky
-@@ -1,3 +1,3 @@
- #!/bin/bash
- 
--/usr/lib/sticky/sticky.py $*
-+/usr/lib/python3*/site-packages/sticky/sticky.py $*

anda/apps/sticky/remove-meson-postinstall-script.patch

@@ -1,9 +0,0 @@
-diff --git a/meson.build b/meson.build
-index b25d642..435a6f0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -17,4 +17,3 @@ subdir('po')
- install_subdir('etc', install_dir: sysconfdir, strip_directory: true)
- install_subdir('usr', install_dir: prefix, strip_directory: true)
- 
--meson.add_install_script('meson/meson-postinstall.sh')

anda/apps/sticky/sticky.spec

@@ -1,62 +0,0 @@
-%global debug_package %{nil}
-
-Name:           sticky
-Version:        1.24
-Release:        1%{?dist}
-Summary:        A sticky notes app for the Linux desktop
-
-License:        GPL-2.0
-URL:            https://github.com/linuxmint/sticky
-Source0:        %{url}/archive/%{version}.tar.gz
-Patch0:         remove-meson-postinstall-script.patch
-Patch1:         point-executable-to-sitepackages-directory.patch
-
-BuildArch:      noarch
-
-BuildRequires:  python3-devel
-BuildRequires:  meson
-BuildRequires:  gettext-devel
-
-Requires:       python3
-Requires:       glib2
-Requires:       gspell
-Requires:       gtk3
-Requires:       python3-gobject-base
-Requires:       python3-xapp
-Requires:       xapps
-
-Packager:       sadlerm <sad_lerm@hotmail.com>
-
-%description
-Sticky is a note-taking app for the Linux desktop that simulates traditional "sticky note" style stationery on your desktop. Some of its features include basic text formatting (bold, italics, monospaced, etc.), spell-checking, a tray icon for controlling note visibility, color notes, manual and automatic backups, and a manager to organize your notes into groups.
-
-%prep
-%autosetup -p1
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-mkdir -p %{buildroot}%{python3_sitelib}
-mv -v %{buildroot}%{_prefix}/lib/%{name} %{buildroot}%{python3_sitelib}/%{name}
-
-%files
-%license COPYING
-%doc README.md
-%{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/glib-2.0/schemas/org.x.%{name}.gschema.xml
-%{_datadir}/icons/hicolor/scalable/apps/%{name}*.svg
-%{_datadir}/icons/hicolor/scalable/status/%{name}*.svg
-%{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
-%{_datadir}/%{name}/*
-%{_sysconfdir}/xdg/autostart/%{name}.desktop
-%{_datadir}/dbus-1/services/org.x.%{name}.service
-%{python3_sitelib}/%{name}/*.py
-%{python3_sitelib}/%{name}/__pycache__/*.pyc
-
-%changelog
-* Thu Jan 16 2025 sadlerm4 <sad_lerm@hotmail.com>
-- Initial package

anda/apps/subtitleedit/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "subtitleedit.spec"
-    }
-}

anda/apps/subtitleedit/subtitleedit.spec

@@ -1,56 +0,0 @@
-%global pkgdir %_datadir/subtitleedit
-%global realname subtitleedit
-
-Name:           %realname.bin
-Version:        4.0.11
-Release:        1%?dist
-Summary:        An advanced subtitle editor and converter
-License:        GPL-3.0-only
-URL:            https://www.nikse.dk/SubtitleEdit
-Source0:        https://github.com/SubtitleEdit/subtitleedit/releases/download/%version/SE%{gsub %version %. %{quote:}}.zip
-Source1:        https://github.com/SubtitleEdit/subtitleedit/blob/%version/src/libse/Icon.png?raw=true
-Packager:       madonuko <mado@fyralabs.com>
-Provides:       %realname = %evr
-Conflicts:      %realname
-BuildRequires:  unzip anda-srpm-macros
-Requires:       mono dejavu-fonts
-
-%description
-%summary.
-
-
-%prep
-cat<<EOF > subtitleedit.desktop
-[Desktop Entry]
-Name=Subtitle Edit
-Comment=An advanced subtitle editor and converter
-Exec=/usr/bin/subtitleedit %%F
-Icon=subtitleedit
-Terminal=false
-Type=Application
-Categories=Video;AudioVideo;AudioVideoEditing;
-EOF
-
-cat<<EOF > subtitleedit
-#!/usr/bin/sh
-exec mono /opt/subtitleedit/SubtitleEdit.exe "$@"
-EOF
-
-
-%install
-mkdir -p %buildroot%pkgdir
-unzip %{S:0} -d %buildroot%pkgdir
-rm -r %buildroot%pkgdir/Tesseract302
-rm %buildroot%pkgdir/Hunspell{x86,x64}.dll
-touch %buildroot%pkgdir/.PACKAGE-MANAGER
-
-install -Dm755 subtitleedit -t %buildroot%_bindir
-install -Dm644 subtitleedit.desktop -t %buildroot%_datadir/applications
-install -Dm644 %{S:1} %buildroot%_datadir/pixmaps/subtitleedit.png
-
-
-%files
-%pkgdir
-%_bindir/%realname
-%_datadir/applications/%realname.desktop
-%_datadir/pixmaps/%realname.png

anda/apps/subtitleedit/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("SubtitleEdit/subtitleedit"));

anda/apps/switcheroo-control/anda.hcl

@@ -3,6 +3,6 @@ project pkg {
 		spec = "switcheroo-control.spec"
 	}
 	labels {
-		subrepo = "extras"
+		extra = 1
 	}
 }

anda/apps/switcheroo-control/update.rhai

@@ -1 +0,0 @@
-rpm.version(gitlab("gitlab.freedesktop.org", "4339"));

anda/apps/vencord-desktop/vencord-desktop.spec

@@ -6,7 +6,7 @@
 
 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.5
+Version:	1.5.4
 Release:	1%?dist
 License:	GPL-3.0
 Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed

anda/apps/voicevox/voicevox.spec

@@ -5,16 +5,16 @@
 %define __strip /bin/true
 
 # do not perform compression in cpio
-%define _source_payload w19.zstdio
+%define _source_payload w0.ufdio
 %define _binary_payload w19.zstdio
 
 # Exclude private libraries
-%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$
-%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:			voicevox
-Version:		0.23.0
-Release:		2%?dist
+Version:		0.22.3
+Release:		1%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
 URL:			https://voicevox.hiroshiba.jp
@@ -52,7 +52,7 @@ sed -i "s|Exec=.*|Exec=/usr/share/voicevox/VOICEVOX.AppImage|" squashfs-root/voi
 %install
 install -Dm755 VOICEVOX.AppImage %buildroot%_datadir/voicevox/VOICEVOX.AppImage
 install -Dm755 voicevox.sh %buildroot%_bindir/voicevox
-install -Dm644 squashfs-root%_iconsdir/hicolor/256x256/apps/voicevox.png %buildroot%_iconsdir/hicolor/256x256/apps/voicevox.png
+install -Dm644 squashfs-root%_iconsdir/hicolor/0x0/apps/voicevox.png %buildroot%_iconsdir/hicolor/256x256/apps/voicevox.png
 install -Dm644 squashfs-root/voicevox.desktop %buildroot%_datadir/applications/voicevox.desktop
 
 %files

anda/apps/youtube-music/anda.hcl

@@ -2,8 +2,4 @@ project pkg {
 	rpm {
 		spec = "youtube-music.spec"
 	}
-	
-	labels = {
-	    mock = 1
-	}
 }

anda/apps/youtube-music/youtube-music.desktop

@@ -5,6 +5,6 @@ TryExec=/usr/bin/youtube-music
 Icon=youtube-music
 Terminal=false
 Type=Application
-StartupWMClass=com.github.th_ch.youtube_music
+StartupWMClass=YouTube Music
 Comment=YouTube Music Desktop App - including custom plugins
 Categories=AudioVideo;

anda/apps/youtube-music/youtube-music.spec

@@ -1,19 +1,12 @@
 %define debug_package %nil
 
-# Exclude private libraries since this is bundled with electron
-%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$
-%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$
 
 # macro shorthand for calling pnpm
 %global pnpm npx pnpm@%{pnpm_version}
 
-# Try to vendor PNPM directly from Fedora
-# but if this fails, you can try setting this to 1 to vendor PNPM directly from upstream
-%global vendor_pnpm 1
-
 Name:           youtube-music
-Version:        3.7.5
-Release:        4%?dist
+Version:        3.7.1
+Release:        1%?dist
 Summary:        YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
 Source1:        youtube-music.desktop
 License:        MIT
@@ -28,14 +21,6 @@ BuildRequires:  git-core gcc make
 # Required for usocket native module built with node-gyp
 BuildRequires:  python3 gcc-c++
 
-%if !0%{?vendor_pnpm}
-BuildRequires:  pnpm nodejs20
-%endif
-
-Requires:       nss
-Requires:       libXext
-Requires:       libXfixes
-
 %description
 YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
 
@@ -50,11 +35,9 @@ git checkout v%{version}
 %build
 # Vendor PNPM directly instead of installing from packages, because we need to somehow force PNPM to use Node.js 20
 # We are not using Fedora's PNPM because we need to use `pnpm env`, which PNPM does not support when not vendored directly from upstream
-%if 0%{?vendor_pnpm}
 curl -fsSL https://get.pnpm.io/install.sh | sh -
-source $HOME/.bashrc
+source /builddir/.bashrc
 pnpm env use --global 20
-%endif
 pnpm install
 pnpm build
 pnpm electron-builder --linux --dir

anda/desktops/budgie/budgie-extras/0001-fix-weathershow-desktop-widget-icon-path.patch

@@ -0,0 +1,12 @@
+diff --color -ru budgie-extras-1.4.0/budgie-weathershow/src/desktop_weather/desktop_weather.vala budgie-extras-1.4.0-patched/budgie-weathershow/src/desktop_weather/desktop_weather.vala
+--- budgie-extras-1.4.0/budgie-weathershow/src/desktop_weather/desktop_weather.vala	2022-03-11 06:24:44.000000000 +0700
++++ budgie-extras-1.4.0-patched/budgie-weathershow/src/desktop_weather/desktop_weather.vala	2022-06-09 14:57:46.677283438 +0700
+@@ -308,7 +308,7 @@
+     private void get_icondata () {
+         // fetch the icon list
+         string icondir = "/".concat(
+-            "usr/lib/budgie-desktop/plugins",
++            "usr/lib64/budgie-desktop/plugins",
+             "/budgie-weathershow/weather_icons"
+         );
+         iconnames = {};

anda/desktops/budgie/budgie-extras/budgie-extras.spec

@@ -1,12 +1,13 @@
 Name:           budgie-extras
-Version:        1.9.0
-Release:        1%?dist
+Version:        1.8.0
+Release:        2%{?dist}
 
 License:        GPL-3.0
 Summary:        Additional Budgie Desktop enhancements for user experience
 URL:            https://ubuntubudgie.org/
 
 Source0:        https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz
+Patch0:         0001-fix-weathershow-desktop-widget-icon-path.patch
 
 BuildRequires:  rpm_macro(fdupes)
 BuildRequires:  cmake
@@ -276,7 +277,7 @@ workspaces.
 # Remove absolute symlink and replace with relative symlink
 rm -f %{buildroot}%{_bindir}/quickchar
 
-%fdupes %{buildroot}%{_datadir}/budgie-desktop/budgie-weathershow/weather_icons
+%fdupes %_libdir/budgie-desktop/plugins/budgie-weathershow/weather_icons
 
 %post
 
@@ -402,8 +403,6 @@ rm -f %{buildroot}%{_bindir}/quickchar
 
 %files -n budgie-applet-weathershow
 %{_libdir}/budgie-desktop/plugins/budgie-weathershow
-%{_datadir}/budgie-desktop/budgie-weathershow/cities
-%{_datadir}/budgie-desktop/budgie-weathershow/weather_icons/*
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.weathershow.gschema.xml
 %{_datadir}/pixmaps/budgie-wticon-symbolic.svg
 

anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec

@@ -13,7 +13,7 @@ BuildArch:      noarch
 Source0:        https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz
 Patch0:         https://github.com/fthx/appmenu-is-back/compare/v2..703a31acf900eb7bcab3462baeefa815ec7f13ab.patch
 
-Requires:       (gnome-shell >= 47~ with gnome-shell < 49~)
+Requires:       (gnome-shell >= 46~ with gnome-shell < 48~)
 Recommends:     gnome-extensions-app
 
 %description

anda/desktops/gnome/gnome-shell/anda.hcl

@@ -3,7 +3,6 @@ project pkg {
 		spec = "gnome-shell.spec"
 	}
 	labels {
-		subrepo = "extras"
-		updbranch = 1
+		extra = 1
 	}
 }

anda/desktops/gnome/gnome-shell/gnome-shell.spec

@@ -1,6 +1,6 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 %global major_version 47
-%global minor_version 3
+%global minor_version 1
 
 %if 0%{?rhel}
 %global portal_helper 0
@@ -8,15 +8,14 @@
 %global portal_helper 1
 %endif
 
-Name:           gnome-shell.switcheroo
+Name:           gnome-shell
 Version:        %{major_version}.%{minor_version}
-Release:        1%{?dist}.switcheroo
+Release:        %autorelease.switcheroo
 Summary:        Window management and application launching for GNOME
 
-Provides:       gnome-shell = %version-%release
 License:        GPL-2.0-or-later
 URL:            https://wiki.gnome.org/Projects/GnomeShell
-Source0:        https://download.gnome.org/sources/gnome-shell/%{major_version}/gnome-shell-%{tarball_version}.tar.xz
+Source0:        https://download.gnome.org/sources/gnome-shell/%{major_version}/%{name}-%{tarball_version}.tar.xz
 
 # Replace Epiphany with Firefox in the default favourite apps list
 Patch: gnome-shell-favourite-apps-firefox.patch
@@ -179,7 +178,7 @@ innovative user interface concepts to provide a visually attractive and
 easy to use experience.
 
 %prep
-%autosetup -S git -n gnome-shell-%{tarball_version}
+%autosetup -S git -n %{name}-%{tarball_version}
 
 %build
 %meson \
@@ -199,7 +198,7 @@ easy to use experience.
 mkdir -p %{buildroot}%{_datadir}/gnome-shell/extensions
 mkdir -p %{buildroot}%{_datadir}/gnome-shell/search-providers
 
-%find_lang gnome-shell
+%find_lang %{name}
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.desktop
@@ -209,7 +208,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Exten
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop
 %endif
 
-%files -f gnome-shell.lang
+%files -f %{name}.lang
 %license COPYING
 %doc NEWS README.md
 %{_bindir}/gnome-shell

anda/desktops/gnome/gnome-shell/update.rhai

@@ -1,25 +0,0 @@
-import "andax/bump_extras.rhai" as bump;
-
-let pkg = "gnome-shell";
-let branch = bump::as_bodhi_ver(labels.branch);
-
-let url = `https://bodhi.fedoraproject.org/updates/?search=${pkg}&status=stable&releases=${branch}&rows_per_page=10&page=1`;
-
-let done = false;
-
-for entry in get(url).json().updates {
-  for entry in entry.title.split(' ') {
-    let matches = find_all(`${pkg}-([\d.]+)-(\d+)\.[\w\d]+$`, entry);
-    if matches.len() == 0 { continue; }
-    let majminv = matches[0][1].split('.');
-    if majminv.len() != 2 {
-      print(`gnome-shell: ${matches[0][1]} has invalid version?`);
-      terminate();
-    }
-    rpm.global("major_version", majminv[0]);
-    rpm.global("minor_version", majminv[1]);
-    rpm.f = sub(`Release:(\s+)(.+?)\n`, "Release:${1}" + matches[0][2] + "%{?dist}.switcheroo\n", rpm.f);
-    done = true;
-  }
-  if done { break; }
-}

anda/desktops/kde/kf6-kio/anda.hcl

@@ -3,7 +3,6 @@ project pkg {
 		spec = "kf6-kio.spec"
 	}
 	labels {
-		subrepo = "extras"
-		updbranch = 1
+		extra = 1
 	}
 }

anda/desktops/kde/kf6-kio/kf6-kio.spec

@@ -1,11 +1,11 @@
 %global framework kio
 
 %global stable_kf6 stable
-%global majmin_ver_kf6 6.12
+%global majmin_ver_kf6 6.7
 
-Name:    kf6-%{framework}.switcheroo
+Name:    kf6-%{framework}
 Version: %{majmin_ver_kf6}.0
-Release: 1%{?dist}.switcheroo
+Release: 2%{?dist}.switcheroo
 Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction
 
 License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
@@ -28,7 +28,6 @@ Patch101: kio-no-help-protocol.patch
 # https://invent.kde.org/frameworks/kio/-/merge_requests/1556
 Patch201: 1556.patch
 
-Provides:       kf6-%{framework}
 BuildRequires:  extra-cmake-modules
 BuildRequires:  gcc-c++
 BuildRequires:  kf6-rpm-macros
@@ -99,7 +98,6 @@ Requires:       cmake(KF6Solid)
 Requires:       cmake(KF6XmlGui)
 Requires:       cmake(KF6WindowSystem)
 Requires:       qt6-qtbase-devel
-Provides:       kf6-kio-devel = %version-%release
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -108,8 +106,6 @@ developing applications that use %{name}.
 Summary:        Documentation files for %{name}
 Requires:       %{name}-core = %{version}-%{release}
 BuildArch:      noarch
-Provides:       kf6-kio-doc = %version-%release
-Obsoletes:      kf6-kio-doc <= %version-%release
 %description    doc
 Documentation for %{name}.
 
@@ -120,16 +116,12 @@ Requires:       %{name}-core-libs%{?_isa} = %{version}-%{release}
 Requires:       %{name}-doc = %{version}-%{release}
 Requires:       kf6-filesystem
 Recommends:     switcheroo-control
-Provides:       kf6-kio-core = %version-%release
-Obsoletes:      kf6-kio-core <= %version-%release
 %description    core
 KIOCore library provides core non-GUI components for working with KIO.
 
 %package        core-libs
 Summary:        Runtime libraries for KIO Core
 Requires:       %{name}-core%{?_isa} = %{version}-%{release}
-Provides:       kf6-kio-core-libs = %version-%release
-Obsoletes:      kf6-kio-core-libs <= %version-%release
 %description    core-libs
 %{summary}.
 
@@ -139,8 +131,6 @@ Summary:        Widgets for KIO Framework
 ## included here for completeness, even those -core already has a dependency.
 %{?kf6_kinit_requires}
 Requires:       %{name}-core%{?_isa} = %{version}-%{release}
-Provides:       kf6-kio-widgets = %version-%release
-Obsoletes:      kf6-kio-widgets <= %version-%release
 %description    widgets
 KIOWidgets contains classes that provide generic job control, progress
 reporting, etc.
@@ -148,16 +138,12 @@ reporting, etc.
 %package        widgets-libs
 Summary:        Runtime libraries for KIO Widgets library
 Requires:       %{name}-widgets%{?_isa} = %{version}-%{release}
-Provides:       kf6-kio-widgets-libs = %version-%release
-Obsoletes:      kf6-kio-widgets-libs <= %version-%release
 %description    widgets-libs
 %{summary}.
 
 %package        file-widgets
 Summary:        Widgets for file-handling for KIO Framework
 Requires:       %{name}-widgets%{?_isa} = %{version}-%{release}
-Provides:       kf6-kio-file-widgets = %version-%release
-Obsoletes:      kf6-kio-file-widgets <= %version-%release
 %description    file-widgets
 The KIOFileWidgets library provides the file selection dialog and
 its components.
@@ -165,16 +151,12 @@ its components.
 %package        gui
 Summary:        Gui components for the KIO Framework
 Requires:       %{name}-core%{?_isa} = %{version}-%{release}
-Provides:       kf6-kio-gui = %version-%release
-Obsoletes:      kf6-kio-gui <= %version-%release
 %description    gui
 %{summary}.
 
 %package        qch-doc
 Summary:        Developer Documentation files for %{name}
 BuildArch:      noarch
-Provides:       kf6-kio-qch-doc = %version-%release
-Obsoletes:      kf6-kio-qch-doc <= %version-%release
 %description    qch-doc
 Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 
@@ -190,7 +172,7 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 
 %install
 %cmake_install
-%find_lang kf6-kio --all-name --with-man --with-html
+%find_lang %{name} --all-name --with-man --with-html
 
 %files
 %license LICENSES/*.txt
@@ -205,7 +187,6 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 %{_kf6_plugindir}/kio/
 %{_kf6_plugindir}/kded/
 %{_kf6_plugindir}/kiod/
-%{_kf6_plugindir}/kio_dnd/
 %{_kf6_datadir}/kf6/searchproviders/*.desktop
 %{_kf6_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.kde.*.service
@@ -214,7 +195,7 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 %files core-libs
 %{_kf6_libdir}/libKF6KIOCore.so.*
 
-%files doc -f kf6-kio.lang
+%files doc -f %{name}.lang
 
 %files gui
 %{_kf6_libdir}/libKF6KIOGui.so.*
@@ -242,28 +223,6 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 %{_qt6_docdir}/*.qch
 
 %changelog
-* Fri Feb 07 2025 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.11.0-1
-- 6.11.0
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.10.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Tue Jan 07 2025 Steve Cossette <farchord@gmail.com> - 6.10.0-2
-- File Picker: Fix 'All supported files' for more than 3
- filters
-
-* Fri Jan 03 2025 Steve Cossette <farchord@gmail.com> - 6.10.0-1
-- 6.10.0
-
-* Sat Dec 14 2024 Steve Cossette <farchord@gmail.com> - 6.9.0-1
-- 6.9.0
-
-* Sat Nov 02 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.8.0-1
-- 6.8.0
-
-* Mon Oct 14 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-2
-- Rebuild (qt6)
-
 * Fri Oct 04 2024 Steve Cossette <farchord@gmail.com> - 6.7.0-1
 - 6.7.0
 

anda/desktops/kde/kf6-kio/update.rhai

@@ -1,16 +0,0 @@
-import "andax/bump_extras.rhai" as bump;
-
-let pkg = "kf6-kio";
-let branch = bump::as_bodhi_ver(labels.branch);
-
-let url = `https://bodhi.fedoraproject.org/updates/?search=${pkg}&status=stable&releases=${branch}&rows_per_page=1&page=1`;
-
-for entry in get(url).json().updates[0].title.split(' ') {
-  let matches = find_all(`${pkg}-([\d.]+)-(\d+)\.[\w\d]+$`, entry);
-  if matches.len() == 0 { continue; }
-  if matches[0][1].ends_with(".0") {
-    rpm.global("majmin_ver_kf6", matches[0][1][0..matches[0][1].len()-2]);
-    rpm.f = sub(`Release: (.+?)\n`, "Release: " + matches[0][2] + "%{?dist}.switcheroo\n", rpm.f);
-  }
-  break;
-}

anda/desktops/kde/latte-dock-nightly/anda.hcl

@@ -0,0 +1,8 @@
+project pkg {
+	rpm {
+		spec = "latte-dock-nightly.spec"
+	}
+	labels {
+		nightly = "1"
+	}
+}

anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec

@@ -0,0 +1,113 @@
+%global forgeurl https://github.com/KDE/latte-dock/
+
+%global commit f79594dd01d4ff4d7e86ac7bf70d1c371d6d9e4e
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date %(date '+%Y%m%d')
+%global snapshot_info %{commit_date}.%{shortcommit}
+
+Name:     latte-dock-nightly
+Version:  0.10.0^%{snapshot_info}
+
+%forgemeta
+Release:  1%?dist
+Summary:  Latte is a dock based on plasma frameworks
+License:  GPL-2.0-or-later
+
+URL:      %{forgeurl}
+Source0:  https://github.com/KDE/latte-dock/archive/%{commit}.tar.gz
+
+BuildRequires:  libxcb-devel
+BuildRequires:  xcb-util-devel
+BuildRequires:  libSM-devel
+BuildRequires:  extra-cmake-modules
+BuildRequires:  qt5-qtx11extras-devel
+BuildRequires:  kf5-karchive-devel
+BuildRequires:  kf5-kio-devel
+BuildRequires:  kf5-kirigami2-devel
+BuildRequires:  kf5-kactivities-devel
+BuildRequires:  kf5-kcoreaddons-devel
+BuildRequires:  kf5-kdbusaddons-devel
+BuildRequires:  kf5-kdeclarative-devel
+BuildRequires:  kf5-knewstuff-devel
+BuildRequires:  kf5-knotifications-devel
+BuildRequires:  kf5-kiconthemes-devel
+BuildRequires:  kf5-kitemmodels-devel
+BuildRequires:  kf5-ki18n-devel
+BuildRequires:  kf5-kpackage-devel
+BuildRequires:  kf5-plasma-devel
+BuildRequires:  kf5-kwayland-devel
+BuildRequires:  kf5-kwindowsystem-devel
+BuildRequires:  kf5-kxmlgui-devel
+BuildRequires:  kf5-kglobalaccel-devel
+BuildRequires:  kf5-kguiaddons-devel
+BuildRequires:  kf5-kcrash-devel
+BuildRequires:  qt5-qtwayland-devel
+BuildRequires:  plasma-wayland-protocols-devel
+BuildRequires:  wayland-devel
+BuildRequires:  plasma-workspace-devel
+
+Recommends:     %{name}-lang
+
+Conflicts:      latte-dock
+Provides:       latte-dock = 0.10.0^%{snapshot_info}
+Provides:       latte-dock%{?_isa} = 0.10.0^%{snapshot_info}
+
+%description
+Latte is a dock based on plasma frameworks that provides an elegant and
+intuitive experience for your tasks and plasmoids. It animates its contents by
+using parabolic zoom effect and tries to be there only when it is needed.
+
+"Art in Coffee"
+
+%package lang
+Summary: Translation files for latte-dock
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+%description lang
+%{summary}.
+
+%prep
+%{forgesetup}
+%autosetup -n %{archivename}
+
+%build
+%cmake_kf5 \
+  -Wno-dev
+
+%cmake_build
+%install
+
+%cmake_install
+%find_lang %{name} --all-name
+
+%files
+%doc README.md
+%license LICENSES/*
+%{_bindir}/latte-dock
+%{_datadir}/metainfo/org.kde.latte-dock.appdata.xml
+%{_datadir}/metainfo/org.kde.latte.plasmoid.appdata.xml
+%{_datadir}/metainfo/org.kde.latte.shell.appdata.xml
+%{_kf5_datadir}/applications/org.kde.latte-dock.desktop
+%{_kf5_datadir}/dbus-1/interfaces/org.kde.LatteDock.xml
+%{_kf5_datadir}/icons/breeze/*/*/*
+%{_kf5_datadir}/icons/hicolor/*/*/*
+%{_kf5_datadir}/knotifications5/lattedock.notifyrc
+%{_kf5_datadir}/kservicetypes5/latte-indicator.desktop
+%{_kf5_datadir}/plasma/plasmoids/org.kde.latte.plasmoid/
+%{_kf5_datadir}/plasma/plasmoids/org.kde.latte.containment/
+%{_kf5_datadir}/plasma/shells/org.kde.latte.shell/
+%{_kf5_datadir}/latte
+%{_kf5_datadir}/knsrcfiles/latte-indicators.knsrc
+%{_kf5_datadir}/knsrcfiles/latte-layouts.knsrc
+%{_kf5_qmldir}/org/kde/latte
+%{_qt5_plugindir}/kpackage/packagestructure/latte_indicator.so
+%{_qt5_plugindir}/plasma/containmentactions/plasma_containmentactions_lattecontextmenu.so
+
+%files lang -f %{name}.lang
+
+%changelog
+* Sun Dec 25 2022 lleyton <lleyton@fyralabs.com> - 0.10.0^20221226.93c50a7-1
+- Comply with packaging policy
+* Sun Dec 25 2022 windowsboy111 <windowsboy111@fyralabs.com> - 0.10.9-1
+- Initial package
+

anda/desktops/kde/latte-dock-nightly/update.rhai

@@ -0,0 +1,7 @@
+if filters.contains("nightly") {
+	let req = new_req("https://api.github.com/repos/KDE/latte-dock/commits/HEAD");
+	req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
+	let sha = json(req.get()).sha;
+	rpm.global("commit", sha);
+	rpm.release();
+}

anda/desktops/lomiri-unity/lomiri-api/lomiri-api.spec

@@ -3,8 +3,8 @@
 %forgemeta
 
 Name:          lomiri-api
-Version:       0.2.2
-Release:       1%?dist
+Version:       0.2.1
+Release:       2%{?dist}
 Summary:       API for Lomiri
 
 License:       LGPL-3.0-or-later

anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec

@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit 3a0dacbbf99b45b67c39bb92449235c576cbf05a
+%global commit a057a37b56b96efddc7f42577407a3a08a0575cf
 %forgemeta
 
 Name:           lomiri-app-launch
-Version:        0.1.11
-Release:        1%?dist
+Version:        0.1.9
+Release:        1%{?dist}
 Summary:        Provides the Lomiri App Launch user space daemon
 License:        GPL-3.0
 URL:            https://gitlab.com/ubports/development/core/lomiri-app-launch

anda/desktops/lomiri-unity/lomiri-indicator-network/lomiri-indicator-network.spec

@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-indicator-network
-%global commit 8393f80825de7447a5567a90d3725b469fae471b
+%global commit a4522caf548d7e7f63f98f9e5c98314ee8d4c8fb
 %forgemeta
 
 Name:       lomiri-indicator-network
-Version:    1.1.0
-Release:    1%?dist
+Version:    1.0.2
+Release:    1%{?dist}
 Summary:    The Network indicator for Ubuntu Touch
 License:    GPL-3.0 AND LGPL-3.0
 URL:        https://gitlab.com/ubports/development/core/lomiri-indicator-network

anda/desktops/lomiri-unity/lomiri-schemas/lomiri-schemas.spec

@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas
-%global commit 4a74eca0e4dcb745521abf20f975854cc3478a70
+%global commit 0f3990afa510bc2b4af2cb198a23853e5bb3f068
 %forgemeta
 
 Name:       lomiri-schemas
-Version:    0.1.7
+Version:    0.1.6
 Release:    1%?dist
 Summary:    Configuration schemas for lomiri
 License:    LGPL-2.0-or-later

anda/desktops/lomiri-unity/lomiri-settings-components/lomiri-settings-components.spec

@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-settings-components
-%global commit 8be505f0a54e9803adcaa20fefe334b3c3b7d4e7
+%global commit 2bd84b9a59563dce7a791e0c882e2533ecdd4812
 %forgemeta
 
 Name:       lomiri-settings-components
-Version:    1.1.2
-Release:    1%?dist
+Version:    1.1.1
+Release:    1%{?dist}
 Summary:    The system settings components for Lomiri
 License:    GPLv3 AND LGPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-settings-components

anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec

@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit dfc840a2a4e0b0379b40cb6ec9309c5437c79d19
+%global commit b76a186705dcd4df15a941649c9de8586cf316bc
 %forgemeta
 
 Name:       lomiri-system-settings
-Version:    1.3.0
+Version:    1.2.0
 Release:    1%?dist
 Summary:    The system settings application for Lomiri
 License:    GPLv3

anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec

@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
-%global commit 4111d119b21d58754f8b4bcaa7665cab7263be00
+%global commit 8f490672f9853278b0aec6435a68d56b9eaf8207
 %forgemeta
 
 Name:           lomiri-ui-toolkit
-Version:        1.3.5110
+Version:        1.3.5100
 Release:        1%?dist
 Summary:        QML components to ease the creation of beautiful applications in QML for Lomiri
 

anda/desktops/lomiri-unity/unity-session/unity-session.spec

@@ -1,8 +1,8 @@
-%define _ubuntu_rel 2ubuntu2
+%define _ubuntu_rel 8ubuntu1
 
 Name:    unity-session
 Summary: Lightdm profile for Unity 7
-Version: 47.0.1
+Version: 46.0
 Release: 1%?dist
 
 License:   GPL-2.0

anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec

@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-datetime
 Summary:    A GTK implementation of the StatusNotifierItem Specification
-Version:    24.5.1
+Version:    24.5.0
 Release:    1%?dist
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-datetime

anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec

@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-messages
 Summary:    Ayatana Indicator Messages Applet
-Version:    24.5.1
+Version:    24.5.0
 Release:    1%?dist
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-messages

anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec

@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-sound
 Summary:    Ayatana Indicator Sound Applet
-Version:    24.5.2
+Version:    24.5.1
 Release:    1%?dist
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-sound

anda/desktops/mwc/anda.hcl

@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-    spec = "mwc.spec"
-  }
-  labels {
-    nightly = 1
-  }
-}

anda/desktops/mwc/mwc.spec

@@ -1,69 +0,0 @@
-%global commit 33b49684edb7a8ac65bbca4d7378959208fbe604
-%global commit_date 20250317
-%global shortcommit %{sub %{commit} 1 7 }
-%global ver 0.1.3
-
-Name:           mwc
-Version:        %{ver}^%{commit_date}git.%{shortcommit}
-Release:        1%{?dist}
-Summary:        Tiling Wayland compositor based on wlroots and scenefx
-
-License:        MIT
-URL:            https://github.com/dqrk0jeste/mwc
-Source0:        %{url}/archive/%{commit}.tar.gz
-
-BuildRequires:  meson
-BuildRequires:  gcc
-BuildRequires:  pkgconfig(libinput)
-BuildRequires:  pkgconfig(scenefx-0.2)
-BuildRequires:  pkgconfig(wlroots-0.18)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  wayland-devel
-
-Requires:       libdrm
-Requires:       libinput
-Requires:       libxkbcommon
-Requires:       pixman
-Requires:       wayland-devel
-Requires:       wlroots
-Requires:       xdg-desktop-portal-wlr
-
-Recommends:     waybar kitty rofi-wayland
-
-Packager:       sadlerm <lerm@chromebooks.lol>
-
-Provides:       owl = %{version}-%{release}
-Obsoletes:      owl < 0^20250124.9999999
-
-%description
-%{summary}.
-
-%prep
-%autosetup -n %{name}-%{commit}
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-install -Dm644 examples/example.conf %{buildroot}%{_datadir}/%{name}/example.conf
-
-%files
-%license LICENSE
-%doc README.md
-%{_bindir}/%{name}
-%{_bindir}/%{name}-ipc
-%{_datadir}/%{name}/default.conf
-%{_datadir}/%{name}/example.conf
-%{_datadir}/wayland-sessions/%{name}.desktop
-%{_datadir}/xdg-desktop-portal/%{name}-portals.conf
-
-
-%changelog
-* Thu Feb 27 2025 sadlerm <lerm@chromebooks.lol>
-- New upstream name
-- Package is now built with meson
-* Fri Jan 31 2025 sadlerm <lerm@chromebooks.lol>
-- Initial package

anda/desktops/mwc/update.rhai

@@ -1,9 +0,0 @@
-if filters.contains("nightly") {
-    rpm.global("commit", gh_commit("dqrk0jeste/mwc"));
-    let v = gh("dqrk0jeste/mwc");
-    if rpm.changed() {
-        rpm.global("commit_date", date());
-        v.crop(1);
-        rpm.global("ver", v);
-    }
-}

anda/desktops/sddm/0001-Delay-for-logind-and-fallback-to-seat0.patch

@@ -0,0 +1,142 @@
+From 4d44531c8f624f5b479c3ff23e8fecc67eb848ab Mon Sep 17 00:00:00 2001
+From: Jeremy Linton <jeremy.linton@arm.com>
+Date: Fri, 22 Oct 2021 14:51:54 -0500
+Subject: [PATCH] Delay for logind, and fallback to seat0
+
+There is systemd/logind race with when restarting
+sddm that causes logind1 not to be available. Previously
+this meant the seat0 was immediately created regardless
+of the state of CanGraphical.
+
+Fixing this, though we still want seat0 to be started
+if none of the seats appear to be graphical. Presumably
+there are some graphics on the machine, otherwise
+why run sddm? Wait a bit, and create seat0 anyway. If
+this fails the output from Xorg should tell us why. This
+is generally a better strategy than what happens a good
+amount of time now, where sddm is started and silent about
+why the screen is blank.
+
+References:
+* https://bugzilla.redhat.com/2011991
+* https://bugzilla.redhat.com/2016310
+
+Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
+---
+ src/daemon/LogindDBusTypes.cpp | 31 +++++++++++++++++++++----------
+ src/daemon/SeatManager.cpp     | 22 ++++++++++++++++++++++
+ src/daemon/SeatManager.h       |  1 +
+ 3 files changed, 44 insertions(+), 10 deletions(-)
+
+diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
+index 011bb7f..6255c69 100644
+--- a/src/daemon/LogindDBusTypes.cpp
++++ b/src/daemon/LogindDBusTypes.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include <QDebug>
+ 
++#include <unistd.h>
++
+ class LogindPathInternal {
+ public:
+     LogindPathInternal();
+@@ -46,17 +48,26 @@ LogindPathInternal::LogindPathInternal()
+     qRegisterMetaType<UserInfoList>("UserInfoList");
+     qDBusRegisterMetaType<UserInfoList>();
+ 
+-    if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
+-        qDebug() << "Logind interface found";
+-        available = true;
+-        serviceName = QStringLiteral("org.freedesktop.login1");
+-        managerPath = QStringLiteral("/org/freedesktop/login1");
+-        managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
+-        seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
+-        sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
+-        userIfaceName = QStringLiteral("org.freedesktop.login1.User");
+-        return;
++#ifdef HAVE_SYSTEMD
++    // systemd-logind should be running, although because it takes a few moments to restart after
++    // systemctl isolate calls, it may not yet be running. Wait a few seconds for it, while blocking everything else.
++    int logind_wait_seconds = 50;
++    while (logind_wait_seconds--) {
++        if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
++            qDebug() << "Logind interface found";
++            available = true;
++            serviceName = QStringLiteral("org.freedesktop.login1");
++            managerPath = QStringLiteral("/org/freedesktop/login1");
++            managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
++            seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
++            sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
++            userIfaceName = QStringLiteral("org.freedesktop.login1.User");
++            return;
++        }
++	qDebug() << "Sleeping for systemd-logind";
++	usleep(100000);
+     }
++#endif
+ 
+     if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
+         qDebug() << "Console kit interface found";
+diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp
+index bd207e6..39d8b85 100644
+--- a/src/daemon/SeatManager.cpp
++++ b/src/daemon/SeatManager.cpp
+@@ -26,6 +26,9 @@
+ #include <QDBusMessage>
+ #include <QDBusPendingReply>
+ #include <QDBusContext>
++#include <QDebug>
++#include <QFileInfo>
++#include <QTimer>
+ 
+ #include "LogindDBusTypes.h"
+ 
+@@ -115,6 +118,8 @@ namespace SDDM {
+ 
+         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatNew"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath)));
+         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath)));
++
++	QTimer::singleShot(5000, this, &SeatManager::checkSeat);
+     }
+ 
+     void SeatManager::createSeat(const QString &name) {
+@@ -152,6 +157,23 @@ namespace SDDM {
+         m_seats.value(name)->createDisplay(Display::defaultDisplayServerType());
+     }
+ 
++    // this is a bit hacky, but linux DRM drivers
++    // won't initially be available so there is a race
++    // between determing if a efifb/etc graphical object
++    // is the only graphics on the machine, or a DRM driver
++    // will take over the display. So we will hang out for a few
++    // seconds and if none of the seats are declared cangraphical
++    // its possible the only graphics on the machine don't have
++    // a drm driver.
++    void SeatManager::checkSeat(void) {
++        if (m_seats.isEmpty()) {
++	     //if (QFileInfo::exists(QStringLiteral("/dev/fb0"))) {
++                 qWarning() << "No graphical seats found, attempt to start one on the main console anyway...";
++                 createSeat(QStringLiteral("seat0"));
++	     //}
++        }
++    }
++
+     void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath)
+     {
+         auto logindSeat = new LogindSeat(name, objectPath);
+diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h
+index b2f9796..aa43047 100644
+--- a/src/daemon/SeatManager.h
++++ b/src/daemon/SeatManager.h
+@@ -49,6 +49,7 @@ namespace SDDM {
+     private:
+         QHash<QString, Seat *> m_seats; //these will exist only for graphical seats
+         QHash<QString, LogindSeat*> m_systemSeats; //these will exist for all seats
++        void checkSeat(void);
+     };
+ }
+ 
+-- 
+2.39.2
+

anda/desktops/sddm/README.scripts

@@ -0,0 +1,2 @@
+This scripts dir contains only samples, but are generally not used directly.
+In practice, sddm runtime uses items under /etc/sddm by default

anda/desktops/sddm/anda.hcl

@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "terra-sddm.spec"
+  }
+}

anda/desktops/sddm/sddm-0.18.0-environment_file.patch

@@ -0,0 +1,11 @@
+diff -up sddm-0.18.0/services/sddm.service.in.env sddm-0.18.0/services/sddm.service.in
+--- sddm-0.18.0/services/sddm.service.in.env	2018-07-18 05:31:40.000000000 -0500
++++ sddm-0.18.0/services/sddm.service.in	2019-03-14 08:23:22.095498405 -0500
+@@ -7,6 +7,7 @@ After=systemd-user-sessions.service gett
+ [Service]
+ ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
+ Restart=always
++EnvironmentFile=-/etc/sysconfig/sddm
+ 
+ [Install]
+ Alias=display-manager.service

anda/desktops/sddm/sddm-0.20.0-fedora_config.patch

@@ -0,0 +1,53 @@
+diff --git a/src/common/Configuration.h b/src/common/Configuration.h
+index 54bcace..9b8fa22 100644
+--- a/src/common/Configuration.h
++++ b/src/common/Configuration.h
+@@ -37,9 +37,8 @@ namespace SDDM {
+         enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
+ 
+         //  Name                   Type         Default value                                   Description
+-        // TODO: Change default to x11-user in a future release
+-        Entry(DisplayServer,       QString,     _S("x11"),                                      _S("Which display server should be used.\n"
+-                                                                                                   "Valid values are: x11, x11-user, wayland. Wayland support is experimental"));
++        Entry(DisplayServer,       QString,     _S("wayland"),                                  _S("Which display server should be used.\n"
++                                                                                                   "Valid values are: x11, x11-user, wayland."));
+         Entry(HaltCommand,         QString,     _S(HALT_COMMAND),                               _S("Halt command"));
+         Entry(RebootCommand,       QString,     _S(REBOOT_COMMAND),                             _S("Reboot command"));
+         Entry(Numlock,             NumState,    NUM_NONE,                                       _S("Initial NumLock state. Can be on, off or none.\n"
+@@ -51,7 +50,7 @@ namespace SDDM {
+         //  Name   Entries (but it's a regular class again)
+         Section(Theme,
+             Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
+-            Entry(Current,             QString,     _S(""),                                     _S("Current theme name"));
++            Entry(Current,             QString,     _S("01-breeze-fedora"),                     _S("Current theme name"));
+             Entry(FacesDir,            QString,     _S(DATA_INSTALL_DIR "/faces"),              _S("Global directory for user avatars\n"
+                                                                                                    "The files should be named <username>.face.icon"));
+             Entry(CursorTheme,         QString,     QString(),                                  _S("Cursor theme used in the greeter"));
+@@ -71,9 +70,9 @@ namespace SDDM {
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/xsessions"),
+                                                      _S("/usr/share/xsessions")},               _S("Comma-separated list of directories containing available X sessions"));
+             Entry(SessionCommand,      QString,     _S(SESSION_COMMAND),                        _S("Path to a script to execute when starting the desktop session"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/xorg-session.log"),   _S("Path to the user session log file"));
+-            Entry(DisplayCommand,      QString,     _S(DATA_INSTALL_DIR "/scripts/Xsetup"),     _S("Path to a script to execute when starting the display server"));
+-            Entry(DisplayStopCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xstop"),      _S("Path to a script to execute when stopping the display server"));
++            Entry(SessionLogFile,      QString,     _S(".cache/xsession-errors"),               _S("Path to the user session log file"));
++            Entry(DisplayCommand,      QString,     _S(SYS_CONFIG_DIR "/sddm/Xsetup"),          _S("Path to a script to execute when starting the display server"));
++            Entry(DisplayStopCommand,  QString,     _S(SYS_CONFIG_DIR "/sddm/Xstop"),           _S("Path to a script to execute when stopping the display server"));
+             Entry(EnableHiDPI,         bool,        true,                                      _S("Enable Qt's automatic high-DPI scaling"));
+         );
+ 
+@@ -82,12 +81,12 @@ namespace SDDM {
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/wayland-sessions"),
+                                                      _S("/usr/share/wayland-sessions")},        _S("Comma-separated list of directories containing available Wayland sessions"));
+             Entry(SessionCommand,      QString,     _S(WAYLAND_SESSION_COMMAND),                _S("Path to a script to execute when starting the desktop session"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
++            Entry(SessionLogFile,      QString,     _S(".cache/wayland-errors"),                _S("Path to the user session log file"));
+             Entry(EnableHiDPI,         bool,        true,                                       _S("Enable Qt's automatic high-DPI scaling"));
+         );
+ 
+         Section(Users,
+-            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin"),         _S("Default $PATH for logged in users"));
++            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"), _S("Default $PATH for logged in users"));
+             Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
+             Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
+             Entry(HideUsers,           QStringList, QStringList(),                              _S("Comma-separated list of users that should not be listed"));

anda/desktops/sddm/sddm-0.21.0-qt6greeter.patch

@@ -0,0 +1,67 @@
+From 52175648f4e1b415f93b24a3ef970983024659f2 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <neal@gompa.dev>
+Date: Wed, 28 Feb 2024 16:47:16 -0500
+Subject: [PATCH] Default to Qt6 and always use versioned greeters
+
+Distributors can handle creating an unversioned name if necessary.
+---
+ src/common/ThemeMetadata.cpp | 4 ++--
+ src/daemon/Greeter.cpp       | 3 +--
+ src/greeter/CMakeLists.txt   | 9 +--------
+ 3 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/src/common/ThemeMetadata.cpp b/src/common/ThemeMetadata.cpp
+index 2cb3762..003056a 100644
+--- a/src/common/ThemeMetadata.cpp
++++ b/src/common/ThemeMetadata.cpp
+@@ -28,7 +28,7 @@ namespace SDDM {
+         QString mainScript { QStringLiteral("Main.qml") };
+         QString configFile;
+         QString translationsDirectory { QStringLiteral(".") };
+-        int qtVersion = 5;
++        int qtVersion = 6;
+     };
+ 
+     ThemeMetadata::ThemeMetadata(const QString &path, QObject *parent) : QObject(parent), d(new ThemeMetadataPrivate()) {
+@@ -61,6 +61,6 @@ namespace SDDM {
+         d->mainScript = settings.value(QStringLiteral("SddmGreeterTheme/MainScript"), QStringLiteral("Main.qml")).toString();
+         d->configFile = settings.value(QStringLiteral("SddmGreeterTheme/ConfigFile"), QStringLiteral("theme.conf")).toString();
+         d->translationsDirectory = settings.value(QStringLiteral("SddmGreeterTheme/TranslationsDirectory"), QStringLiteral(".")).toString();
+-        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 5).toInt();
++        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 6).toInt();
+     }
+ }
+diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
+index 07fccde..5a956b6 100644
+--- a/src/daemon/Greeter.cpp
++++ b/src/daemon/Greeter.cpp
+@@ -82,8 +82,7 @@ namespace SDDM {
+ 
+     QString Greeter::greeterPathForQt(int qtVersion)
+     {
+-        const QString suffix = qtVersion == 5 ? QString() : QStringLiteral("-qt%1").arg(qtVersion);
+-        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter%1").arg(suffix);
++        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter-qt%1").arg(qtVersion);
+     }
+ 
+     bool Greeter::start() {
+diff --git a/src/greeter/CMakeLists.txt b/src/greeter/CMakeLists.txt
+index 72769e4..524368d 100644
+--- a/src/greeter/CMakeLists.txt
++++ b/src/greeter/CMakeLists.txt
+@@ -1,11 +1,4 @@
+-if(QT_MAJOR_VERSION EQUAL "5")
+-    # Keep the unversioned name for Qt5. When upgrading SDDM, the old daemon
+-    # might still be running and only know about "sddm-greeter". Keeping the
+-    # previous name around also helps users calling it directly.
+-    set(GREETER_TARGET sddm-greeter)
+-else()
+-    set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
+-endif()
++set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
+ 
+ message(STATUS "Building greeter for Qt ${QT_MAJOR_VERSION} as ${GREETER_TARGET}")
+ 
+-- 
+2.43.0
+