remove python-mpv

add python-mpv-jsonrpc and jellyfin apiclient
Update anda/apps/jellyfin-mpv-shim/update.rhai
2026-05-31 09:01:55 +00:00 · 2023-12-17 16:56:22 +07:00 · 2023-12-17 16:54:22 +07:00 · 2023-12-17 16:30:38 +07:00 · 2023-12-17 16:26:18 +07:00 · 2023-12-17 16:23:25 +07:00
523 changed files with 6089 additions and 836 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f38
+      - f39
  pull_request:
    branches:
-      - f38
+      - f39
  merge_group:
    branches:
-      - f38
+      - f39
  workflow_dispatch:
  workflow_call:

@@ -23,7 +23,7 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f39
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,11 +40,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["38"]
+        version: ["39"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -59,14 +59,14 @@ jobs:
        uses: actions/cache@v3
        with:
          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
+          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}

      - name: Include custom build template instead of package default
        run: |
-          cp -v anda/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -78,7 +78,9 @@ jobs:
      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          path: anda-build/rpm/rpms/*
+          path: |
+            anda-build/rpm/rpms/*
+            anda-build/rpm/srpm/*

      - name: Upload packages to subatomic
        if: github.event_name == 'push'
@@ -88,69 +90,17 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*

+      - name: Upload source packages to subatomic
+        if: github.event_name == 'push'
+        run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
+
      - name: Notify Madoguchi (Success)
        if: success() && github.event_name == 'push'
        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
        if: ( cancelled() || failure() ) && github.event_name == 'push'
        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
-
-      - name: Lint RPMs and SRPMs
-        id: lint
-        if: success()
-        run: |
-          echo 'LINT_ERR=false' >> $GITHUB_ENV
-          rpmlint anda-build/ > rpmlint.txt || f=1
-          if [[ $f -eq 1 ]]; then
-            EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-            echo "ESC_LINT_OUT<<$EOF" >> $GITHUB_ENV
-            cat rpmlint.txt | sed 's/`/\\`/g' | sed 's/"/\"/g' >> $GITHUB_ENV
-            echo $EOF >> $GITHUB_ENV
-            echo "lint_out<<$EOF" >> $GITHUB_ENV
-            echo '```' >> $GITHUB_ENV
-            cat rpmlint.txt >> $GITHUB_ENV
-            echo '```' >> $GITHUB_ENV
-            echo $EOF >> $GITHUB_ENV
-            echo 'LINT_ERR=true' >> $GITHUB_ENV
-          fi
-
-      - name: Try to install package
-        id: dnf
-        if: success()
-        run: |
-          echo 'INSTALL_ERR=false' >> $GITHUB_ENV
-          touch out
-          for f in anda-build/rpm/rpms/*.rpm; do
-            dnf in --downloadonly -y $f > $f.dnfout.txt 2>&1 || fail=1
-            if [[ $fail -eq 1 ]]; then
-              echo "### $f" >> out
-              echo '```' >> out
-              cat $f.dnfout.txt >> out
-              echo '```' >> out
-              echo >> out
-              echo 'INSTALL_ERR=true' >> $GITHUB_ENV
-            fi
-          done
-          cat out
-          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-          echo "ESC_DNF_OUT<<$EOF" >> $GITHUB_ENV
-          cat out | sed 's/`/\\`/g' | sed 's/"/\"/g' >> $GITHUB_ENV
-          echo $EOF >> $GITHUB_ENV
-          echo "dnf_out<<$EOF" >> $GITHUB_ENV
-          cat out >> $GITHUB_ENV
-          echo $EOF >> $GITHUB_ENV
-
-      - name: Generate RPMLint/DNF summary
-        if: success()
-        run: |
-          # Remind me to make all of this not weird later ~ lleyton
-
-          if [[ $LINT_ERR == "true" ]]; then
-            echo -e "## ❌ Lint: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY
-            echo -e "```\n${{ env.ESC_LINT_OUT }}\n```\n" >> $GITHUB_STEP_SUMMARY
-          fi
-
-          if [[ $INSTALL_ERR == "true" ]]; then
-            echo -e "## ❌ DNF: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY
-            echo "${{ env.ESC_DNF_OUT }}" >> $GITHUB_STEP_SUMMARY
-          fi
@@ -7,71 +7,55 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["38"]
+        version: ["39"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: fedora:38
+      image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: "^1.19"
-
      - name: Install repositories
-        run: |
-          sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
-          sudo dnf install -y mock createrepo_c rpm-build gcc curl wget git-core openssl-devel
+        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel cargo podman fuse-overlayfs

-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
      - name: Install Anda
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: anda
-
+        run: cargo install anda

      - uses: actions/checkout@v3
        with:
-          ref: f${{ matrix.version} }}
+          ref: f${{ matrix.version }}
          fetch-depth: 1
      - name: Build terra-mock-configs
        run: |
+          echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV
+          export PATH=$PATH:/github/home/.cargo/bin
          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/mock-configs/pkg -p rpm
+          anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/terra/mock-configs/pkg -p rpm
      - name: Install terra-mock-configs
-        run: sudo dnf install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
+        run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
+
+      - name: Build anda-srpm-macros
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/terra/srpm-macros/pkg

-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/subatomic
-          set-safe-directory: true
-          fetch-depth: 1
-      
      - name: Build Subatomic
-        run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} subatomic -p rpm -D "autogitcommit $(git log -1 --format='%H')"
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/subatomic/pkg
      - name: Install Subatomic
-        run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm
-
-
-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/anda
-          fetch-depth: 1
+        run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm

      - name: Build Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda -p rpm
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg

-
-      - name: Upload to Subatomic
+      - name: Upload packages to subatomic
        run: |
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*
+
+      - name: Upload source packages to subatomic
+        if: github.event_name == 'push'
+        run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
@@ -21,12 +21,12 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["38"]
+        version: ["39"]
        arch: ["x86_64", "aarch64"]
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -44,7 +44,7 @@ jobs:
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}

      - name: Build with Andaman
-        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg
+        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -56,7 +56,9 @@ jobs:
      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          path: anda-build/rpm/rpms/*
+          path: |
+            anda-build/rpm/rpms/*
+            anda-build/rpm/srpm/*

      - name: Upload packages to subatomic
        run: |
@@ -65,9 +67,17 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*

+      - name: Upload source packages to subatomic
+        if: github.event_name == 'push'
+        run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
+
      - name: Notify Madoguchi (Success)
-        if: success() && github.event_name == 'push'
+        if: success()
        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
-        if: ( cancelled() || failure() ) && github.event_name == 'push'
+        if: cancelled() || failure()
        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -11,11 +11,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["38"]
+        version: ["39"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -33,7 +33,7 @@ jobs:
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -45,7 +45,9 @@ jobs:
      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          path: anda-build/rpm/rpms/*
+          path: |
+            anda-build/rpm/rpms/*
+            anda-build/rpm/srpm/*

      - name: Upload packages to subatomic
        run: |
@@ -54,9 +56,17 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*

+      - name: Upload source packages to subatomic
+        if: github.event_name == 'push'
+        run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
+
      - name: Notify Madoguchi (Success)
-        if: success() && github.event_name == 'push'
+        if: success()
        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
-        if: ( cancelled() || failure() ) && github.event_name == 'push'
+        if: cancelled() || failure()
        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -3,18 +3,18 @@ name: Lint
 on:
  push:
    branches:
-      - f38
+      - f39
  pull_request:
    branches:
-      - f38
+      - f39
  merge_group:
    branches:
-      - f38
+      - f39
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f39
    steps:
      - name: Checkout repository
        uses: actions/checkout@v3
@@ -3,6 +3,7 @@ name: Push comps updates
 on:
  push:
    branches:
+      - f39
      - f38
      - f37
    paths:
@@ -13,7 +14,7 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f39
    steps:
      - uses: actions/checkout@v3
      - name: Push to subatomic
@@ -1,14 +1,14 @@
 name: Update
 on:
  schedule:
-    - cron: "*/30 * * * *"
+    - cron: "*/10 * * * *"
  workflow_dispatch:

 jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f39
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -26,7 +26,7 @@ jobs:
      - name: Run Update
        run: anda update -vv
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full

      - name: Save
