feat: begin work on update PR strategy

2026-05-31 09:01:55 +00:00 · 2024-02-05 00:20:26 -08:00
327 changed files with 1532 additions and 7302 deletions
@@ -1,9 +0,0 @@
-{
-  "repoOwner": "terrapkg",
-  "repoName": "packages",
-  "resetAuthor": true,
-  "targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
-  "branchLabelMapping": {
-    "^sync-(.+)$": "$1"
-  }
-}
@@ -29,7 +29,7 @@ jobs:
      - name: Set workspace as safe
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Generate build matrix
@@ -42,18 +42,25 @@ jobs:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
        version: ["39"]
      fail-fast: false
-    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

+      - name: Cache buildroot
+        id: br-cache
+        uses: actions/cache@v3
+        with:
+          path: /var/cache
+          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
+
      - name: Include custom build template instead of package default
        run: |
          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
@@ -68,10 +75,9 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -94,7 +100,7 @@ jobs:

      - 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}} ${{github.sha}}
+        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}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -21,7 +21,7 @@ jobs:
      - name: Install Anda
        run: cargo install anda

-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
        with:
          ref: f${{ matrix.version }}
          fetch-depth: 1
@@ -5,39 +5,16 @@ on:
      packages:
        description: "Packages to Build"
        required: true
-      custom_builder:
-        description: "Custom Builder"
-        required: false
-        default: ""
-      architecture:
-        description: "Architecture"
-        required: false
-        default: all
-        type: string

 jobs:
  parse:
    outputs:
      pkgs: ${{ steps.parsing.outputs.pkgs }}
-      builder: ${{ inputs.custom_builder }}
-      arch: ${{ steps.parsing.outputs.arch }}
    runs-on: "ubuntu-latest"
    steps:
      - name: Parse Input
        id: parsing
-        run: |
-          echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
-          echo "builder=${{ inputs.custom_builder }}" >> $GITHUB_OUTPUT
-          arch="${{ inputs.architecture }}"
-          # Convert to json array using jq
-          # if arch is not all, convert to array
-          if [ "$arch" != "all" ]; then
-            # jq, array with single element as string
-             arch=$(echo $arch | sed 's/,/\n/g')
-             echo "arch=$(echo $arch | jq -Rs 'split("\n")' | jq 'map(select(length > 0))' | jq -c .)" >> $GITHUB_OUTPUT
-          else
-             echo "arch=$(echo '["aarch64", "x86_64"]' | jq -c .)" >> $GITHUB_OUTPUT
-          fi
+        run: echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT

  build:
    needs: parse
@@ -45,15 +22,15 @@ jobs:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
        version: ["39"]
-        arch: ${{ fromJson(needs.parse.outputs.arch) }}
+        arch: ["x86_64", "aarch64"]
      fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -61,7 +38,7 @@ jobs:

      - name: Cache buildroot
        id: br-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: /var/cache
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
@@ -76,10 +53,9 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -92,6 +68,7 @@ jobs:
            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 \
@@ -100,7 +77,7 @@ jobs:

      - name: Notify Madoguchi (Success)
        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        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()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -19,7 +19,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -27,7 +27,7 @@ jobs:

      - name: Cache buildroot
        id: br-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: /var/cache
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
@@ -42,10 +42,9 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -67,7 +66,7 @@ jobs:

      - name: Notify Madoguchi (Success)
        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        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()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -17,6 +17,6 @@ jobs:
      image: ghcr.io/terrapkg/builder:f39
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Lint spec files
        run: rpmlint $(find anda -type f -name "*.spec" -type f)
@@ -2,7 +2,7 @@ set -x

 dirs=$2
 dirs=${dirs/\/pkg/}
-export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\",\"succ\":$1,\"commit\":\"%6\"}"
+export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\",\"succ\":$1}"

 if [[ $1 == false ]]; then
 	d=${p/\%v/?}
@@ -1,37 +0,0 @@
-name: Automatic backport/sync action
-
-on:
-  pull_request_target:
-    types: ["labeled", "closed"]
-
-jobs:
-  backport:
-    name: Backport/sync PR
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.merged
-    steps:
-      - name: Install SSH signing key
-        run: |
-          mkdir -p ${{ runner.temp }}
-          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
-          chmod 0700 ${{ runner.temp }}/signing_key
-
-      - name: Setup Raboneko Signing
-        run: |
-          git config --global gpg.format "ssh"
-          git config --global user.signingkey "${{ runner.temp }}/signing_key"
-          git config --global commit.gpgsign true
-
-      - name: Backport Action
-        uses: sorenlouv/backport-github-action@v9.3.0
-        with:
-          github_token: ${{ secrets.RABONEKO_BACKPORT_GITHUB_TOKEN }}
-          auto_backport_label_prefix: sync-
-
-      - name: Info log
-        if: ${{ success() }}
-        run: cat ~/.backport/backport.info.log
-
-      - name: Debug log
-        if: ${{ failure() }}
-        run: cat ~/.backport/backport.debug.log
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -16,7 +16,7 @@ jobs:
    container:
      image: ghcr.io/terrapkg/builder:f39
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Push to subatomic
        run: |
          branch=${{ github.ref_name }}
@@ -12,7 +12,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -46,8 +46,8 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
+            copy_over f37 || true
            copy_over f38 || true
-            copy_over f40 || true
            copy_over frawhide || true
            git push -u origin --all
          fi
@@ -12,7 +12,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -47,8 +47,19 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
+            copy_over f37 || true
            copy_over f38 || true
-            copy_over f40 || true
            copy_over frawhide || true
+            git remote add raboneko git@github.com:raboneko/packages.git
            git push -u origin --all
+
+            gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f37" --head "raboneko:f37"
+            gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f38" --head "raboneko:f38"
+            gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "frawhide" --head "raboneko:frawhide"
+            gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f39" --head "raboneko:f39"
+
+            gh pr merge --auto --squash raboneko:f37
+            gh pr merge --auto --squash raboneko:f38
+            gh pr merge --auto --squash raboneko:frawhide
+            gh pr merge --auto --squash raboneko:f39
          fi
@@ -0,0 +1,30 @@
+# Repository
+/.github @lleyton 
+/.devcontainer @lleyton 
+/.gitignore @windowsboy111 
+/CODE_OF_CONDUCT.md @lleyton 
+/CONTRIBUTING.md @lleyton 
+/LICENSE @lleyton 
+/README.md @windowsboy111 
+/SECURITY.md @lleyton 
+/anda.hcl @lleyton 
+/comps.xml @lleyton 
+
+# Package maintainers
+/anda/lib/libbismuth @lainsce
+/anda/lib/libhelium @lainsce
+/anda/others/tau-helium @lainsce
+/anda/others/tau-hydrogen @lainsce
+
+/anda/tools/melody @lleyton
+/anda/go/curlie @lleyton
+
+/anda/games/prismlauncher @getchoo
+/anda/games/prismlauncher-nightly @getchoo
+/anda/games/prismlauncher-qt5-nightly @getchoo
+/anda/games/prismlauncher-qt5 @getchoo
+
+/anda/srpm-macros @korewaChino
+/anda/rust/starship @korewaChino
+/anda/rust/zellij @korewaChino
+/anda/audio/distrho @korewaChino
@@ -2,8 +2,6 @@

 [![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)
-[![Repository status](https://repology.org/badge/repository-big/terra_40.svg?header=Terra+40)](https://repology.org/repository/terra_40)
-[![Repository status](https://repology.org/badge/repository-big/terra_rawhide.svg?header=Terra+Rawhide)](https://repology.org/repository/terra_rawhide)

 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.
@@ -1,26 +1,18 @@
-%global xurl https://files.pythonhosted.org/packages/51/5f/6f52b958fe38a36a0799c01fbd56a742ebdfcf41f89438dbee998b8ce692/anki-24.06.3-cp39-abi3-manylinux_2_28_x86_64.whl
-%global aurl https://files.pythonhosted.org/packages/df/bb/b0bfbc6a06a598b0b614d18dd8c4f40827828649f9742f1f44a4e44d6a2c/anki-24.06.3-cp39-abi3-manylinux_2_31_aarch64.whl
-%global qurl https://files.pythonhosted.org/packages/21/2a/d8e22a9521be04ef29a30d21a2c3008783ab03b6f07cc14696a040f747a4/aqt-24.06.3-py3-none-any.whl
-
 Name:			anki-bin
-Version:		24.06.3
-Release:		1%?dist
+Version:		23.12.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-pip rpm_macro(fdupes) cargo
+BuildRequires:	python3-pip rpm_macro(fdupes)
 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
-%endif
-Source1:		%qurl
+Source0:		https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
+Source1:		https://files.pythonhosted.org/packages/py3/a/aqt/aqt-%{version}-py3-none-any.whl
 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
@@ -1,15 +1 @@
-let aarch64_regex = `<a href="https://files\.pythonhosted\.org/packages/(..)/(..)/(.{60})/anki-([\d.]+)-cp(\d+)-abi3-manylinux_.+?_aarch64.whl">`;
-let html = get("https://pypi.org/project/anki/");
-let relevant = find(aarch64_regex, html, 0);
-let ver = find(aarch64_regex, relevant, 4);
-rpm.version(ver);
-if rpm.changed() {
-    rpm.release();
-    rpm.global("aurl", find(`"(.+)"`, relevant, 1));
-    let cp = find(aarch64_regex, relevant, 5);
-    let x86_64_regex = `<a href="https://files\.pythonhosted\.org/packages/(..)/(..)/(.{60})/anki-${ver}-cp${cp}-abi3-manylinux_.+?_x86_64.whl">`;
-    let relevant1 = find(x86_64_regex, html, 0);
-    rpm.global("xurl", find(`"(.+)"`, relevant1, 1));
-    let qhtml = get("https://pypi.org/project/aqt/");
-    rpm.global("qurl", find(`<a href="(https://files\.pythonhosted\.org/packages/../../.{60}/aqt-${ver}-py3-none.any.whl)">`, qhtml, 1));
-}
+rpm.version(gh("ankitects/anki"));
@@ -1,6 +1,6 @@
 Name:           anki-qt5
-Version:        24.06.3
-Release:        1%?dist
+Version:        23.12.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/
@@ -20,10 +20,9 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
 Anki is based on a theory called spaced repetition.

 %prep
-rm -rf ./*
 git clone https://github.com/ankitects/anki .
 git checkout %version
-%patch 1 -p1
+%patch1 -p1

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

@@ -1,6 +1,6 @@
 Name:           anki
-Version:        24.06.3
-Release:        1%?dist
+Version:        23.12.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/
@@ -20,10 +20,8 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
 Anki is based on a theory called spaced repetition.

 %prep
-rm -rf *
 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.7
-Release:		1%?dist
+Version:		3.2.6
+Release:		1%{?dist}
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
 URL:			https://github.com/ArmCord/ArmCord
@@ -26,7 +26,6 @@ Source2:		https://raw.githubusercontent.com/ArmCord/ArmCord/v%version/README.md
 Requires:		electron xdg-utils
 ExclusiveArch:	x86_64 aarch64 armv7l
 Conflicts:		armcord
-BuildRequires:	add-determinism

 %description
 ArmCord is a custom client designed to enhance your Discord experience
@@ -1,15 +1,15 @@
 %define debug_package %nil

 Name:		armcord
-Version:	3.2.7
-Release:	1%?dist
+Version:	3.2.6
+Release:	1%{?dist}
 License:	OSL-3.0
 Summary:	Custom lightweight Discord client designed to enhance your experience
 URL:		https://github.com/ArmCord/ArmCord
 Group:		Applications/Internet
 Source1:	launch.sh
 Requires:	electron xdg-utils
-BuildRequires:	nodejs-npm git add-determinism
+BuildRequires:	nodejs-npm git
 Conflicts:	armcord-bin
 BuildArch:	noarch

@@ -18,7 +18,6 @@ ArmCord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

 %prep
-rm -rf *
 git clone %url .
 git checkout v%version

@@ -6,12 +6,12 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

 Name:           discord-canary-openasar
-Version:        0.0.453
-Release:        1%?dist
+Version:        0.0.267
+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-canary
-Version:        0.0.453
-Release:        1%?dist
+Version:        0.0.267
+Release:        1%{?dist}
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
 Source0:        https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
@@ -6,8 +6,8 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.60
-Release:        1%?dist
+Version:        0.0.42
+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.95
-Release:        1%?dist
+Version:        0.0.66
+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.95
-Release:        1%?dist
+Version:        0.0.66
+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.60
-Release:		1%?dist
+Version:		0.0.42
+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
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "envision.spec"
-    }
-}
@@ -1,46 +0,0 @@
-%global commit 6cf5e40b96d1cbd99a3cfcef1f03899356e79448
-%global commit_date 20240703
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name:           envision
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
-License:        AGPL-3.0-or-later
-URL:            https://gitlab.com/gabmus/envision/
-Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo 
-BuildRequires:  pkgconfig(glib-2.0) >= 2.66
-BuildRequires:  pkgconfig(gio-2.0) >= 2.66
-BuildRequires:  pkgconfig(gtk4) >= 4.10.0
-BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  openssl-devel
-BuildRequires:  libappstream-glib
-BuildRequires:  desktop-file-utils
-BuildRequires:  glib2-devel
-Recommends:     android-tools
-
-%description
-%summary.
-
-%prep
-%autosetup -n envision-%commit
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/envision
-%_datadir/applications/org.gabmus.envision.desktop
-%_datadir/envision/
-%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.svg
-%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg
-%_metainfodir/org.gabmus.envision.appdata.xml
@@ -1,5 +0,0 @@
-rpm.global("commit", gitlab_commit("gitlab.com", "46446166", "main"));
-if rpm.changed() {
-	rpm.global("commit_date", date());
-	rpm.release();
-}
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "feishin.spec"
-  }
-}
@@ -1,69 +0,0 @@
-%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:			feishin
-Version:		0.7.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:	nodejs-npm jq libxcrypt-compat
-
-%description
-%summary.
-
-%prep
-%autosetup
-
-cat package.json | jq '.author += { "email": "jeffvictorli@gmail.com" }' | jq '.build.linux += { "maintainer": "mado@fyralabs.com", "vendor": "Fyra Labs Terra" }' > a
-mv a package.json
-cat package.json
-
-cat<<EOF > feishin.desktop
-[Desktop Entry]
-Type=Application
-Name=Feishin
-Comment=Rewrite of Sonixd
-Exec=/usr/bin/feishin
-Icon=feishin
-Terminal=false
-Categories=Network;Audio;Music
-Keywords=Music;Jellyfin;Audio;Stream;Sonixd
-EOF
-
-%build
-npm install --legacy-peer-deps
-npm run postinstall
-npm run build
-%ifarch x86_64
-
-%define a linux
-%elifarch aarch64
-%define a arm64
-%endif
-
-npx electron-builder --linux dir --%a
-
-%install
-mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir
-mv release/build/*-unpacked %buildroot%_datadir/feishin
-install -Dm644 assets/icons/icon.png %buildroot%_datadir/pixmaps/feishin.png
-ln -s %_datadir/feishin/feishin %buildroot%_bindir/feishin
-install -Dm644 feishin.desktop %buildroot%_datadir/applications/
-
-%files
-%doc README.md CHANGELOG.md
-%license LICENSE
-%_bindir/feishin
-%_datadir/feishin/
-%_datadir/applications/feishin.desktop
-%_datadir/pixmaps/feishin.png
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(gh("jeffvli/feishin"));
@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-	  spec = "mpv-nightly.spec"
-  }
-  labels {
-    nightly = "1"
-  }
-}
@@ -1,230 +0,0 @@
-%global commit ed77616f2953423b8cfa181ef41fb1423cb003ec
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240718
-%global ver v0.38.0
-
-Name:           mpv-nightly
-Version:        %ver^%commit_date.%shortcommit
-Release:        1%?dist
-
-License:        GPL-2.0-or-later AND LGPL-2.1-or-later
-Summary:        Movie player playing most video formats and DVDs
-URL:            https://mpv.io/
-Source0:        https://github.com/mpv-player/mpv/archive/%commit/mpv-%commit.tar.gz
-Conflicts:		mpv
-
-BuildRequires:  desktop-file-utils
-BuildRequires:  gcc
-BuildRequires:  libappstream-glib
-BuildRequires:  libatomic
-BuildRequires:  meson
-BuildRequires:  python3-docutils
-
-BuildRequires:  perl(Encode)
-BuildRequires:  perl(Math::BigInt)
-BuildRequires:  perl(Math::BigRat)
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(caca)
-BuildRequires:  pkgconfig(dvdnav)
-BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(ffnvcodec)
-BuildRequires:  pkgconfig(gbm)
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libarchive) >= 3.4.0
-BuildRequires:  pkgconfig(libass)
-BuildRequires:  pkgconfig(libavcodec) >= 59.27.100
-BuildRequires:  pkgconfig(libavdevice) >= 58.13.100
-BuildRequires:  pkgconfig(libavfilter) >= 7.110.100
-BuildRequires:  pkgconfig(libavformat) >= 59.24.100
-BuildRequires:  pkgconfig(libavutil) >= 57.24.100
-BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio)
-BuildRequires:  pkgconfig(libcdio_paranoia)
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(libjpeg)
-BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.19
-BuildRequires:  pkgconfig(libplacebo) >= 6.338.0
-BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libswresample) >= 3.9.100
-BuildRequires:  pkgconfig(libswscale) >= 5.9.100
-BuildRequires:  pkgconfig(libva)
-BuildRequires:  pkgconfig(lua-5.1)
-BuildRequires:  pkgconfig(mujs)
-BuildRequires:  pkgconfig(openal)
-BuildRequires:  pkgconfig(rubberband)
-BuildRequires:  pkgconfig(sdl2)
-BuildRequires:  pkgconfig(shaderc)
-BuildRequires:  pkgconfig(uchardet) >= 0.0.5
-BuildRequires:  pkgconfig(vapoursynth)
-BuildRequires:  pkgconfig(vdpau)
-BuildRequires:  pkgconfig(vulkan)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-cursor)
-BuildRequires:  pkgconfig(wayland-egl)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xdamage)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xinerama)
-BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(xpresent)
-BuildRequires:  pkgconfig(xrandr)
-BuildRequires:  pkgconfig(xscrnsaver)
-BuildRequires:  pkgconfig(xv)
-BuildRequires:  pkgconfig(zimg) >= 2.9
-BuildRequires:  pkgconfig(zlib)
-
-Requires:       hicolor-icon-theme
-Provides:       mplayer-backend
-Recommends:     (yt-dlp or youtube-dl)
-Suggests:       yt-dlp
-
-%description
-Mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
-of video file formats, audio and video codecs, and subtitle types. Special
-input URL types are available to read input from a variety of sources other
-than disk files. Depending on platform, a variety of different video and audio
-output methods are supported.
-
-Mpv has an OpenGL, Vulkan, and D3D11 based video output that is capable of many
-features loved by videophiles, such as video scaling with popular high quality
-algorithms, color management, frame timing, interpolation, HDR, and more.
-
-While mpv strives for minimalism and provides no real GUI, it has a small
-controller on top of the video for basic control.
-
-Mpv can leverage most hardware decoding APIs on all platforms. Hardware
-decoding can be enabled at runtime on demand.
-
-Powerful scripting capabilities can make the player do almost anything. There
-is a large selection of user scripts on the wiki.
-
-A straightforward C API was designed from the ground up to make mpv usable as
-a library and facilitate easy integration into other applications.
-
-%package libs
-Summary: Dynamic library for Mpv frontends
-
-%description libs
-This package contains the dynamic library libmpv, which provides access to Mpv.
-
-%package devel
-Summary: Development package for libmpv
-Provides: mpv-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: mpv-nightly-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: mpv-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: mpv-nightly-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: mpv-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: mpv-nightly-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This package contains development header files and libraries for Mpv.
-
-%prep
-%autosetup -p1 -n mpv-%commit
-sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf
-
-%build
-%meson --auto-features=auto \
-    -Dalsa=enabled \
-    -Dbuild-date=false \
-    -Dcaca=enabled \
-    -Dcdda=enabled \
-    -Dcplayer=true \
-    -Dcplugins=enabled \
-    -Dcuda-hwaccel=enabled \
-    -Dcuda-interop=enabled \
-    -Ddmabuf-wayland=enabled \
-    -Ddrm=enabled \
-    -Ddvbin=enabled \
-    -Ddvdnav=enabled \
-    -Degl-drm=enabled \
-    -Degl-wayland=enabled \
-    -Degl-x11=enabled \
-    -Degl=enabled \
-    -Dgbm=enabled \
-    -Dgl-x11=enabled \
-    -Dgl=enabled \
-    -Dhtml-build=enabled \
-    -Diconv=enabled \
-    -Djack=enabled \
-    -Djavascript=enabled \
-    -Djpeg=enabled \
-    -Dlcms2=enabled \
-    -Dlibarchive=enabled \
-    -Dlibavdevice=enabled \
-    -Dlibbluray=enabled \
-    -Dlibmpv=true \
-    -Dlua=enabled \
-    -Dmanpage-build=enabled \
-    -Dopenal=enabled \
-    -Dopensles=disabled \
-    -Doss-audio=disabled \
-    -Dpipewire=enabled \
-    -Dplain-gl=enabled \
-    -Dpulse=enabled \
-    -Drubberband=enabled \
-    -Dsdl2-audio=enabled \
-    -Dsdl2-gamepad=enabled \
-    -Dsdl2-video=enabled \
-    -Dsdl2=enabled \
-    -Dsndio=disabled \
-    -Dspirv-cross=disabled \
-    -Duchardet=enabled \
-    -Dvaapi-drm=enabled \
-    -Dvaapi-wayland=enabled \
-    -Dvaapi-x11=enabled \
-    -Dvaapi=enabled \
-    -Dvapoursynth=enabled \
-    -Dvdpau-gl-x11=enabled \
-    -Dvdpau=enabled \
-    -Dvector=enabled \
-    -Dvulkan-interop=disabled \
-    -Dvulkan=enabled \
-    -Dwayland=enabled \
-    -Dwerror=false \
-    -Dx11=enabled \
-    -Dxv=enabled \
-    -Dzimg=enabled \
-    -Dzlib=enabled
-%meson_build
-
-%install
-%meson_install
-
-%check
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/mpv.metainfo.xml
-desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop
-
-%files
-%docdir %{_docdir}/mpv/
-%license LICENSE.GPL LICENSE.LGPL Copyright
-%{_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/
-%config(noreplace) %{_sysconfdir}/mpv/encoding-profiles.conf
-
-%files libs
-%license LICENSE.GPL LICENSE.LGPL Copyright
-%{_libdir}/libmpv.so.2{,.*}
-
-%files devel
-%{_includedir}/mpv/
-%{_libdir}/libmpv.so
-%{_libdir}/pkgconfig/mpv.pc
-
-%changelog
-%autochangelog
@@ -1,8 +0,0 @@
-if filters.contains("nightly") {
-	rpm.global("commit", gh_commit("mpv-player/mpv"));
-	if rpm.changed() {
-		rpm.global("ver", gh("mpv-player/mpv"));
-		rpm.global("commit_date", date());
-		rpm.release();
-	}
-}
@@ -1,6 +0,0 @@
-project pkg {
-    arches = ["x86_64"]
-    rpm {
-        spec = "mugshot.spec"
-    }
-}
@@ -1,62 +0,0 @@
-%global app org.bluesabre.Mugshot
-%global _description %{expand:
-Mugshot is a lightweight user configuration utility for Linux designed for simplicity and ease of
-use. Quickly update your personal profile and sync your updates across applications.}
-
-
-Name:           python-mugshot
-Version:        0.4.3
-Release:        1%?dist
-Summary:        User Management Utility for Linux
-License:        GPL-3.0
-URL:            https://github.com/bluesabre/mugshot
-Source0:        %url/archive/refs/tags/mugshot-%version.tar.gz
-BuildArch:      noarch
-BuildRequires:  python3-devel
-BuildRequires:  python3-pip
-BuildRequires:  python3-distutils-extra
-BuildRequires:  python3-wheel
-BuildRequires:  python3-setuptools
-BuildRequires:  glib2
-BuildRequires:  desktop-file-utils
-BuildRequires:  libappstream-glib
-
-%description %_description
-
-%package -n mugshot
-Requires:       util-linux-user
-Requires:       python3-cairo
-Requires:       python3-pexpect
-Requires:       python3-gobject
-Summary:        User Management Utility for Linux
-
-%description -n mugshot %_description
-
-%prep
-%autosetup -n mugshot-mugshot-%version
-
-%build
-%pyproject_wheel
-
-%install
-%pyproject_install
-%pyproject_save_files -L 'mugshot*'
-install -Dm644 data/glib-2.0/schemas/%{lower:%app}.gschema.xml %buildroot%_datadir/glib-2.0/schemas/
-
-%find_lang mugshot
-
-%check
-#pyproject_check_import
-desktop-file-validate %buildroot%_datadir/applications/%app.desktop
-appstream-util validate-relax --nonet %buildroot%_metainfodir/mugshot.appdata.xml
-
-%files -n mugshot -f %{pyproject_files} -f mugshot.lang
-%doc README.md NEWS
-%license COPYING
-%_bindir/mugshot
-%_datadir/glib-2.0/schemas/%{lower:%app}.gschema.xml
-%_datadir/applications/%app.desktop
-%_datadir/mugshot/
-%_metainfodir/mugshot.appdata.xml
-%_mandir/man1/mugshot.1.gz
-%_iconsdir/hicolor/*/apps/mugshot.svg
@@ -1,3 +0,0 @@
-let v = gh("bluesabre/mugshot");
-v.crop(8);
-rpm.version(v);
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 26
+# Generated by rust2rpm 25
 %bcond_with check
 # aarch64 dist is not available
 %ifarch aarch64
@@ -13,7 +13,7 @@
 %global crate sccache

 Name:           rust-sccache
-Version:        0.8.1
+Version:        0.7.6
 Release:        %autorelease
 Summary:        Ccache-like tool

@@ -89,6 +89,17 @@ use the "default" feature of the "%{crate}" crate.
 %package     -n %{name}+all-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/all) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/azure) = 0.7.4
+Requires:       crate(sccache/dist-client) = 0.7.4
+Requires:       crate(sccache/gcs) = 0.7.4
+Requires:       crate(sccache/gha) = 0.7.4
+Requires:       crate(sccache/memcached) = 0.7.4
+Requires:       crate(sccache/redis) = 0.7.4
+Requires:       crate(sccache/s3) = 0.7.4
+Requires:       crate(sccache/webdav) = 0.7.4

 %description -n %{name}+all-devel %{_description}

@@ -101,6 +112,9 @@ use the "all" feature of the "%{crate}" crate.
 %package     -n %{name}+azure-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/azure) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+azure-devel %{_description}

@@ -113,6 +127,9 @@ use the "azure" feature of the "%{crate}" crate.
 %package     -n %{name}+dist-client-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/dist-client) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+dist-client-devel %{_description}

@@ -121,10 +138,13 @@ use the "dist-client" feature of the "%{crate}" crate.

 %files       -n %{name}+dist-client-devel
 %ghost %{crate_instdir}/Cargo.toml
-
+%if %{with dist_server}
 %package     -n %{name}+dist-server-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/dist-server) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+dist-server-devel %{_description}