@@ -39,13 +39,15 @@ jobs:
            git config user.signingkey "${{ runner.temp }}/signing_key"
            msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
            git commit -S -a -m "$msg"
-            f37 () {
+            copy_over () {
              git format-patch HEAD^
-              git checkout f37
+              git checkout $1
              git apply *.patch || true
+              rm *.patch
              git add *
              git commit -S -a -m "$msg"
            }
-            f37 || true
+            copy_over f37 || true
+            copy_over f38 || true
            git push -u origin --all
          fi
@@ -1,7 +1,7 @@
 # Terra Sources

-[![Repository status](https://repology.org/badge/repository-big/terra_37.svg?header=Terra+37)](https://repology.org/repository/terra_37)
 [![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38)
+[![Repository status](https://repology.org/badge/repository-big/terra_39.svg?header=Terra+39)](https://repology.org/repository/terra_39)

 Terra is a rolling-release Fedora repository for all the software you need.
 With Terra, you can install the latest packages knowing that quality and security are assured.
@@ -12,6 +12,7 @@ This monorepo contains the package manifests for all packages in Terra.
 ```bash
 sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 ```
+You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is.

 ## Documentation
 Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/). Alternatively, the GitHub Wiki contains older versions of the documentations.
@@ -1,13 +1,14 @@
 Name:			anki-bin
-Version:		2.1.65
+Version:		23.10.1
 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-installer python3.11 rpm_macro(fdupes)
-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
-Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress
+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
 Source0:		https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
@@ -52,5 +53,8 @@ install -Dm644 %{SOURCE6} "%{buildroot}/%{_datadir}/doc/%{name}/README.md"
 /usr/share/pixmaps/anki.png

 %changelog
+* Fri Nov 10 2023 hazel-bunny <dabiswas112@gmail.com> - 23.10-2
+- Add python3-orjson and mpv as dependencies
+
 * Wed Jan 11 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.1.60
 - Initial package
@@ -1,20 +1,20 @@
-diff -uNr anki-2.1.55.old/qt/aqt/qt/__init__.py anki-2.1.55/qt/aqt/qt/__init__.py
--- anki-2.1.55.old/qt/aqt/qt/__init__.py	2023-01-02 18:34:13.716216913 +0800
-+++ anki-2.1.55/qt/aqt/qt/__init__.py	2023-01-02 18:34:00.410033708 +0800
-@@ -9,16 +9,7 @@
+--- a/qt/aqt/qt/__init__.py
+++ b/qt/aqt/qt/__init__.py
+@@ -9,16 +9,7 @@ import sys
 import traceback
 from typing import Callable, TypeVar, Union
- 
+
 -try:
 -    import PyQt6
 -except:
 -    from .qt5 import *  # type: ignore
 -else:
-    if not os.getenv("DISABLE_QT5_COMPAT"):
+-    if os.getenv("ENABLE_QT5_COMPAT"):
 -        print("Running with temporary Qt5 compatibility shims.")
-        print("Run with DISABLE_QT5_COMPAT=1 to confirm compatibility with Qt6.")
 -        from . import qt5_compat  # needs to be imported first
 -    from .qt6 import *
+-
 +from .qt5 import *  # type: ignore
- 
 from anki.utils import is_mac, is_win
+
+ # fix buggy ubuntu12.04 display of language selector
@@ -1,17 +1,13 @@
-diff -uNr anki-2.1.55.old/qt/aqt/profiles.py anki-2.1.55/qt/aqt/profiles.py
--- anki-2.1.55.old/qt/aqt/profiles.py	2023-01-02 18:35:44.574467892 +0800
-+++ anki-2.1.55/qt/aqt/profiles.py	2023-01-02 18:34:00.412033736 +0800
-@@ -77,11 +77,11 @@
+diff --git a/qt/aqt/update.py b/qt/aqt/update.py
+index 212ddf93d..6f716cc04 100644
+--- a/qt/aqt/update.py
+++ b/qt/aqt/update.py
+@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
 
- metaConf = dict(
-     ver=0,
-    updates=True,
-+    updates=False,
-     created=int_time(),
-     id=random.randrange(0, 2**63),
-     lastMsg=-1,
-    suppressUpdate=False,
-+    suppressUpdate=True,
-     firstRun=True,
-     defaultLang=None,
- )
+ 
+ def check_for_update() -> None:
+    return
+
+     from aqt import mw
+ 
+     def do_check(_col: Collection) -> CheckForUpdateResponse:
@@ -1,5 +1,5 @@
 Name:           anki-qt5
-Version:        2.1.65
+Version:        23.10.1
 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
@@ -7,8 +7,8 @@ URL:            https://apps.ankiweb.net/
 BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson python3-pyqt5-sip
 BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
-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
+Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash python3-orjson mpv python3-qt5-webengine
+Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt5-sip
 ExclusiveArch:  x86_64
 Conflicts:      anki
 Patch0:         0001-No-update.patch
@@ -22,7 +22,6 @@ Anki is based on a theory called spaced repetition.
 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %version
-%patch0 -p1
 %patch1 -p1

 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
@@ -1,17 +1,13 @@
-diff -uNr anki-2.1.55.old/qt/aqt/profiles.py anki-2.1.55/qt/aqt/profiles.py
--- anki-2.1.55.old/qt/aqt/profiles.py	2023-01-02 18:35:44.574467892 +0800
-+++ anki-2.1.55/qt/aqt/profiles.py	2023-01-02 18:34:00.412033736 +0800
-@@ -77,11 +77,11 @@
+diff --git a/qt/aqt/update.py b/qt/aqt/update.py
+index 212ddf93d..6f716cc04 100644
+--- a/qt/aqt/update.py
+++ b/qt/aqt/update.py
+@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
 
- metaConf = dict(
-     ver=0,
-    updates=True,
-+    updates=False,
-     created=int_time(),
-     id=random.randrange(0, 2**63),
-     lastMsg=-1,
-    suppressUpdate=False,
-+    suppressUpdate=True,
-     firstRun=True,
-     defaultLang=None,
- )
+ 
+ def check_for_update() -> None:
+    return
+
+     from aqt import mw
+ 
+     def do_check(_col: Collection) -> CheckForUpdateResponse:
@@ -1,4 +1,5 @@
 project pkg {
+	arches = ["x86_64"]
 	rpm {
 		spec = "anki.spec"
 	}
@@ -1,14 +1,14 @@
 Name:           anki
-Version:        2.1.65
+Version:        23.10.1
 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
 URL:            https://apps.ankiweb.net/
 BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson
-BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-devel python3-pyqt6
+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-qt5-webengine python3-pyqt6
+Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt6-webengine
 Recommends:     mpv
 Obsoletes:      anki <= 2.1.15
 Conflicts:      anki-qt5
@@ -22,7 +22,6 @@ Anki is based on a theory called spaced repetition.
 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %{version}
-%patch 0 -p1

 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki

@@ -14,8 +14,8 @@
 %global __provides_exclude_from %{_datadir}/armcord/.*\\.so

 Name:			armcord-bin
-Version:		3.2.3
-Release:		4%{?dist}
+Version:		3.2.5
+Release:		1%{?dist}
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
 URL:			https://github.com/ArmCord/ArmCord
@@ -1,7 +1,7 @@
 %define debug_package %nil

 Name:		armcord
-Version:	3.2.3
+Version:	3.2.5
 Release:	1%{?dist}
 License:	OSL-3.0
 Summary:	Custom lightweight Discord client designed to enhance your experience
@@ -6,12 +6,12 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name: authy
-Version: 2.4.1
+Version: 2.4.2
 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_21.snap
+Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_22.snap
 Requires: gtk3
 Requires: nss
 BuildRequires: squashfs-tools desktop-file-utils
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

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

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

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

 Name:           discord-ptb
-Version:        0.0.44
-Release:        4%{?dist}
+Version:        0.0.62
+Release:        1%{?dist}
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
 Source0:        https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
@@ -6,8 +6,8 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.28
-Release:		4%{?dist}
+Version:		0.0.38
+Release:		1%{?dist}
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
 Source0:		https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
@@ -0,0 +1,5 @@
+project "pkg" {
+    rpm {
+        spec = "jellyfin-mpv-shim.spec"
+    }
+}
@@ -0,0 +1,88 @@
+# Created by pyp2rpm-3.3.10
+%global pypi_name jellyfin-mpv-shim
+%global module_name jellyfin_mpv_shim
+%global pypi_version 2.6.0
+
+Name:           python-%{pypi_name}
+Version:        %{pypi_version}
+Release:        1%{?dist}
+Summary:        Cast media from Jellyfin Mobile and Web apps to MPV
+
+License:        GPLv3
+URL:            https://github.com/jellyfin/jellyfin-mpv-shim
+Source0:        %{pypi_source}
+BuildArch:      noarch
+
+BuildRequires:  python3-devel
+BuildRequires:  python3dist(setuptools)
+Provides:       %{pypi_name} = %{pypi_version}
+
+%description
+Jellyfin MPV Shim is a cross-platform cast client for Jellyfin. It has
+support for all your advanced media files without transcoding.
+
+%package -n     python3-%{pypi_name}
+Summary:        %{summary}
+%{?python_provide:%python_provide python3-%{pypi_name}}
+Requires:       python3dist(jellyfin-apiclient-python) >= 1.9.2
+Requires:       python3dist(jinja2)
+Requires:       python3dist(jinja2)
+Requires:       python3dist(pillow)
+Requires:       python3dist(pillow)
+Requires:       python3dist(pypresence)
+Requires:       python3dist(pypresence)
+Requires:       python3dist(pystray)
+Requires:       python3dist(pystray)
+Requires:       python3-tkinter
+Requires:       python3dist(python-mpv)
+Requires:       python3dist(python-mpv-jsonipc) >= 1.2
+Requires:       python3dist(pywebview) >= 3.3.1
+Requires:       python3dist(pywebview) >= 3.3.1
+Requires:       python3dist(requests)
+Requires:       python3dist(setuptools)
+Requires:       mpv
+%description -n python3-%{pypi_name}
+Jellyfin MPV Shim is a cross-platform cast client for Jellyfin. It has
+support for all your advanced media files without transcoding.
+
+
+%prep
+%autosetup -n %{pypi_name}-%{pypi_version}
+# Remove bundled egg-info
+rm -rf %{pypi_name}.egg-info
+
+%build
+%py3_build
+
+%install
+%py3_install
+
+mkdir -p %{buildroot}%{_datadir}/applications/
+# metainfo
+mkdir -p %{buildroot}%{_datadir}/metainfo/
+
+cp -v %{module_name}/integration/*.desktop %{buildroot}%{_datadir}/applications/
+cp -v %{module_name}/integration/*.appdata.xml %{buildroot}%{_datadir}/metainfo/
+
+# add icons
+
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64,128x128,256x256}/apps/
+
+for s in 16 32 48 64 128 256; do
+    cp -v %{module_name}/integration/jellyfin-${s}.png %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/com.github.iwalton3.jellyfin-mpv-shim.png
+done
+
+
+%files -n python3-%{pypi_name}
+%license jellyfin_mpv_shim/default_shader_pack/LICENSE.md
+%doc README.md jellyfin_mpv_shim/default_shader_pack/README.md
+%{_bindir}/jellyfin-mpv-shim
+%{python3_sitelib}/jellyfin_mpv_shim
+%{python3_sitelib}/jellyfin_mpv_shim-%{pypi_version}-py%{python3_version}.egg-info
+%{_datadir}/applications/com.github.iwalton3.jellyfin-mpv-shim.desktop
+%{_datadir}/metainfo/com.github.iwalton3.jellyfin-mpv-shim.appdata.xml
+%{_datadir}/icons/hicolor/*/apps/com.github.iwalton3.jellyfin-mpv-shim.png
+
+%changelog
+* Sun Dec 17 2023 Cappy Ishihara <cappy@cappuchino.xyz> - 2.6.0-1
+- Initial package.
@@ -0,0 +1 @@
+rpm.global("pypi_version", pypi("jellyfin-mpv-shim"));
@@ -0,0 +1 @@
+*.tar.gz
@@ -0,0 +1,5 @@
+project "pkg" {
+    rpm {
+        spec = "vencord-desktop.spec"
+    }
+}
@@ -0,0 +1 @@
+rpm.version(gh_tag("Vencord/Vesktop"));
@@ -0,0 +1,74 @@
+%define debug_package %nil
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/vesktop/.*\\.so
+
+Name:		vencord-desktop
+Provides:   VencordDesktop = %{version}-%{release}
+Version:	0.4.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
+URL:		https://github.com/Vencord/Vesktop
+Group:		Applications/Internet
+#Source1:	launch.sh
+Source0:    https://github.com/Vencord/Vesktop/archive/refs/tags/v%{version}.tar.gz
+Requires:   xdg-utils
+BuildRequires:	nodejs-npm git
+# Conflicts:	vesktop-bin
+
+%description
+vesktop is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+git init
+git remote add origin %url || :
+git reset --hard
+git fetch
+git checkout v%version
+
+cat <<EOF > vesktop.desktop
+[Desktop Entry]
+Name=Vesktop
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=/usr/bin/vencorddesktop
+Icon=vesktop
+Categories=Network;InstantMessaging;
+StartupWMClass=VencordDesktop
+
+Keywords=discord;vesktop;vencord;shelter;armcord;electron;
+EOF
+
+
+%build
+npx pnpm@8 install --no-frozen-lockfile
+npx pnpm@8 package:dir
+
+
+%install
+
+mkdir -p %buildroot/usr/share/vesktop
+cp -r dist/*-unpacked/. %buildroot/usr/share/vesktop/.
+
+install -Dm755 dist/*-unpacked/vencorddesktop %buildroot/usr/bin/vencorddesktop
+ln -sf /usr/share/vesktop/vencorddesktop %buildroot/usr/bin/vencorddesktop
+install -Dm644 vesktop.desktop %buildroot/usr/share/applications/vesktop.desktop
+install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/vesktop.png
+
+%files
+%doc README.md
+%license LICENSE
+/usr/bin/vencorddesktop
+/usr/share/applications/vesktop.desktop
+/usr/share/pixmaps/vesktop.png
+/usr/share/vesktop/*
+
+%changelog
+* Tue Nov 07 2023 Cappy Ishihara <cappy@cappuchino.xyz> - 0.4.3-1
+- Initial package
+
+
@@ -1,6 +1,6 @@
 %global nodev 16.17.0
 %global npmv 8.11.0
-%global ver 0.14.7
+%global ver 0.14.10
 %define debug_package %nil
 %global _build_id_links none

@@ -1,5 +1,5 @@
 Name:		budgie-extras
-Version:	1.7.0
+Version:	1.7.1
 Release:	1%{?dist}

 License:	GPL-3.0
@@ -51,7 +51,6 @@ Requires:	budgie-applet-recentlyused
 Requires:	budgie-applet-rotation-lock
 Requires:	budgie-applet-showtime
 Requires:	budgie-applet-takeabreak
-Requires:	budgie-applet-trash
 Requires:	budgie-applet-visualspace
 Requires:	budgie-applet-wallstreet
 Requires:	budgie-applet-window-shuffler
@@ -208,14 +207,6 @@ upside down, dim the screen, lock screen or show a countdown message on break
 time. The applet can be accessed quickly from the panel to temporarily switch
 it off.

-%package -n	budgie-applet-trash
-Requires:	budgie-extras-common
-Summary:	Applet allows access to trash capabilities for the Budgie Desktop
-%description -n	budgie-applet-trash
-The trash applet allows the user access the desktop trash capabilities
-from the panel including the ability to delete and restore files stored
-in the trash folder.
-
 %package -n	budgie-applet-visualspace
 Requires:	budgie-extras-common
 Summary:	Shows the current workspace(s), as bullet(s)
@@ -393,9 +384,6 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.takeabreak.gschema.xml
 %{_datadir}/pixmaps/takeabreak*.svg

-%files -n budgie-applet-trash
-%{_libdir}/budgie-desktop/plugins/budgie-trash
-
 %files -n budgie-applet-visualspace
 %config %{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
 %{_libdir}/budgie-desktop/plugins/budgie-visualspace
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu3
+%define _ubuntu_rel 22.10.20220822-0ubuntu4
 %global _hardened_build 0

 Name:           compiz9
@@ -77,7 +77,7 @@ Compiz Config Manager helps configure Compiz Window Manager, version 0.9 series
 Compiz 9 branch, which is newer then what Fedora packages and required by Unity 7.6 and higher.

 %prep
-%autosetup -p1 -n compiz
+%autosetup -p1 -n compiz-%version+%(echo %_ubuntu_rel | sed 's@-0ubuntu.@@')

 %build
 # The driver blacklist hack is obselete
@@ -2,7 +2,7 @@

 Name:           elementary-appcenter
 Summary:        Software Center from elementary
-Version:        7.3.0
+Version:        7.4.0
 Release:        1%{?dist}
 License:        GPL-3.0

@@ -1,6 +1,6 @@
 Name:           contractor
 Version:        0.3.5
-Release:        %autorelease
+Release:        1%{?dist}
 Summary:        Desktop-wide extension service

 License:        GPL-3.0-or-later
@@ -3,8 +3,8 @@

 Name:           elementary-calculator
 Summary:        Calculator app designed for elementary
-Version:        2.0.2
-Release:        2%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%{srcname}
@@ -5,7 +5,7 @@

 Name:           elementary-files
 Summary:        File manager from elementary
-Version:        6.4.1
+Version:        6.5.3
 Release:        1%{?dist}
 License:        GPL-3.0

@@ -11,6 +11,8 @@ URL:            https://github.com/elementary/greeter
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source1:        40-%{appname}.conf

+Patch0:         https://github.com/elementary/greeter/commit/dbd9b6f9701f5992c3b3257c025b9cd80d041cc8.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -34,9 +36,9 @@ BuildRequires:  pkgconfig(granite) >= 5.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(liblightdm-gobject-1)
-BuildRequires:  pkgconfig(mutter-clutter-12)
-BuildRequires:  pkgconfig(mutter-cogl-12)
-BuildRequires:  pkgconfig(mutter-cogl-pango-12)
+BuildRequires:  pkgconfig(mutter-clutter-13)
+BuildRequires:  pkgconfig(mutter-cogl-13)
+BuildRequires:  pkgconfig(mutter-cogl-pango-13)
 BuildRequires:  pkgconfig(x11)

 Provides:       pantheon-greeter = %{version}-%{release}
@@ -68,7 +70,7 @@ The elementary Greeter is a styled Login Screen for LightDM.


 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -p1 -n %{srcname}-%{version}


 %build
@@ -4,7 +4,7 @@
 Name:           elementary-icon-theme
 Summary:        Icons from the Elementary Project
 Version:        7.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/icons
@@ -89,9 +89,7 @@ gtk-update-icon-cache --force %{_datadir}/icons/elementary &>/dev/null || :
 %dir %{_datadir}/icons/elementary
 %ghost %{_datadir}/icons/elementary/icon-theme.cache

-%{_datadir}/icons/elementary/*/
-%{_datadir}/icons/elementary/*@2x
-%{_datadir}/icons/elementary/*@3x
+%{_datadir}/icons/elementary/*

 %{_datadir}/icons/elementary/cursor.theme
 %{_datadir}/icons/elementary/index.theme
@@ -3,7 +3,7 @@


 Name:           elementary-notifications
-Version:        7.0.0
+Version:        7.0.1
 Release:        1%{?dist}
 Summary:        GTK Notification server for Pantheon

@@ -42,6 +42,10 @@ Provides:      %{name} = %{version}-%{release}
 %meson_install


+%check
+appstream-util validate-relax --nonet %buildroot%_datadir/metainfo/%appname.metainfo.xml
+
+
 %files
 %license LICENSE
 %doc README.md
@@ -52,7 +56,7 @@ Provides:      %{name} = %{version}-%{release}

 %config %{_sysconfdir}/xdg/autostart/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_metainfodir}/%{appname}.appdata.xml
+%{_metainfodir}/%{appname}.metainfo.xml


 %changelog
@@ -4,7 +4,7 @@
 Name:           elementary-onboarding
 Summary:        Onboarding app for new users
 Version:        7.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/onboarding
@@ -12,15 +12,19 @@ License:        LGPL-2.0-or-later
 URL:            https://github.com/elementary/photos
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

+# RIP the publishing plugins (sorry for the "wide" patch, having issues with just the relevant commits)
+Patch0:         https://github.com/elementary/photos/compare/7261606a05d1f41116aba5c86b62d1f739419ed1..09e55943b266bc2861b913251cb834169d81743e.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
 BuildRequires:  fdupes
+BuildRequires:  git-core

 BuildRequires:  pkgconfig(gee-0.8) >= 0.8.5
-BuildRequires:  pkgconfig(geocode-glib-1.0)
+BuildRequires:  pkgconfig(geocode-glib-2.0)
 BuildRequires:  pkgconfig(gexiv2) >= 0.4.90
 BuildRequires:  pkgconfig(gio-2.0) >= 2.20
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.20
@@ -33,17 +37,12 @@ BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0) >= 1.0.0
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0) >= 1.0.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.6.0
 BuildRequires:  pkgconfig(gudev-1.0) >= 145
-BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(libexif) >= 0.6.16
 BuildRequires:  pkgconfig(libgphoto2) >= 2.4.2
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libraw) >= 0.13.2
-BuildRequires:  pkgconfig(libsoup-2.4) >= 2.26.0
 BuildRequires:  pkgconfig(libwebp) >= 0.4.4
-BuildRequires:  pkgconfig(libxml-2.0) >= 2.6.32
-BuildRequires:  pkgconfig(rest-0.7) >= 0.7
 BuildRequires:  pkgconfig(sqlite3) >= 3.5.9
-BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.0.0

 Requires:       hicolor-icon-theme

@@ -53,7 +52,8 @@ Foundation.


 %prep
-%autosetup -n %{srcname}-%{version} -p1
+%autosetup -n %{srcname}-%{version} -N
+git apply %PATCH0 # The .patch file has Git binary patches, so we need to apply it manually with Git


 %build
@@ -94,7 +94,6 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/applications/%{appname}-viewer.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_datadir}/glib-2.0/schemas/%{appname}-extras.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
 %{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg
 %{_datadir}/metainfo/%{appname}.appdata.xml
@@ -3,8 +3,8 @@

 Name:           elementary-theme
 Summary:        Elementary GTK+ Stylesheet
-Version:        7.2.0
-Release:        2%{?dist}
+Version:        7.3.0
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/stylesheet
@@ -2,7 +2,7 @@

 Name:           gala
 Summary:        Gala window manager
-Version:        7.1.2
+Version:        7.1.3
 Release:        1%{?dist}
 License:        GPL-3.0-or-later

@@ -31,9 +31,9 @@ BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libbamf3)
 BuildRequires:  pkgconfig(libcanberra)
-BuildRequires:  pkgconfig(mutter-clutter-12)
-BuildRequires:  pkgconfig(mutter-cogl-12)
-BuildRequires:  pkgconfig(mutter-cogl-pango-12)
+BuildRequires:  pkgconfig(mutter-clutter-13)
+BuildRequires:  pkgconfig(mutter-cogl-13)
+BuildRequires:  pkgconfig(mutter-cogl-pango-13)

 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}

@@ -5,8 +5,8 @@ apps built for elementary.}

 Name:           granite-7
 Summary:        Elementary companion library for GTK+ and GLib
-Version:        7.3.0
-Release:        2%{?dist}
+Version:        7.4.0
+Release:        1%{?dist}
 License:        LGPL-3.0-or-later

 URL:            https://github.com/elementary/granite
@@ -13,10 +13,11 @@ BuildArch:      noarch

 Requires:       elementary-settings-daemon
 Requires:       gala
+# Gala has a hard runtime dependency on... GNOME Disks' DBus service!?!
 Requires:       gnome-disk-utility
 Requires:       gnome-keyring
 Requires:       gnome-session
-Requires:       gnome-session-xsession
+#Requires:       gnome-session-xsession  # this pulls in gnome-shell
 Requires:       gnome-settings-daemon
 Requires:       orca
 Requires:       pantheon-agent-geoclue2
@@ -41,6 +42,8 @@ Requires:       elementary-sound-theme
 Requires:       elementary-theme
 Requires:       open-sans-fonts

+Source1:        https://github.com/elementary/default-settings/raw/master/xdg-desktop-portal/pantheon-portals.conf
+
 %description
 Configuration files and settings overrides for the Pantheon desktop session.

@@ -84,6 +87,9 @@ mkdir -p %{buildroot}/%{_datadir}/accountsservice/interfaces
 ln -s ../../dbus-1/interfaces/io.elementary.pantheon.AccountsService.xml \
    %{buildroot}/%{_datadir}/accountsservice/interfaces/io.elementary.pantheon.AccountsService.xml

+mkdir -p %{buildroot}/%{_datadir}/xdg-desktop-portal
+install -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/xdg-desktop-portal/
+

 # these scriptlets are apparently still necessary, because
 # .override files don't seem to trigger schema recompilation
@@ -109,6 +115,7 @@ fi
 %{_datadir}/gnome-session/sessions/pantheon.session
 %{_datadir}/polkit-1/actions/io.elementary.pantheon.AccountsService.policy
 %{_datadir}/xsessions/pantheon.desktop
+%{_datadir}/xdg-desktop-portal/pantheon-portals.conf


 %changelog
@@ -1,5 +1,5 @@
 Name:			pantheon-tweaks
-Version:		1.1.0
+Version:		1.1.1
 Release:		1%{?dist}
 Summary:		A system settings panel for the Pantheon desktop environment
 License:		GPL-3.0
@@ -8,7 +8,7 @@

 Name:           switchboard-plug-applications
 Summary:        Switchboard Applications plug
-Version:        7.0.0
+Version:        7.0.1
 Release:        1%{?dist}
 License:        GPL-3.0-or-later

@@ -9,7 +9,7 @@
 Name:           switchboard-plug-bluetooth
 Summary:        Switchboard Bluetooth plug
 Version:        2.3.6
-Release:        4%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-bluetooth
@@ -9,7 +9,7 @@
 Name:           switchboard-plug-datetime
 Summary:        Switchboard Date & Time Plug
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-datetime
@@ -8,7 +8,7 @@

 Name:           switchboard-plug-keyboard
 Summary:        Switchboard Keyboard plug
-Version:        3.2.0
+Version:        3.2.1
 Release:        1%{?dist}
 License:        GPL-3.0-or-later

@@ -67,7 +67,7 @@ appstream-util validate-relax --nonet \
 %license COPYING

 %{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
-
+%{_datadir}/glib-2.0/schemas/keyboard.gschema.xml
 %{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


@@ -15,6 +15,8 @@ License:        GPL-3.0-or-later
 URL:            https://github.com/elementary/switchboard-plug-network
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

+Patch0:         https://github.com/elementary/switchboard-plug-network/pull/357.patch
+
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
@@ -0,0 +1,23 @@
+From a3be778d1c4137d30af6ed9a08d0b54ee828687f Mon Sep 17 00:00:00 2001
+From: madomado <madonuko@outlook.com>
+Date: Tue, 21 Nov 2023 19:45:14 +0800
+Subject: [PATCH] fix(wallpaper): change wallpaper for dark theme settings
+
+Previously before the fix, the wallpaper cannot be changed via settings because it only sets the wallpaper for the light theme, not the dark theme.
+This fixes the issue.
+---
+ src/Views/Wallpaper.vala | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala
+index 07251444..7141cad8 100644
+--- a/src/Views/Wallpaper.vala
+++ b/src/Views/Wallpaper.vala
+@@ -206,6 +206,7 @@ public class PantheonShell.Wallpaper : Gtk.Box {
+         }
+ 
+         gnome_background_settings.set_string ("picture-uri", uri);
+        gnome_background_settings.set_string ("picture-uri-dark", uri);
+     }
+ 
+     private void update_checked_wallpaper (Gtk.FlowBox box, Gtk.FlowBoxChild child) {
@@ -14,6 +14,7 @@ License:        GPL-3.0

 URL:            https://github.com/elementary/switchboard-plug-pantheon-shell
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
+Patch0:         dark-theme-wallpaper.patch

 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -5,7 +5,7 @@

 Name:           switchboard-plug-tweaks
 Summary:        Switchboard Tweaks Plug
-Version:        1.1.0
+Version:        1.1.1
 Release:        1%{?dist}
 License:        GPL-3.0-or-later

@@ -6,7 +6,7 @@
 %global plug_name wallet
 %global plug_rdnn io.elementary.switchboard.wallet

-%global commit bfe73dfb95d9b46a0a34e0db35a178233c8552b0
+%global commit 50582fc7ee43a4b47647d04786dcf1d0eb45af36

 Name:           switchboard-plug-wallet
 Summary:        Switchboard Wallet Plug
@@ -4,7 +4,7 @@
 Name:           switchboard
 Summary:        Modular Desktop Settings Hub
 Version:        6.0.2
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -6,7 +6,7 @@
 Name:           wingpanel-indicator-datetime
 Summary:        Datetime Indicator for wingpanel
 Version:        2.4.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-datetime
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-network
 Summary:        Network Indicator for wingpanel
-Version:        7.0.1
-Release:        2%{?dist}
+Version:        7.0.2
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-network
@@ -5,7 +5,7 @@

 Name:           wingpanel-indicator-notifications
 Summary:        Notifications Indicator for wingpanel
-Version:        7.0.0
+Version:        7.1.0
 Release:        1%{?dist}
 License:        LGPL-2.0-or-later

@@ -62,6 +62,7 @@ appstream-util validate-relax --nonet \
 %{_libdir}/wingpanel/libnotifications.so

 %{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml


 %changelog
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-power
 Summary:        Power indicator for wingpanel
-Version:        6.2.0
-Release:        2%?dist
+Version:        6.2.1
+Release:        1%{?dist}
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-power
@@ -6,13 +6,12 @@ launcher.}

 Name:           wingpanel
 Summary:        Stylish top panel
-Version:        3.0.3
+Version:        3.0.5
 Release:        1%{?dist}
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0:         https://github.com/elementary/wingpanel/compare/f8b98a5..0cbf289.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -28,9 +27,9 @@ BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
-BuildRequires:  pkgconfig(mutter-clutter-12)
-BuildRequires:  pkgconfig(mutter-cogl-12)
-BuildRequires:  pkgconfig(mutter-cogl-pango-12)
+BuildRequires:  pkgconfig(mutter-clutter-13)
+BuildRequires:  pkgconfig(mutter-cogl-13)
+BuildRequires:  pkgconfig(mutter-cogl-pango-13)

 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}

@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name:			xdg-desktop-portal-pantheon
-Version:		7.1.0
+Version:		7.1.1
 Release:		1%{?dist}
 Summary:		Pantheon XDG Desktop Portals
 License:		GPL-3.0
@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "gnome-shell-extension-appmenu-is-back.spec"
+    }
+}
@@ -0,0 +1,34 @@
+%global extension   appmenu-is-back
+%global uuid        %{extension}@fthx
+
+Name:           gnome-shell-extension-%{extension}
+Version:        2
+Release:        1%{?dist}
+Summary:        GNOME Shell extension to bring back the app menu
+License:        GPL-3.0-only
+URL:            https://github.com/fthx/appmenu-is-back
+
+BuildArch:      noarch
+
+Source0:        https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz
+
+Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
+Recommends:     gnome-extensions-app
+
+%description
+This extension brings back the app menu in the top panel, for GNOME 45 and later.
+
+%prep
+%autosetup -n appmenu-is-back-%{version}
+
+%install
+install -Dm644 metadata.json %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/metadata.json
+install -Dm644 extension.js %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/extension.js
+
+%files
+%license LICENSE
+%{_datadir}/gnome-shell/extensions/%{uuid}
+
+%changelog
+* Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 2-1
+- Initial Release
@@ -0,0 +1,2 @@
+let version = find("v(.+)", gh("fthx/appmenu-is-back"), 1);
+rpm.version(version);
@@ -0,0 +1,34 @@
+From 3f8b19139bf3f13b4285fd9d949cb5460a0909df Mon Sep 17 00:00:00 2001
+From: Carl George <carl@george.computer>
+Date: Fri, 25 Jun 2021 22:26:50 -0500
+Subject: [PATCH] Remove schema handling from transpile.sh
+
+---
+ scripts/transpile.sh | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/scripts/transpile.sh b/scripts/transpile.sh
+index e619a8c..8977c29 100755
+--- a/scripts/transpile.sh
+++ b/scripts/transpile.sh
+@@ -15,8 +15,6 @@ transpile() {
+ 
+ rm -rf _build
+ 
+-glib-compile-schemas schemas &
+-
+ # Transpile to JavaScript
+ 
+ for proj in ${PROJECTS}; do
+@@ -30,7 +28,7 @@ wait
+ 
+ # Convert JS to GJS-compatible scripts
+ 
+-cp -r metadata.json icons schemas *.css _build &
+cp -r metadata.json icons *.css _build &
+ 
+ for src in $(find target -name '*.js'); do
+     dest=$(echo "$src" | sed s#target#_build#g)
+-- 
+2.31.1
+
@@ -0,0 +1,18 @@
+[org.gnome.desktop.wm.keybindings]
+close = ['<Alt>F4', '<Super>q']
+maximize = []
+minimize = []
+move-to-monitor-down = []
+move-to-monitor-left = []
+move-to-monitor-right = []
+move-to-monitor-up = []
+move-to-workspace-down = []
+move-to-workspace-left = []
+move-to-workspace-right = []
+move-to-workspace-up = []
+switch-to-workspace-down = ['<Primary><Super>Down', '<Primary><Super>KP_Down', '<Primary><Super>j']
+switch-to-workspace-left = []
+switch-to-workspace-right = []
+switch-to-workspace-up = ['<Primary><Super>Up', '<Primary><Super>KP_Up', '<Primary><Super>k']
+toggle-maximized = ['<Super>m']
+unmaximize = []
@@ -0,0 +1,7 @@
+[org.gnome.mutter:GNOME]
+attach-modal-dialogs = false
+workspaces-only-on-primary = false
+
+[org.gnome.mutter.keybindings]
+toggle-tiled-left = ['<Primary><Super>Left', '<Primary><Super>KP_Left', '<Primary><Super>h']
+toggle-tiled-right = ['<Primary><Super>Right', '<Primary><Super>KP_Right', '<Primary><Super>l']
@@ -0,0 +1,2 @@
+[org.gnome.mutter.wayland.keybindings]
+restore-shortcuts = []
@@ -0,0 +1,6 @@
+[org.gnome.settings-daemon.plugins.media-keys]
+email = ['<Super>e']
+home = ['<Super>f']
+screensaver = ['<Super>Escape']
+www = ['<Super>b']
+rotate-video-lock-static = ['XF86RotationLockToggle']
@@ -0,0 +1,18 @@
+[org.gnome.shell.keybindings]
+open-application-menu = []
+shift-overview-down = []
+shift-overview-up = []
+switch-to-application-1 = []
+switch-to-application-2 = []
+switch-to-application-3 = []
+switch-to-application-4 = []
+switch-to-application-5 = []
+switch-to-application-6 = []
+switch-to-application-7 = []
+switch-to-application-8 = []
+switch-to-application-9 = []
+toggle-message-tray = ['<Super>v']
+
+[org.gnome.shell.overrides]
+attach-modal-dialogs = false
+workspaces-only-on-primary = false
@@ -0,0 +1,8 @@
+project pkg {
+    rpm {
+        spec = "terra-gnome-shell-extension-pop-shell.spec"
+    }
+    labels {
+        nightly = "1"
+    }
+}
@@ -0,0 +1,89 @@
+# from Fedora upstream
+%global extension   pop-shell
+%global uuid        %{extension}@system76.com
+%global commit      cf3c932b55d5c247906efe9d81f988ee092d9f51
+%global shortcommit %{lua:print(macros.commit:sub(1,7))}
+%global ver         1.2.0
+
+Name:           terra-gnome-shell-extension-%{extension}
+Version:        %{ver}^%{shortcommit}
+Release:        1%?dist
+Summary:        GNOME Shell extension for advanced tiling window management
+License:        GPL-3.0-only
+URL:            https://github.com/pop-os/shell
+BuildArch:      noarch
+
+Source0:        %{url}/archive/%{commit}/%{extension}-%{shortcommit}.tar.gz
+Source1:        50_org.gnome.desktop.wm.keybindings.%{extension}.gschema.override
+Source2:        50_org.gnome.mutter.%{extension}.gschema.override
+Source3:        50_org.gnome.mutter.wayland.%{extension}.gschema.override
+Source4:        50_org.gnome.settings-daemon.plugins.media-keys.%{extension}.gschema.override
+Source5:        50_org.gnome.shell.%{extension}.gschema.override
+# downstream-only
+Patch0:         0001-Remove-schema-handling-from-transpile.sh.patch
+
+BuildRequires:  typescript >= 3.8
+BuildRequires:  make
+
+Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
+Recommends:     gnome-extensions-app
+Recommends:     %{name}-shortcut-overrides = %{version}-%{release}
+Provides:       %{extension} = %{version}-%{release}
+
+
+%description
+Pop Shell is a keyboard-driven layer for GNOME Shell which allows for quick and
+sensible navigation and management of windows.  The core feature of Pop Shell
+is the addition of advanced tiling window management - a feature that has been
+highly sought within our community.  For many - ourselves included - i3wm has
+become the leading competitor to the GNOME desktop.
+
+
+%package shortcut-overrides
+Summary:        Shortcut overrides for %{name}
+
+
+%description shortcut-overrides
+Shortcut overrides for %{name}.
+
+
+%prep
+%autosetup -p 1 -n shell-%{commit}
+
+
+%build
+%make_build compile
+
+
+%install
+# install main extension files
+%make_install
+
+# install the schema file
+install -D -p -m 0644 \
+    schemas/org.gnome.shell.extensions.%{extension}.gschema.xml \
+    %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.%{extension}.gschema.xml
+
+# install the gnome-control-center keybindings
+install -d -m 0755 %{buildroot}%{_datadir}/gnome-control-center/keybindings
+install -p -m 0644 keybindings/*.xml %{buildroot}%{_datadir}/gnome-control-center/keybindings/
+
+# install the schema override files
+install -d -m 0755 %{buildroot}%{_datadir}/glib-2.0/schemas
+install -p -m 0644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{buildroot}%{_datadir}/glib-2.0/schemas/
+
+
+%files
+%license LICENSE
+%doc README.md
+%{_datadir}/gnome-shell/extensions/%{uuid}
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.%{extension}.gschema.xml
+%{_datadir}/gnome-control-center/keybindings/*.xml
+
+
+%files shortcut-overrides
+%{_datadir}/glib-2.0/schemas/*.%{extension}.gschema.override
+
+
+%changelog
+%autochangelog
@@ -0,0 +1,4 @@
+if filters.contains("nightly") {
+  rpm.global("commit", get("https://api.github.com/repos/pop-os/shell/commits/HEAD").json().sha);
+  rpm.global("ver", gh("pop-os/shell"));
+}
@@ -1,17 +1,12 @@
-%global forgeurl https://invent.kde.org/system/liquidshell
-%global commit 9b14b9766f5d8db2b81c9bc7d4163dc07534402c
-%global scm git
-%forgemeta
-
 Name:		kde-liquidshell
-Version:	1.8.1
+Version:	1.9.0
 Release:	%autorelease
 Summary:	Basic desktop shell using QtWidgets
 Provides:	liquidshell = %version

 License:	GPL-3.0
-URL:		%{forgeurl}
-Source0:	%{forgeurl}/-/archive/%{commit}/liquidshell-%{commit}.tar.gz
+URL:		https://invent.kde.org/system/liquidshell
+Source0:	https://download.kde.org/stable/liquidshell/liquidshell-%version.tar.xz

 BuildRequires:	cmake
 BuildRequires:	libappstream-glib
@@ -49,7 +44,7 @@ Recommends:	polkit-kde
 liquidshell is a basic Desktop Shell implemented using QtWidgets.

 %prep
-%autosetup -n liquidshell-%{commit}
+%autosetup -n liquidshell-%version

 %build
 %cmake_kf5 -DWITH_PACKAGEKIT=true
@@ -69,6 +64,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 %{_datadir}/knotifications5/liquidshell.notifyrc
 %{_metainfodir}/org.kde.liquidshell.appdata.xml
 %{_datadir}/xsessions/liquidshell-session.desktop
+%{_datadir}/locale/*/LC_MESSAGES/liquidshell.mo

 %changelog
 %autochangelog
@@ -0,0 +1,2 @@
+let html = get("https://download.kde.org/stable/liquidshell/");
+rpm.version(find(`>liquidshell-([.\d]+)\.tar\.xz</a>`, html, 1));
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit 3b67d2112d23237269bd5fbf91af86680e31f7ea
+%global commit 3d26e09efdd94bc7adb308335e421ca3bbe6bf4f
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit 4f3e5e22a5ef0bc0ccbd55500729e58606ad5332
+%global commit 1a7a0ef6a8ab966b664f3515aba539b422f35849
 %forgemeta

 Name:           lomiri-app-launch
-Version:        0.1.7
+Version:        0.1.8
 Release:        1%{?dist}
 Summary:        Provides the Lomiri App Launch user space daemon
 License:        GPL-3.0
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-indicator-network
-%global commit ac0ae8ec8968c934f81c2664879ab10f76ab0fc2
+%global commit 7d0fd44108cfb74da3fcb26e7de07f7610302f5c
 %forgemeta

 Name:       lomiri-indicator-network
-Version:    1.0.0
+Version:    1.0.1
 Release:    %autorelease
 Summary:    The Network indicator for Ubuntu Touch
 License:    GPL-3.0 AND LGPL-3.0
@@ -0,0 +1,7 @@
+let o = get("https://gitlab.com/api/v4/projects/31038307/repository/tags").json_arr()[0];
+let f = rpm.f;
+rpm.version(o.name);
+// check if changed
+if rpm.f != f {
+	rpm.global("commit", o.commit.id);
+}
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-settings-components
-%global commit 5041243d56fb7aaab270b4d07284687ec33f75c6
+%global commit a2ce1155d385218a4b493f801867a45d2a41df02
 %forgemeta

 Name:       lomiri-settings-components
-Version:    1.0.1
+Version:    1.1.0
 Release:    %autorelease
 Summary:    The system settings components for Lomiri
 License:    GPLv3 AND LGPLv3
@@ -0,0 +1,7 @@
+let o = get("https://gitlab.com/api/v4/projects/25770169/repository/tags").json_arr()[0];
+let f = rpm.f;
+rpm.version(o.name);
+// check if changed
+if rpm.f != f {
+	rpm.global("commit", o.commit.id);
+}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`rpm.global("pypi_version", pypi("jellyfin-mpv-shim"));`