@@ -137,6 +157,11 @@ use the "dist-server" feature of the "%{crate}" crate.
 %package     -n %{name}+dist-tests-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/dist-tests) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/dist-client) = 0.7.4
+Requires:       crate(sccache/dist-server) = 0.7.4

 %description -n %{name}+dist-tests-devel %{_description}

@@ -145,10 +170,15 @@ use the "dist-tests" feature of the "%{crate}" crate.

 %files       -n %{name}+dist-tests-devel
 %ghost %{crate_instdir}/Cargo.toml
-
+%endif
 %package     -n %{name}+flate2-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/flate2) = 0.7.4
+Requires:       (crate(flate2) >= 1.0.0 with crate(flate2) < 2.0.0~)
+Requires:       (crate(flate2/rust_backend) >= 1.0.0 with crate(flate2/rust_backend) < 2.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+flate2-devel %{_description}

@@ -161,6 +191,9 @@ use the "flate2" feature of the "%{crate}" crate.
 %package     -n %{name}+gcs-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/gcs) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+gcs-devel %{_description}

@@ -173,6 +206,10 @@ use the "gcs" feature of the "%{crate}" crate.
 %package     -n %{name}+gha-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/gha) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/opendal) = 0.7.4

 %description -n %{name}+gha-devel %{_description}

@@ -182,21 +219,14 @@ use the "gha" feature of the "%{crate}" crate.
 %files       -n %{name}+gha-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+http-body-util-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+http-body-util-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "http-body-util" feature of the "%{crate}" crate.
-
-%files       -n %{name}+http-body-util-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+hyper-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/hyper) = 0.7.4
+Requires:       (crate(hyper/default) >= 0.14.27 with crate(hyper/default) < 0.15.0~)
+Requires:       (crate(hyper/server) >= 0.14.27 with crate(hyper/server) < 0.15.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+hyper-devel %{_description}

@@ -206,21 +236,13 @@ use the "hyper" feature of the "%{crate}" crate.
 %files       -n %{name}+hyper-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+hyper-util-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+hyper-util-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "hyper-util" feature of the "%{crate}" crate.
-
-%files       -n %{name}+hyper-util-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+jwt-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/jwt) = 0.7.4
+Requires:       (crate(jsonwebtoken/default) >= 8.0.0 with crate(jsonwebtoken/default) < 9.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+jwt-devel %{_description}

@@ -233,6 +255,10 @@ use the "jwt" feature of the "%{crate}" crate.
 %package     -n %{name}+libmount-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/libmount) = 0.7.4
+Requires:       (crate(libmount/default) >= 0.1.10 with crate(libmount/default) < 0.2.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+libmount-devel %{_description}

@@ -245,6 +271,11 @@ use the "libmount" feature of the "%{crate}" crate.
 %package     -n %{name}+memcached-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/memcached) = 0.7.4
+Requires:       (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~)
+Requires:       (crate(opendal/services-memcached) >= 0.40.0 with crate(opendal/services-memcached) < 0.41.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+memcached-devel %{_description}

@@ -257,6 +288,9 @@ use the "memcached" feature of the "%{crate}" crate.
 %package     -n %{name}+native-zlib-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/native-zlib) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+native-zlib-devel %{_description}

@@ -269,6 +303,10 @@ use the "native-zlib" feature of the "%{crate}" crate.
 %package     -n %{name}+nix-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/nix) = 0.7.4
+Requires:       (crate(nix/default) >= 0.26.2 with crate(nix/default) < 0.27.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+nix-devel %{_description}

@@ -281,6 +319,10 @@ use the "nix" feature of the "%{crate}" crate.
 %package     -n %{name}+opendal-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/opendal) = 0.7.4
+Requires:       (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+opendal-devel %{_description}

@@ -293,6 +335,10 @@ use the "opendal" feature of the "%{crate}" crate.
 %package     -n %{name}+openssl-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/openssl) = 0.7.4
+Requires:       (crate(openssl/default) >= 0.10.55 with crate(openssl/default) < 0.11.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+openssl-devel %{_description}

@@ -302,21 +348,16 @@ use the "openssl" feature of the "%{crate}" crate.
 %files       -n %{name}+openssl-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+oss-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+oss-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "oss" feature of the "%{crate}" crate.
-
-%files       -n %{name}+oss-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+redis-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/redis) = 0.7.4
+Requires:       (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~)
+Requires:       (crate(opendal/services-redis) >= 0.40.0 with crate(opendal/services-redis) < 0.41.0~)
+Requires:       (crate(opendal/services-redis-rustls) >= 0.40.0 with crate(opendal/services-redis-rustls) < 0.41.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/url) = 0.7.4

 %description -n %{name}+redis-devel %{_description}

@@ -329,6 +370,10 @@ use the "redis" feature of the "%{crate}" crate.
 %package     -n %{name}+reqsign-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/reqsign) = 0.7.4
+Requires:       (crate(reqsign/default) >= 0.14.1 with crate(reqsign/default) < 0.15.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+reqsign-devel %{_description}

@@ -341,6 +386,15 @@ use the "reqsign" feature of the "%{crate}" crate.
 %package     -n %{name}+reqwest-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/reqwest) = 0.7.4
+Requires:       (crate(reqwest/blocking) >= 0.11.0 with crate(reqwest/blocking) < 0.12.0~)
+Requires:       (crate(reqwest/default) >= 0.11.0 with crate(reqwest/default) < 0.12.0~)
+Requires:       (crate(reqwest/json) >= 0.11.0 with crate(reqwest/json) < 0.12.0~)
+Requires:       (crate(reqwest/rustls-tls) >= 0.11.0 with crate(reqwest/rustls-tls) < 0.12.0~)
+Requires:       (crate(reqwest/stream) >= 0.11.0 with crate(reqwest/stream) < 0.12.0~)
+Requires:       (crate(reqwest/trust-dns) >= 0.11.0 with crate(reqwest/trust-dns) < 0.12.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+reqwest-devel %{_description}

@@ -353,6 +407,11 @@ use the "reqwest" feature of the "%{crate}" crate.
 %package     -n %{name}+rouille-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/rouille) = 0.7.4
+Requires:       (crate(rouille) >= 3.6.0 with crate(rouille) < 4.0.0~)
+Requires:       (crate(rouille/ssl) >= 3.6.0 with crate(rouille/ssl) < 4.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+rouille-devel %{_description}

@@ -365,6 +424,11 @@ use the "rouille" feature of the "%{crate}" crate.
 %package     -n %{name}+s3-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/s3) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/opendal) = 0.7.4
+Requires:       crate(sccache/reqsign) = 0.7.4

 %description -n %{name}+s3-devel %{_description}

@@ -377,6 +441,10 @@ use the "s3" feature of the "%{crate}" crate.
 %package     -n %{name}+sha2-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/sha2) = 0.7.4
+Requires:       (crate(sha2/default) >= 0.10.6 with crate(sha2/default) < 0.11.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+sha2-devel %{_description}

@@ -389,6 +457,10 @@ use the "sha2" feature of the "%{crate}" crate.
 %package     -n %{name}+syslog-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/syslog) = 0.7.4
+Requires:       (crate(syslog/default) >= 6.0.0 with crate(syslog/default) < 7.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+syslog-devel %{_description}

@@ -398,9 +470,29 @@ use the "syslog" feature of the "%{crate}" crate.
 %files       -n %{name}+syslog-devel
 %ghost %{crate_instdir}/Cargo.toml

+%{dnl ## BEGIN: multiline comment
+%package     -n %{name}+trust-dns-resolver-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/trust-dns-resolver) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+trust-dns-resolver-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "trust-dns-resolver" feature of the "%{crate}" crate.
+
+%files       -n %{name}+trust-dns-resolver-devel
+%ghost %{crate_instdir}/Cargo.toml
+}    ## END OF multiline comment
+
 %package     -n %{name}+unstable-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/unstable) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+unstable-devel %{_description}

@@ -413,6 +505,10 @@ use the "unstable" feature of the "%{crate}" crate.
 %package     -n %{name}+url-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/url) = 0.7.4
+Requires:       (crate(url/default) >= 2.0.0 with crate(url/default) < 3.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+url-devel %{_description}

@@ -425,6 +521,9 @@ use the "url" feature of the "%{crate}" crate.
 %package     -n %{name}+vendored-openssl-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/vendored-openssl) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+vendored-openssl-devel %{_description}

@@ -437,6 +536,10 @@ use the "vendored-openssl" feature of the "%{crate}" crate.
 %package     -n %{name}+version-compare-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/version-compare) = 0.7.4
+Requires:       (crate(version-compare/default) >= 0.1.1 with crate(version-compare/default) < 0.2.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+version-compare-devel %{_description}

@@ -449,6 +552,10 @@ use the "version-compare" feature of the "%{crate}" crate.
 %package     -n %{name}+webdav-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/webdav) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/opendal) = 0.7.4

 %description -n %{name}+webdav-devel %{_description}

@@ -1,6 +1,6 @@
--- sccache-0.8.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sccache-0.8.1/Cargo.toml	2024-07-10T16:31:31.705674+00:00
-@@ -403,13 +403,3 @@
+--- sccache-0.7.6/Cargo.toml	1970-01-01T00:00:01+00:00
+++ sccache-0.7.6/Cargo.toml	2024-02-02T06:05:53.548100+00:00
+@@ -378,11 +378,3 @@
 [target."cfg(unix)".dependencies.daemonize]
 version = "0.5"
 
@@ -11,6 +11,4 @@
 -    "handleapi",
 -    "stringapiset",
 -    "winnls",
-    "processenv",
-    "std",
 -]
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "tuxclocker.spec"
-  }
-}
@@ -1,42 +0,0 @@
-Name:           tuxclocker
-Version:        1.5.1
-Release:        1%?dist
-Summary:        Qt overclocking tool for GNU/Linux 
-License:        GPL-3.0
-URL:            https://github.com/Lurkki14/tuxclocker
-# boost qt5-qtbase qt5-qtcharts
-Requires:       hicolor-icon-theme
-BuildRequires:  git-core meson hwdata qt5-qttools gettext anda-srpm-macros
-BuildRequires:  boost-devel qt5-qtbase-devel qt5-qtcharts-devel libdrm-devel libXNVCtrl-devel openssl-devel
-Recommends:     xorg-x11-drv-nvidia libdrm libXNVCtrl hwdata
-
-%description
-TuxClocker is a hardware controlling and monitoring program.
-TuxClocker consists of a DBus daemon and a Qt GUI that uses the daemon.
-
-%prep
-git clone --recursive %url .
-git checkout %version
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/tuxclocker-qt
-%_bindir/tuxclockerd
-%_libdir/libtuxclocker.so
-%_libdir/tuxclocker/
-%_datadir/applications/tuxclocker.desktop
-%_datadir/dbus-1/system-services/org.tuxclocker.service
-%_datadir/dbus-1/system.d/org.tuxclocker.conf
-%_datadir/locale/*/LC_MESSAGES/tuxclocker.mo
-%_iconsdir/hicolor/scalable/apps/tuxclocker-logo.svg
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(gh("Lurkki14/tuxclocker"));
@@ -6,8 +6,8 @@

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.3
-Release:	1%?dist
+Version:	1.5.0
+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
@@ -1,6 +1,6 @@
-%global nodev 20.12.2
-%global npmv 10.5.0
-%global ver 0.19.2
+%global nodev 18.13.0
+%global npmv 8.19.3
+%global ver 0.15.2
 %define debug_package %nil
 %global _build_id_links none

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

 License:	GPL-3.0
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu12
+%define _ubuntu_rel 22.10.20220822-0ubuntu6
 %global _hardened_build 0

 Name:           compiz9
@@ -3,8 +3,8 @@

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

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

 Name:           elementary-capnet-assist
 Summary:        Captive Portal Assistant for elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.4.4
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/capnet-assist
@@ -21,13 +21,10 @@ BuildRequires:  pkgconfig(gcr-ui-3)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1) >= 1.0.0
 BuildRequires:  pkgconfig(webkit2gtk-4.1)
-BuildRequires:  pkgconfig(gcr-4)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(webkitgtk-6.0)
 BuildRequires:  fdupes

 Requires:       NetworkManager
@@ -3,8 +3,8 @@

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

 URL:            https://github.com/elementary/icons
@@ -5,13 +5,16 @@

 Name:           elementary-photos
 Summary:        Photo manager and viewer from elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.8.0
+Release:        2%?dist
 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
@@ -19,7 +22,6 @@ BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
 BuildRequires:  fdupes
 BuildRequires:  git-core
-BuildRequires:  cmake

 BuildRequires:  pkgconfig(gee-0.8) >= 0.8.5
 BuildRequires:  pkgconfig(geocode-glib-2.0)
@@ -41,8 +43,6 @@ BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libraw) >= 0.13.2
 BuildRequires:  pkgconfig(libwebp) >= 0.4.4
 BuildRequires:  pkgconfig(sqlite3) >= 3.5.9
-BuildRequires:  pkgconfig(libportal)
-BuildRequires:  pkgconfig(libportal-gtk3)

 Requires:       hicolor-icon-theme

@@ -53,6 +53,7 @@ Foundation.

 %prep
 %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
@@ -74,10 +75,10 @@ desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

 desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{appname}.viewer.desktop
+    %{buildroot}/%{_datadir}/applications/%{appname}-viewer.desktop

 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml


 %files -f %{appname}.lang
@@ -91,11 +92,11 @@ appstream-util validate-relax --nonet \
 %{_libexecdir}/%{appname}/

 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/applications/%{appname}.viewer.desktop
+%{_datadir}/applications/%{appname}-viewer.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/icons/hicolor/*/apps/%{appname}.viewer.svg
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg
+%{_datadir}/metainfo/%{appname}.appdata.xml


 %changelog
@@ -3,8 +3,8 @@

 Name:           elementary-shortcut-overlay
 Summary:        Native, OS-wide shortcut overlay
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.0.1
+Release:        %autorelease
 License:        GPL-3.0

 URL:            https://github.com/elementary/shortcut-overlay
@@ -49,7 +49,7 @@ desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml


 %files -f %{appname}.lang
@@ -59,7 +59,7 @@ appstream-util validate-relax --nonet \
 %{_bindir}/%{appname}

 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml


 %changelog
@@ -3,8 +3,8 @@
 
 Name:           elementary-sideload
 Summary:        Sideload flatpaks on Pantheon
-Version:        6.2.2
-Release:        1%?dist
+Version:        6.2.1
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/sideload
@@ -3,8 +3,8 @@

 Name:           elementary-terminal
 Summary:        The terminal of the 21st century
-Version:        6.2.0
-Release:        1%?dist
+Version:        6.1.2
+Release:        2%{?dist}
 License:        LGPL-3.0

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

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

 URL:            https://github.com/elementary/stylesheet
@@ -3,9 +3,8 @@
 Name:           gala
 Summary:        Gala window manager
 Version:        7.1.3
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
-Epoch:          1

 URL:            https://github.com/elementary/gala
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -36,7 +35,7 @@ BuildRequires:  pkgconfig(mutter-clutter-13)
 BuildRequires:  pkgconfig(mutter-cogl-13)
 BuildRequires:  pkgconfig(mutter-cogl-pango-13)

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

 # gala provides a generic icon (apps/multitasking-view)
 Requires:       hicolor-icon-theme
@@ -62,7 +61,7 @@ This package contains the shared libraries.

 %package        devel
 Summary:        Gala window manager development files
-Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}

 %description    devel
 Gala is Pantheon's Window Manager, part of the elementary project.
@@ -5,8 +5,8 @@ apps built for elementary.}

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

 URL:            https://github.com/elementary/granite
@@ -82,7 +82,6 @@ desktop-file-validate \

 %{_datadir}/metainfo/granite-7.metainfo.xml
 %{_datadir}/icons/hicolor/*/apps/io.elementary.granite-7.svg
-%{_datadir}/themes/Granite/


 %files devel
@@ -3,8 +3,8 @@

 Name:           pantheon-agent-polkit
 Summary:        Pantheon Polkit Agent
-Version:        8.0.0
-Release:        1%?dist
+Version:        1.0.5
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -18,12 +18,10 @@ BuildRequires:  vala >= 0.34.1
 BuildRequires:  fdupes

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
+BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(polkit-agent-1)
 BuildRequires:  pkgconfig(polkit-gobject-1)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite-7)
-BuildRequires:  pkgconfig(gtk4)

 %description
 An agent for Polkit authorization designed for Pantheon.
@@ -52,7 +50,7 @@ desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml


 %files -f %{appname}.lang
@@ -64,7 +62,7 @@ appstream-util validate-relax --nonet \
 %{_libexecdir}/policykit-1-pantheon/

 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml


 %changelog
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "pantheon-tweaks.spec"
+	}
+}
@@ -0,0 +1,37 @@
+Name:			pantheon-tweaks
+Version:		1.1.2
+Release:		1%{?dist}
+Summary:		A system settings panel for the Pantheon desktop environment
+License:		GPL-3.0
+URL:			https://github.com/pantheon-tweaks/pantheon-tweaks
+Source0:		%{url}/archive/refs/tags/%{version}.tar.gz
+BuildRequires:	vala switchboard-devel pkgconfig(gee-0.8) pkgconfig(glib-2.0)
+BuildRequires:	granite-devel >= 6.0.0 pkgconfig(gtk+-3.0) meson vala
+Requires:		gtk3 granite
+
+%description
+A system settings panel for the Pantheon Desktop that
+lets you easily and safely customise your desktop's appearance.
+
+%prep
+%autosetup
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+%files
+%doc README.md
+%license COPYING
+/usr/lib64/switchboard/personal/libpantheon-tweaks.so
+%{_datadir}/icons/hicolor/32x32/categories/preferences-desktop-tweaks.svg
+%{_datadir}/locale/*/LC_MESSAGES/pantheon-tweaks-plug.mo
+%{_datadir}/metainfo/pantheon-tweaks.metainfo.xml
+
+
+%changelog
+* Tue Jan 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.0.4-1
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gh("pantheon-tweaks/pantheon-tweaks"));
@@ -2,20 +2,16 @@

 %global plug_type personal
 %global plug_name pantheon-tweaks
-%global app io.github.pantheon_tweaks.pantheon-tweaks

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

 URL:            https://github.com/pantheon-tweaks/pantheon-tweaks
 Source0:        %{url}/archive/%{version}/%{plug_name}-%{version}.tar.gz

-Provides:       pantheon-tweaks = %version-%release
-Obsoletes:      pantheon-tweaks < 2.0.2-2
-
 BuildRequires:  gcc
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -26,7 +22,7 @@ BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite) >= 6.0.0
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  pkgconfig(switchboard-2.0)

 Requires:       switchboard%{?_isa}

@@ -67,22 +63,28 @@ de trabalho.
 %install
 %meson_install

-%find_lang %{plug_name}
+%find_lang %{plug_name}-plug

 # remove the specified stock icon from metainfo (invalid in libappstream-glib)
-sed -i '/icon type="stock"/d' %buildroot%_metainfodir/%app.metainfo.xml
+sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml

 %check
-appstream-util validate-relax --nonet %buildroot%_metainfodir/%app.metainfo.xml
+appstream-util validate-relax --nonet \
+    %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml


-%files -f %{plug_name}.lang
+%files -f %{plug_name}-plug.lang
 %license COPYING
 %doc README.md
 %doc AUTHORS
 %doc CONTRIBUTORS

-%_bindir/pantheon-tweaks
-%_datadir/applications/%app.desktop
-%_iconsdir/hicolor/*/apps/%app.svg
-%_metainfodir/io.github.pantheon_tweaks.pantheon-tweaks.metainfo.xml
+%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
+
+%{_datadir}/metainfo/%{plug_name}.metainfo.xml
+%{_datadir}/icons/hicolor/*/categories/preferences-*.svg
+
+
+%changelog
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+- Repackaged for Terra
@@ -4,11 +4,11 @@

 %global plug_type hardware
 %global plug_name wacom
-%global plug_rdnn io.elementary.settings.wacom
+%global plug_rdnn io.elementary.switchboard.wacom

 Name:           switchboard-plug-wacom
 Summary:        Switchboard Wacom Plug
-Version:        8.0.0
+Version:        1.0.1
 Release:        1%?dist
 License:        GPL-3.0-or-later

@@ -25,7 +25,7 @@ BuildRequires:  pkgconfig(libwacom)
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xi)
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  switchboard-devel

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -45,18 +45,22 @@ Supplements:    switchboard%{?_isa}
 %install
 %meson_install

-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug


 %check
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml


-%files -f %{plug_rdnn}.lang
+%files -f %{plug_name}-plug.lang
 %doc README.md
 %license COPYING

-%{_libdir}/switchboard-3/%{plug_type}/lib%{plug_name}.so
+%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so

-%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.0.1-1
+- Initial package.
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "switchboard-plug-wallet.spec"
+	}
+}
@@ -0,0 +1,62 @@
+%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
+
+%global srcname switchboard-plug-wallet
+
+%global plug_type personal
+%global plug_name wallet
+%global plug_rdnn io.elementary.switchboard.wallet
+
+%global commit 50582fc7ee43a4b47647d04786dcf1d0eb45af36
+
+Name:           switchboard-plug-wallet
+Summary:        Switchboard Wallet Plug
+Version:        %(c=%commit; echo ${c:0:7})
+Release:        2%?dist
+License:        GPL-3.0-or-later
+
+URL:            https://github.com/elementary/%name
+Source0:        %url/archive/%version/%srcname-%version.tar.gz
+
+BuildRequires:  libappstream-glib
+BuildRequires:  meson
+BuildRequires:  vala
+BuildRequires:  fdupes
+
+BuildRequires:  pkgconfig(granite) >= 0.5
+BuildRequires:  gtk3-devel
+BuildRequires:  pkgconfig(libsecret-1)
+BuildRequires:  switchboard-devel
+
+Requires:       switchboard%{?_isa}
+Supplements:    switchboard%{?_isa}
+
+%description
+Manage Payment Methods and related settings.
+
+
+%prep
+%autosetup -n %srcname-%commit -p1
+
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+%fdupes %buildroot%_datadir/icons/hicolor
+
+
+%files
+%doc README.md
+%license COPYING
+
+%_libdir/switchboard/%plug_type/lib%plug_rdnn.so
+%_datadir/icons/hicolor/*/apps/%plug_rdnn.svg
+%_datadir/locale/*/LC_MESSAGES/%plug_rdnn.mo
+
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - bfe73dfb95d9b46a0a34e0db35a178233c8552b0-1
+- Initial package.
@@ -0,0 +1,3 @@
+let req = new_req("https://api.github.com/repos/elementary/switchboard-plug-wallet/commits/HEAD");
+req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
+rpm.global("commit", json(req.get()).sha);
@@ -1,10 +1,10 @@
 %global srcname switchboard
-%global appname io.elementary.settings
+%global appname io.elementary.switchboard

 Name:           switchboard
 Summary:        Modular Desktop Settings Hub
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.0.2
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -16,10 +16,12 @@ BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala

-BuildRequires:  pkgconfig(granite-7)
-BuildRequires:  pkgconfig(gtk4)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  fdupes sassc
+BuildRequires:  pkgconfig(gee-0.8)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(granite) >= 5.4.0
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libhandy-1) >= 0.83.0
+BuildRequires:  fdupes

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

@@ -90,7 +92,7 @@ appstream-util validate-relax --nonet \

 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_iconsdir}/hicolor/*/apps/%{appname}.svg
+%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
 %{_datadir}/metainfo/%{appname}.appdata.xml

 %files libs
@@ -100,14 +102,19 @@ appstream-util validate-relax --nonet \
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/*

-%{_libdir}/lib%{name}-3.so.0
-%{_libdir}/lib%{name}-3.so.2.0
+%{_libdir}/lib%{name}-2.0.so.0
+%{_libdir}/lib%{name}-2.0.so.2.0

 %files devel
-%{_includedir}/%{name}-3/
+%{_includedir}/%{name}-2.0/

-%{_libdir}/lib%{name}-3.so
-%{_libdir}/pkgconfig/%{name}-3.pc
+%{_libdir}/lib%{name}-2.0.so
+%{_libdir}/pkgconfig/%{name}-2.0.pc

-%{_datadir}/vala/vapi/%{name}-3.deps
-%{_datadir}/vala/vapi/%{name}-3.vapi
+%{_datadir}/vala/vapi/%{name}-2.0.deps
+%{_datadir}/vala/vapi/%{name}-2.0.vapi
+
+
+%changelog
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.0.2-1
+- Repackaged for Terra
@@ -9,7 +9,6 @@ Summary:        Stylish top panel
 Version:        3.0.5
 Release:        1%{?dist}
 License:        GPL-2.0-or-later
-Epoch:          1

 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -33,7 +32,7 @@ BuildRequires:  pkgconfig(mutter-clutter-13)
 BuildRequires:  pkgconfig(mutter-cogl-13)
 BuildRequires:  pkgconfig(mutter-cogl-pango-13)

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

 # wingpanel ayatana appindicator support was abandoned by upstream
 # wingpanel-indicator-ayatana-2.0.3-10.fc32 retired for fedora 33+
@@ -44,8 +43,8 @@ Obsoletes:      wingpanel-indicator-ayatana < 2.0.3-11

 %package        libs
 Summary:        Stylish top panel (shared library)
-Enhances:       %{name} = %{epoch}:%{version}-%{release}
-Enhances:       %{name}-devel = %{epoch}:%{version}-%{release}
+Enhances:       %{name} = %{version}-%{release}
+Enhances:       %{name}-devel = %{version}-%{release}

 %description    libs %{common_description}

@@ -54,7 +53,7 @@ This package contains the shared library.

 %package        devel
 Summary:        Stylish top panel (development files)
-Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}

 %description    devel %{common_description}

@@ -1,13 +1,12 @@
 # from Fedora upstream
 %global extension   pop-shell
 %global uuid        %{extension}@system76.com
-%global commit      9418d0a9af7c9b30b61ac3eeb5ca432a3ad3e651
+%global commit      cf3c932b55d5c247906efe9d81f988ee092d9f51
 %global shortcommit %{lua:print(macros.commit:sub(1,7))}
-%global commit_date 20240401
 %global ver         1.2.0

 Name:           terra-gnome-shell-extension-%{extension}
-Version:        %{ver}^%commit_date.%{shortcommit}
+Version:        %{ver}^%{shortcommit}
 Release:        1%?dist
 Summary:        GNOME Shell extension for advanced tiling window management
 License:        GPL-3.0-only
@@ -1,8 +1,4 @@
 if filters.contains("nightly") {
-  rpm.global("commit", gh_commit("pop-os/shell"));
-  if rpm.changed() {
-    rpm.global("ver", gh("pop-os/shell"));
-    rpm.release();
-    rpm.global("commit_date", date());
-  }
+  rpm.global("commit", get("https://api.github.com/repos/pop-os/shell/commits/HEAD").json().sha);
+  rpm.global("ver", gh("pop-os/shell"));
 }
@@ -5,7 +5,7 @@

 # https://github.com/FyshOS/fynedesk
 %global goipath         github.com/FyshOS/fynedesk
-Version:                0.4.0
+Version:                0.3.0

 %gometa -f

@@ -17,7 +17,7 @@ A full desktop environment for Linux/Unix using Fyne.}
 %global godocs          AUTHORS README.md CHANGELOG.md

 Name:           %{goname}
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        A full desktop environment for Linux/Unix using Fyne

 License:        BSD-3-Clause
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit b4b16f61f1d69c994701f149e54335c40b9b201d
+%global commit 131ee4d39ce8913b2de8f9a673903225345c7a38
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -9,7 +9,7 @@ Name:     latte-dock-nightly
 Version:  0.10.0^%{snapshot_info}

 %forgemeta
-Release:  1%?dist
+Release:  1%{?dist}
 Summary:  Latte is a dock based on plasma frameworks
 License:  GPL-2.0-or-later

@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit af441bdb31bb76b207119a8c91eef3fa93c0c078
+%global commit d3bc3b7296a01f6b020e32080c9c40dd1c656b05
 %forgemeta

 Name:           lomiri-app-launch
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager
-%global commit 682c4928a91da598767e0be2496d9c35af7db035
+%global commit 2c7d6921ac56862c197958f4e5c31aa76a1a50e1
 %forgemeta

 Name:       lomiri-download-manager
-Version:    0.1.3
-Release:    1%{?dist}
+Version:    0.1.2
+Release:    %autorelease
 Summary:    Upload Download Manager for Lomiri
 License:    LGPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-download-manager
@@ -23,7 +23,6 @@ BuildRequires: qt5-qtdeclarative-devel
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(libglog)
 BuildRequires: pkgconfig(liblomiri-api)
-BuildRequires: pkgconfig(systemd)
 BuildRequires: fdupes

 %description
@@ -61,7 +60,7 @@ sed -e "s/-Werror//g" -i CMakeLists.txt

 %files -f %{name}.lang
 %license COPYING
-%config /usr/etc/dbus-1/system.d/*.conf
+%config %{_sysconfdir}/dbus-1/system.d/*.conf
 %{_bindir}/lomiri-*
 %{_userunitdir}/*.service
 %{_libdir}/liblomiri-download-manager-client.so.*
@@ -1,7 +0,0 @@
-let o = get("https://gitlab.com/api/v4/projects/17088252/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);
-}
@@ -30,7 +30,6 @@ BuildRequires: pkgconfig(libgmenuharness)
 BuildRequires: pkgconfig(ofono)
 BuildRequires: pkgconfig(qofono-qt5)
 BuildRequires: pkgconfig(lomiri-url-dispatcher)
-BuildRequires: pkgconfig(systemd)
 Requires:      gmenuharness

 %description
@@ -65,7 +64,7 @@ The %{name}-doc package contains documentation files for %{name}.
 %files -f %{name}.lang
 %doc README.md
 %license COPYING COPYING.LGPL
-%config /usr/etc/xdg/autostart/lomiri-indicator-network.desktop
+%config %{_sysconfdir}/xdg/autostart/lomiri-indicator-network.desktop
 %{_userunitdir}/*.service
 %{_libdir}/liblomiri-connectivity-qt1.so.*
 %dir %{_qt5_qmldir}/Lomiri/Connectivity
@@ -92,7 +91,10 @@ The %{name}-doc package contains documentation files for %{name}.
 %{_libdir}/pkgconfig/lomiri-connectivity-qt1.pc

 %files doc
-%{_docdir}/lomiri-indicator-network
+%dir %{_docdir}/lomiri-connectivity-doc
+%{_docdir}/lomiri-connectivity-doc/cpp/
+%{_docdir}/lomiri-connectivity-doc/dbus/
+%{_docdir}/lomiri-connectivity-doc/qml/

 %changelog
 %autochangelog
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas
-%global commit 814c0b16b3753fef918bfe624710cb4809a690fa
+%global commit 6acdde9e890685bd5a5d6fbd4446d9e8b3e6c698
 %forgemeta

 Name:       lomiri-schemas
-Version:    0.1.5
-Release:    1%?dist
+Version:    0.1.4
+Release:    1%{?dist}
 Summary:    Configuration schemas for lomiri
 License:    LGPL-2.0-or-later
 URL:        https://gitlab.com/ubports/development/core/lomiri-schemas
@@ -1,15 +1,16 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit aacd2e4704112468b44332e8c8b1f7445651b8da
+%global commit ad39d8a88e71320c2d6f1a39a96bfe421f644519
 %forgemeta

 Name:       lomiri-system-settings
-Version:    1.1.0
-Release:    1%?dist
+Version:    1.0.2
+Release:    1%{?dist}
 Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
 Source0:    %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
 Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch
+Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch

 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
-%global commit 454d980c352f3cea725458ff8a3d04ae686d2a96
+%global commit 28178b0be8fc2c66934da155dee1c6238ecc98c0
 %forgemeta

 Name:           lomiri-ui-toolkit
@@ -1,5 +1,2 @@
-rpm.version(gitlab_tag("19057685"));
-if rpm.changed() {
-	rpm.global("commit", gitlab_commit("19057685", "main"));
-	rpm.release();
-}
+rpm.version(get("https://gitlab.com/api/v4/projects/19057685/repository/tags").json_arr()[0].name);
+rpm.global("commit", get("https://gitlab.com/api/v4/projects/19057685/repository/commits").json_arr()[0].id);
@@ -1,4 +1,2 @@
-rpm.version(gitlab_tag("17424894"));
-if rpm.changed() {
-	rpm.global("commit", get("https://gitlab.com/api/v4/projects/17424894/repository/commits").json_arr()[0].id);
-}
+rpm.version(get("https://gitlab.com/api/v4/projects/17424894/repository/tags").json_arr()[0].name);
+rpm.global("commit", get("https://gitlab.com/api/v4/projects/17424894/repository/commits").json_arr()[0].id);
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit 426b9f3436938f149490cee340e1fab79ee7b650
+%global commit a083a14fe65105fc1996ceb1b92165ca3b0cb94e
 %forgemeta

 Name:          lomiri
@@ -1,4 +1,3 @@
-rpm.version(gitlab_tag("25716028"));
-if rpm.changed() {
-	rpm.global("commit", get("https://gitlab.com/api/v4/projects/25716028/repository/commits").json_arr()[0].id);
-}
+let o = get("https://gitlab.com/api/v4/projects/25716028/repository/tags").json_arr()[0];
+rpm.version(o.name);
+rpm.global("commit", get("https://gitlab.com/api/v4/projects/25716028/repository/commits").json_arr()[0].id);
@@ -1,4 +1,4 @@
-%global rn 4
+%global rn 1

 Name:           unity-greeter
 Version:        23.10.1
@@ -1,9 +1,9 @@
-%define _ubuntu_rel 1ubuntu4
+%define _ubuntu_rel 1ubuntu1

 Name:    unity-session
 Summary: Lightdm profile for Unity 7
-Version: 46.0
-Release: 1%?dist
+Version: 45.0
+Release: 1%{?dist}

 License:   GPL-2.0
 URL:       https://packages.ubuntu.com/jammy/unity-session
@@ -1,4 +1,4 @@
-%define archive unity_7.7.0+23.04.20230222.2-0ubuntu7.tar.xz
+%define archive unity_7.7.0+23.04.20230222.2-0ubuntu4.tar.xz

 Name:		unity-shell
 Version:	7.7.0
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-datetime
 Summary:    A GTK implementation of the StatusNotifierItem Specification
-Version:    24.5.0
-Release:    1%?dist
+Version:    23.10.1
+Release:    1%{?dist}
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-datetime
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -38,7 +38,7 @@ Unity7 desktop and Lomiri desktop.

 %build
 %cmake -DENABLE_LOMIRI_FEATURES=ON \
-       -DENABLE_TESTS=OFF\
+       -DENABLE_TESTS=ON \
       -DENABLE_COVERAGE=OFF \
 %cmake_build

@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-messages
 Summary:    Ayatana Indicator Messages Applet
-Version:    24.5.0
-Release:    1%?dist
+Version:    23.10.0
+Release:    %autorelease
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-messages
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-notifications
 Summary:    Ayatana Indicator Notifications Applet
-Version:    23.10.1
-Release:    1%?dist
+Version:    23.10.0
+Release:    1%{?dist}
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-notifications
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-session
 Summary:    Ayatana Indicator Session Applet
-Version:    24.5.0
-Release:    1%?dist
+Version:    23.10.3
+Release:    1%{?dist}
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-session
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-sound
 Summary:    Ayatana Indicator Sound Applet
-Version:    24.5.0
-Release:    1%?dist
+Version:    23.10.3
+Release:    1%{?dist}
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-sound
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,6 +0,0 @@
-project pkg {
-  arches = ["x86_64"]
-  rpm {
-    spec = "asar.spec"
-  }
-}
@@ -1,41 +0,0 @@
-%define debug_package %nil
-%define __strip /bin/true
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
-
-Name:           asar
-Version:        3.2.10
-Release:        1%?dist
-Summary:        Simple extensive tar-like archive format with indexing
-License:        MIT
-URL:            https://github.com/electron/asar
-Source0:        %url/archive/refs/tags/v%version.tar.gz
-Requires:       nodejs
-BuildRequires:  nodejs-npm
-BuildArch:      noarch
-
-%description
-Asar is a simple extensive archive format, it works like `tar` that concatenates all files
-together without compression, while having random access support.
-
-%prep
-%autosetup
-
-%build
-
-%install
-mkdir -p %buildroot%_bindir
-PATH="$PATH:%buildroot%_bindir"
-npm install -g --prefix %buildroot%_prefix %SOURCE0
-
-%files
-%doc README.md
-%license LICENSE.md
-%_bindir/asar
-%_prefix/lib/node_modules/@electron/asar/
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(gh("electron/asar"));
@@ -1,6 +1,6 @@
 Name:			terra-blueprint-compiler
-Version:		0.12.0
-Release:		1%?dist
+Version:		0.10.0
+Release:		1%{?dist}
 License:		LGPL-3.0-or-later
 Summary:		Markup language for GTK user interfaces
 URL:			https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/
@@ -1,6 +0,0 @@
-project pkg {
-    arches = ["x86_64"]
-    rpm {
-        spec = "codium-marketplace.spec"
-    }
-}
@@ -1,47 +0,0 @@
-# ref: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vscodium-marketplace
-
-Name:       codium-marketplace
-Version:    1.65.0
-Release:    1%?dist
-Summary:    Enable vscode marketplace in vscodium
-License:    MIT
-BuildArch:  noarch
-URL:        https://marketplace.visualstudio.com/vscode
-Requires:   codium sed
-
-%description
-This package replaces the default marketplace (https://open-vsx.org/)
-to the official one used by vscode.
-
-%install
-touch dummy
-install -Dm644 dummy %buildroot/tmp/terra-codium-marketplace-dummy-file
-
-%posttrans
-if [ $1 -gt 1 ]; then  # update/install
-  sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
-    -e '/^[[:blank:]]*"cacheUrl/d' \
-    -e '/^[[:blank:]]*"serviceUrl/a\    "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
-    -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
-    -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
-    /usr/share/codium/resources/app/product.json || true
-fi
-
-%preun
-sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/open-vsx.org\/vscode\/gallery",/' \
-  -e '/^[[:blank:]]*"cacheUrl/d' \
-  -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/open-vsx.org\/vscode\/item"/' \
-  -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
-  -e '/^[[:blank:]]*"documentationUrl/i\  "linkProtectionTrustedDomains": ["https://open-vsx.org"],' \
-  /usr/share/codium/resources/app/product.json || true
-
-%triggerin -- codium
-sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
-  -e '/^[[:blank:]]*"cacheUrl/d' \
-  -e '/^[[:blank:]]*"serviceUrl/a\    "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
-  -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
-  -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
-  /usr/share/codium/resources/app/product.json || true
-
-%files
-/tmp/terra-codium-marketplace-dummy-file
@@ -12,8 +12,8 @@
 %endif

 Name:			codium
-Version:		1.91.1.24193
-Release:		1%?dist
+Version:		1.85.2.24019
+Release:		1%{?dist}
 Summary:		Code editing. Redefined.
 License:		MIT
 URL:			https://vscodium.com/
@@ -28,8 +28,6 @@ VSCodium is a new choice of tool that combines the simplicity of a code editor
 with what developers need for the core edit-build-debug cycle.

 %prep
-mkdir stuff
-cd stuff
 tar xf %SOURCE0

 cat <<EOF > vscodium-bin-uri-handler.desktop
@@ -72,7 +70,6 @@ EOF
 %build

 %install
-cd stuff
 mkdir -p %buildroot%_datadir/doc/%name/ %buildroot%_datadir/licenses/%name
 install -Dm644 %SOURCE1 %buildroot%_docdir/%name/
 install -Dm644 %SOURCE2 %buildroot%_datadir/licenses/%name/
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`rpm.version(gh("pantheon-tweaks/pantheon-tweaks"));`