Merge branch 'f38' into p/rustdesk

feat: port #994 to 38 (#997 )
bump: iosevka-fusion anda
2026-05-31 17:11:56 +00:00 · 2024-03-25 22:21:47 +08:00 · 2024-03-25 18:36:15 +08:00 · 2024-03-25 09:15:32 +00:00 · 2024-03-25 04:45:46 +00:00 · 2024-03-24 23:35:57 +00:00
965 changed files with 22991 additions and 3988 deletions
@@ -1,4 +1,4 @@
-ARG VARIANT="37"
+ARG VARIANT="38"
 FROM fedora:${VARIANT}

 RUN useradd -m vscode
@@ -7,4 +7,4 @@ RUN usermod -aG mock vscode
 RUN echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode
 RUN dnf -y install git 'dnf-command(config-manager)' mock createrepo_c
 RUN dnf config-manager --add-repo='https://raw.githubusercontent.com/terrapkg/subatomic-repos/main/terra.repo'
-RUN dnf -y install anda anda-mock-configs
+RUN dnf -y install anda terra-mock-configs
@@ -2,10 +2,17 @@
  "name": "Fedora",
  "build": {
    "dockerfile": "Dockerfile",
-    "args": { "VARIANT": "37" }
+    "args": { "VARIANT": "38" }
  },
-  "settings": {},
-  "extensions": [],
  "remoteUser": "vscode",
-  "runArgs": ["--privileged"]
+  "runArgs": [
+    "--privileged"
+  ],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "rhaiscript.vscode-rhai"
+      ]
+    }
+  }
 }
@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Report an issue with a package (or Terra itsself)
+about: Report an issue with a package (or Terra itself)
 title: '[BUG] '
 labels: bug
 assignees: ''
@@ -6,7 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - main
+      - f38
+  pull_request:
+    branches:
+      - f38
+  merge_group:
+    branches:
+      - f38
  workflow_dispatch:
  workflow_call:

@@ -17,65 +23,74 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
-    # check out the repo
    steps:
      - name: Set workspace as safe
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
      - name: Checkout
        uses: actions/checkout@v3
        with:
-          fetch-depth: 2
-      - run: git pull
-      #- run: git checkout HEAD^
-
-      # - name: Generate Build matrix
-      #   id: generate_build_matrix
-      #   # generate build matrix by checking out changes in anda/
-      #   run: |
-      #     # get the list of changed folders in the current commit, including subfolders
-      #     changed_folders=$(git diff --name-only HEAD^ | grep -oP 'anda\/(.+)(\/|\$)' | sort -u )
-      #     echo "Changed folders: $changed_folders"
-      #     # if changed_folders is empty then set is empty to true
-      #     if [ -z "$changed_folders" ]; then
-      #       echo "::set-output name=is_empty::true"
-      #     else
-      #       echo "::set-output name=is_empty::false"
-      #     fi
-      #     # turn it into a json array
-      #     build_matrix=$(echo "$changed_folders" | jq -R . | jq -s . | jq -c .)
-
-      #     echo "::set-output name=build_matrix::$build_matrix"
-      #     #echo "::set-output name=build_matrix::$build_matrix"
-
+          fetch-depth: 0
      - name: Generate build matrix
        id: generate_build_matrix
-        run: |
-          anda ci >> $GITHUB_OUTPUT
+        run: anda ci >> $GITHUB_OUTPUT
  build:
    needs: manifest
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["37"]
+        version: ["38"]
      fail-fast: false
-    #if: ${{ matrix.changed_folders != '' }}
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
-      - uses: terrapkg/anda-build@main
+      - name: Checkout
+        uses: actions/checkout@v3
        with:
-          name: "${{ matrix.pkg.pkg }}"
-          mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
-          extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
-          andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
+          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
+
+      - name: Build with Andaman
+        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
+        run: |
+          NAME=${{ matrix.pkg.pkg }}-${{ matrix.pkg.arch }}-${{ matrix.version }}
+          x=${NAME//\//@}
+          echo "name=$x" >> $GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.art.outputs.name }}
+          path: anda-build/rpm/rpms/*

      - name: Upload 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 }} anda-build/rpm/rpms/*
+
+      - 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}}
@@ -1,54 +0,0 @@
-name: Bootstrap anda
-
-on:
-  workflow_dispatch:
-
-jobs:
-  bootstrap:
-    strategy:
-      matrix:
-        version: ["37"]
-        arch: ["x86_64", "aarch64"]
-      fail-fast: true
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
-    container:
-      image: fedora:37
-      options: --cap-add=SYS_ADMIN --privileged
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/anda
-
-      # - name: Run shell commands
-      #   run: |
-      #     git config --global url.https://github.com/.insteadOf git://github.com/
-      #     git clone https://github.com/FyraLabs/anda.git
-      - 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
-      - run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - name: Install Anda
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: anda
-
-      - name: Install Subatomic
-        run: go install github.com/FyraLabs/subatomic/subatomic-cli@latest
-
-      - name: Build
-        run: anda build -c anda-37-${{ matrix.arch }} anda -p rpm
-
-      - run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }} anda-build/rpm/rpms/*
@@ -1,58 +0,0 @@
-name: Bootstrap subatomic
-
-on:
-  workflow_dispatch:
-
-jobs:
-  bootstrap:
-    strategy:
-      matrix:
-        version: ["37"]
-        arch: ["x86_64", "aarch64"]
-      fail-fast: true
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
-    container:
-      image: fedora:37
-      options: --cap-add=SYS_ADMIN --privileged
-    steps:
-      # - name: Run shell commands
-      #   run: |
-      #     git config --global url.https://github.com/.insteadOf git://github.com/
-      #     git clone https://github.com/FyraLabs/anda.git
-
-      - 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
-      - run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/subatomic
-          set-safe-directory: true
-          fetch-depth: 1
-      - name: Set up git repository
-        run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - name: Install Anda
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: anda
-
-      - name: Install Subatomic
-        run: go install github.com/FyraLabs/subatomic/subatomic-cli@latest
-
-      - name: Build
-        run: anda build -c anda-37-${{ matrix.arch }} subatomic -p rpm
-      - run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }} anda-build/rpm/rpms/*
@@ -1,4 +1,4 @@
-name: Bootstrap Andaman and Subatomic (Fedora 38)
+name: Bootstrap Andaman and Subatomic

 on:
  workflow_dispatch:
@@ -23,11 +23,8 @@ jobs:
        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 anda-mock-configs gcc curl wget git-core openssl-devel
-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/subatomic
-          ref: bootstrap
+          sudo dnf install -y mock createrepo_c rpm-build gcc curl wget git-core openssl-devel
+
      - uses: actions-rs/toolchain@v1
        with:
          toolchain: stable
@@ -37,17 +34,40 @@ jobs:
          command: install
          args: anda

+
+      - uses: actions/checkout@v3
+        with:
+          ref: f${{ matrix.version} }}
+          fetch-depth: 1
+      - name: Build terra-mock-configs
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          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
+
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/subatomic
+          set-safe-directory: true
+          fetch-depth: 1
+      
      - name: Build Subatomic
-        run: anda build -c anda-38-${{ matrix.arch }} subatomic -p rpm
+        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')"
      - 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

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

      - name: Upload to Subatomic
        run: |
@@ -1,9 +1,9 @@
-name: Build Packages
+name: Manual Builds
 on:
  workflow_dispatch:
    inputs:
      packages:
-        description: "Packages to Build (pkg-a, pkg-b, ...)"
+        description: "Packages to Build"
        required: true

 jobs:
@@ -15,25 +15,48 @@ jobs:
      - 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
+
  build:
    needs: parse
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["37"]
+        version: ["38"]
        arch: ["x86_64", "aarch64"]
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
-      - uses: terrapkg/anda-build@main
+      - name: Checkout
+        uses: actions/checkout@v3
        with:
-          name: "${{ matrix.pkg }}pkg"
-          mockConfig: anda-37-${{ matrix.arch }}
-          extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
-          andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
+          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.arch }}-${{ matrix.pkg }}
+
+      - name: Build with Andaman
+        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
+        run: |
+          NAME=${{ matrix.pkg }}-${{ matrix.arch }}-${{ matrix.version }}
+          x=${NAME//\//@}
+          echo "name=$x" >> $GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.art.outputs.name }}
+          path: anda-build/rpm/rpms/*

      - name: Upload packages to subatomic
        run: |
@@ -41,3 +64,10 @@ jobs:
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*
+
+      - name: Notify Madoguchi (Success)
+        if: success() && github.event_name == 'push'
+        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'
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -0,0 +1,62 @@
+name: JSON Build
+on:
+  workflow_dispatch:
+    inputs:
+      packages:
+        description: "Packages to Build"
+        required: true
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        pkg: ${{ fromJson(inputs.packages) }}
+        version: ["38"]
+      fail-fast: false
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    container:
+      image: ghcr.io/terrapkg/builder:f38
+      options: --cap-add=SYS_ADMIN --privileged
+    steps:
+      - name: Checkout
+        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 }}-${{ matrix.pkg.pkg }}
+
+      - name: Build with Andaman
+        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
+        run: |
+          NAME=${{ matrix.pkg.pkg }}-${{ matrix.pkg.arch }}-${{ matrix.version }}
+          x=${NAME//\//@}
+          echo "name=$x" >> $GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.art.outputs.name }}
+          path: anda-build/rpm/rpms/*
+
+      - 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: 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}}
@@ -1,12 +1,20 @@
 name: Lint

-on: [push, pull_request]
-
+on:
+  push:
+    branches:
+      - f38
+  pull_request:
+    branches:
+      - f38
+  merge_group:
+    branches:
+      - f38
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
    steps:
      - name: Checkout repository
        uses: actions/checkout@v3
@@ -1,73 +0,0 @@
-# for each folder in anda/
-# generate a new workflow for each folder in anda/
-name: Mass Rebuild
-on:
-  workflow_dispatch:
-
-jobs:
-  manifest:
-    runs-on: ubuntu-latest
-
-    outputs:
-      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
-      is_empty: ${{ steps.generate_build_matrix.outputs.is_empty }}
-
-    # check out the repo
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
-      - run: git fetch
-      #- run: git checkout HEAD^
-
-      - name: Generate Build matrix
-        id: generate_build_matrix
-        # generate build matrix by checking out changes in anda/
-        run: |
-          build_matrix=$(find anda/ | grep -oP 'anda\/(.+)(\/|\$)' | sort -u | jq -R -s -c 'split("\n")[:-1]')
-          # create build matrix with { changed_folders: [ "folder1", "folder2" ] }
-          echo "build_matrix=$build_matrix" >> $GITHUB_OUTPUT
-          #echo "::set-output name=build_matrix::$build_matrix"
-  build:
-    needs: manifest
-    strategy:
-      matrix:
-        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["37"]
-        arch: ["x86_64", "aarch64"]
-      fail-fast: false
-    #if: ${{ matrix.changed_folders != '' }}
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
-    container:
-      image: ghcr.io/terrapkg/builder:main
-      options: --cap-add=SYS_ADMIN --privileged
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 2
-      - name: Check file existence
-        id: check_files
-        run: |
-          if test -f "${{ matrix.pkg }}anda.hcl"; then
-            echo "EXISTS=true" >> $GITHUB_OUTPUT
-          else
-            echo "EXISTS=false" >> $GITHUB_OUTPUT
-          fi
-
-      - uses: terrapkg/anda-build@main
-        if: steps.check_files.outputs.EXISTS == 'true'
-        with:
-          name: "${{ matrix.pkg }}pkg"
-          mockConfig: anda-37-${{ matrix.arch }}
-          extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
-          andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
-
-      - name: Upload packages to subatomic
-        if: steps.check_files.outputs.EXISTS == 'true'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }} anda-build/rpm/rpms/*
@@ -0,0 +1,21 @@
+set -x
+
+dirs=$2
+dirs=${dirs/\/pkg/}
+export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\",\"succ\":$1}"
+
+if [[ $1 == false ]]; then
+	d=${p/\%v/?}
+	d=${d/\%r/?}
+	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/f -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
+	exit 0
+fi
+
+for f in anda-build/rpm/rpms/*; do
+	n=$(lesspipe.sh $f | grep -E "Name\s*: " | sed "s@Name\s*: @@")
+	v=$(lesspipe.sh $f | grep -E "Version\s*: " | sed "s@Version\s*: @@")
+	r=$(lesspipe.sh $f | grep -E "Release\s*: " | sed "s@Release\s*: @@")
+	d=${p/\%v/$v}
+	d=${d/\%r/$r}
+	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
+done
@@ -0,0 +1,38 @@
+name: Sync PR to other branches
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - f38
+
+jobs:
+  sync:
+    strategy:
+      matrix:
+        branch: ["f37"]
+      fail-fast: false
+    if: github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'nosync')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
+          ref: ${{ matrix.branch }}
+      - name: Install SSH key and Setup Git
+        run: |
+          mkdir -p ${{ runner.temp }}
+          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
+          chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config user.name "Raboneko"
+          git config user.email "raboneko@fyralabs.com"
+          git config gpg.format "ssh"
+          git config user.signingkey "${{ runner.temp }}/signing_key"
+      - name: Apply patches and Push
+        run: |
+          curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch
+          git am -S --keep-cr --signoff < pr.patch
+          git push -u origin --all
@@ -3,7 +3,8 @@ name: Push comps updates
 on:
  push:
    branches:
-      - main
+      - f38
+      - f37
    paths:
      - comps.xml
  workflow_dispatch:
@@ -12,12 +13,14 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
    steps:
      - uses: actions/checkout@v3
      - name: Push to subatomic
        run: |
+          branch=${{ github.ref_name }}
+          ver=${branch/f/}
          subatomic-cli upload-comps \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra37 comps.xml
+            "terra${ver}" comps.xml
@@ -1,4 +1,4 @@
-name: Automatic Nightly Update
+name: Nightly Update
 on:
  schedule:
    - cron: "0 0 * * *"
@@ -8,13 +8,13 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
        uses: actions/checkout@v3
        with:
-          fetch-depth: 2
+          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

      - name: Install SSH signing key
@@ -36,6 +36,17 @@ jobs:
            git config user.email "raboneko@fyralabs.com"
            git config gpg.format "ssh"
            git config user.signingkey "${{ runner.temp }}/signing_key"
-            git commit -S -a -m "Automatic Update: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
-            git push -u origin main
+            msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            git commit -S -a -m "$msg"
+            copy_over () {
+              git format-patch HEAD^
+              git checkout $1
+              git apply *.patch || true
+              rm *.patch
+              git add *
+              git commit -S -a -m "$msg"
+            }
+            copy_over f37 || true
+            copy_over f39 || true
+            git push -u origin --all
          fi
@@ -1,23 +1,20 @@
-# for each folder in ultramarine/
-# if there is chkupdate.py
-# run it every 2 hours
-name: Automatically check for updates
+name: Update
 on:
  schedule:
-    - cron: "*/30 * * * *"
+    - cron: "*/10 * * * *"
  workflow_dispatch:

 jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
        uses: actions/checkout@v3
        with:
-          fetch-depth: 2
+          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

      - name: Install SSH signing key
@@ -29,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
@@ -40,6 +37,17 @@ jobs:
            git config user.email "raboneko@fyralabs.com"
            git config gpg.format "ssh"
            git config user.signingkey "${{ runner.temp }}/signing_key"
-            git commit -S -a -m "Automatic Update: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
-            git push -u origin main
+            msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            git commit -S -a -m "$msg"
+            copy_over () {
+              git format-patch HEAD^
+              git checkout $1
+              git apply *.patch || true
+              rm *.patch
+              git add *
+              git commit -S -a -m "$msg"
+            }
+            copy_over f37 || true
+            copy_over f39 || true
+            git push -u origin --all
          fi
@@ -1 +1 @@
-anda-build/
+anda-build/
@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "rhaiscript.vscode-rhai"
+  ]
+}
@@ -1,32 +0,0 @@
-# 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
-
-/anda/desktop/compiz9 @cat-master21
@@ -1,10 +1,12 @@
 # Terra Sources

-[![Repository status](https://repology.org/badge/repository-big/terra_37.svg)](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)
+[![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.
-[Contributions](https://github.com/terrapkg/packages/wiki/Contribute) are always welcome, but please read our [documentation](https://github.com/terrapkg/packages/wiki) first.

 This monorepo contains the package manifests for all packages in Terra.

@@ -12,10 +14,10 @@ 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 [GitHub Wiki](https://github.com/terrapkg/packages/wiki).
+Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/). Alternatively, the GitHub Wiki contains older versions of the documentations.

 ## Questions?
 Feel free to reach out on [Discord](https://discord.gg/5fdPuxTg5Q). We're always happy to help!
-
@@ -1,6 +1,6 @@
 config {
-    strip_prefix = "anda/"
-    strip_suffix = "/pkg"
+	strip_prefix = "anda/"
+	strip_suffix = "/pkg"
 }

-project {}
+project {}
@@ -1,5 +1,6 @@
 project pkg {
-    rpm {
-        spec = "anki-bin.spec"
-    }
+	arches = ["x86_64"]
+	rpm {
+		spec = "anki-bin.spec"
+	}
 }
@@ -1,14 +1,15 @@
 Name:			anki-bin
-Version:		2.1.58
+Version:		23.12.1
 Release:		1%{?dist}
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
-License:		AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY
+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
-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
-BuildArch:		noarch
+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
 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
@@ -19,36 +20,46 @@ Source5:		https://raw.githubusercontent.com/ankitects/anki/%{version}/LICENSE
 Source6:		https://raw.githubusercontent.com/ankitects/anki/%{version}/README.md

 %description
-Anki is a program designed to help you remember facts (such as words
-and phrases in a foreign language) as easily, quickly and efficiently
-as possible. Anki is based on a theory called spaced repetition.
+Anki is a program designed to help you remember facts (such as words and
+phrases in a foreign language) as easily, quickly and efficiently as possible.
+Anki is based on a theory called spaced repetition.

 %prep

 %build

 %install
-python3.11 -m installer --destdir="%{buildroot}" %{SOURCE0}
-python3.11 -m installer --destdir="%{buildroot}" %{SOURCE1}
+pip3 install --root=%{buildroot} %SOURCE0 %SOURCE1
 install -Dm755 %{SOURCE2} "%{buildroot}/usr/bin/anki"
 install -Dm644 %{SOURCE3} "%{buildroot}/usr/share/applications/anki.desktop"
 install -Dm644 %{SOURCE4} "%{buildroot}/usr/share/pixmaps/anki.png"
 install -Dm644 %{SOURCE5} "%{buildroot}/%{_datadir}/licenses/%{name}/LICENSE"
 install -Dm644 %{SOURCE6} "%{buildroot}/%{_datadir}/doc/%{name}/README.md"

+cp -r %buildroot%_libdir/python3*/site-packages/{_aqt,anki*,aqt*} .
+rm -rf %buildroot{%_libdir,/usr/lib}/python3*/site-packages/*
+cp -r ./{_aqt,anki*,aqt*} %buildroot/usr/lib/python3*/site-packages/
+
+rm -rf %buildroot%_bindir/{distro,flask,jsonschema,markdown_py,normalizer,send2trash,waitress-serve}
+
+%fdupes %buildroot%_libdir/python*/site-packages/_aqt/data/
+

 %files
 %license LICENSE
 %doc README.md
-/usr/bin/anki
-/usr/lib64/python*/site-packages/_aqt/
-/usr/lib64/python*/site-packages/anki-%{version}.dist-info/
-/usr/lib64/python*/site-packages/anki/
-/usr/lib64/python*/site-packages/aqt-%{version}.dist-info/
-/usr/lib64/python*/site-packages/aqt/
-/usr/share/applications/anki.desktop
-/usr/share/pixmaps/anki.png
+%_bindir/anki
+/usr/lib/python*/site-packages/_aqt/
+/usr/lib/python*/site-packages/anki-%{version}.dist-info/
+/usr/lib/python*/site-packages/anki/
+/usr/lib/python*/site-packages/aqt-%{version}.dist-info/
+/usr/lib/python*/site-packages/aqt/
+%_datadir/applications/anki.desktop
+%_datadir/pixmaps/anki.png

 %changelog
-* Wed Jan 11 2023 windowsboy111 <windowsboy111@fyralabs.com>
+* 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,6 @@
 project pkg {
-    rpm {
-        spec = "anki-qt5.spec"
-    }
+	arches = ["x86_64"]
+	rpm {
+		spec = "anki-qt5.spec"
+	}
 }
@@ -1,28 +1,27 @@
 Name:           anki-qt5
-Version:        2.1.58
+Version:        23.12.1
 Release:        1%{?dist}
 Summary:        Flashcard program for using space repetition learning
-License:        AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY
+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 
+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
-BuildArch:      noarch
+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
 Patch1:         0001-Force-qt5.patch

 %description
-Anki is a program designed to help you remember facts (such as words
-and phrases in a foreign language) as easily, quickly and efficiently
-as possible. Anki is based on a theory called spaced repetition.
+Anki is a program designed to help you remember facts (such as words and
+phrases in a foreign language) as easily, quickly and efficiently as possible.
+Anki is based on a theory called spaced repetition.

 %prep
 git clone https://github.com/ankitects/anki .
-git checkout %{version}
-%patch0 -p1
+git checkout %version
 %patch1 -p1

 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
@@ -46,6 +45,8 @@ chmod 755 %{buildroot}%{_bindir}/anki
 find %{buildroot} -iname __pycache__ | xargs -r rm -rf
 find %{buildroot} -iname direct_url.json | xargs -r rm -rf

+%fdupes %_libdir/python*/site-packages/_aqt/data/
+

 %files
 %license LICENSE*
@@ -60,5 +61,5 @@ find %{buildroot} -iname direct_url.json | xargs -r rm -rf
 /usr/lib64/python*/site-packages/anki-%{version}.dist-info/

 %changelog
-* Tue Jan 3 2023 windowsboy111 <windowsboy111@fyralabs.com>
+* Tue Jan 3 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.1.60
 - Initial package
@@ -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,6 @@
 project pkg {
-    rpm {
-        spec = "anki.spec"
-    }
+	arches = ["x86_64"]
+	rpm {
+		spec = "anki.spec"
+	}
 }
@@ -1,32 +1,33 @@
 Name:           anki
-Version:        2.1.58
+Version:        23.12.1
 Release:        1%{?dist}
 Summary:        Flashcard program for using space repetition learning
-License:        AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY
+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 
+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
+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
+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
-BuildArch:      noarch
 Conflicts:      anki-qt5
 Patch0:         0001-No-update.patch

 %description
-Anki is a program designed to help you remember facts (such as words
-and phrases in a foreign language) as easily, quickly and efficiently
-as possible. Anki is based on a theory called spaced repetition.
+Anki is a program designed to help you remember facts (such as words and
+phrases in a foreign language) as easily, quickly and efficiently as possible.
+Anki is based on a theory called spaced repetition.

 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %{version}
-%patch0 -p1

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

 %build
+export RELEASE=1
+export PYTHONPATH=%_libdir/python3/dist-packages
 mold -run ./tools/build


@@ -47,6 +48,8 @@ find %{buildroot} -iname direct_url.json | xargs -r rm -rf

 chmod 755 %{buildroot}%{_bindir}/anki

+%fdupes %_libdir/python*/site-packages/_aqt/data/
+

 %files
 %license LICENSE*
@@ -54,13 +57,13 @@ chmod 755 %{buildroot}%{_bindir}/anki
 %{_bindir}/anki
 %{_datadir}/applications/anki.desktop
 %{_datadir}/pixmaps/anki.png
-/usr/lib64/python*/site-packages/aqt/
-/usr/lib64/python*/site-packages/aqt-%{version}.dist-info/
-/usr/lib64/python*/site-packages/_aqt/
-/usr/lib64/python*/site-packages/anki/
-/usr/lib64/python*/site-packages/anki-%{version}.dist-info/
+%_libdir/python*/site-packages/aqt/
+%_libdir/python*/site-packages/aqt-%{version}.dist-info/
+%_libdir/python*/site-packages/_aqt/
+%_libdir/python*/site-packages/anki/
+%_libdir/python*/site-packages/anki-%{version}.dist-info/


 %changelog
-* Tue Jan 3 2023 windowsboy111 <windowsboy111@fyralabs.com>
+* Tue Jan 3 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.1.60
 - Initial package
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "armcord-bin.spec"
+	}
+}
@@ -0,0 +1,77 @@
+%define debug_package %nil
+%global _build_id_links none
+
+%ifarch x86_64
+%global src ArmCord-%version
+%elifarch aarch64
+%global src ArmCord-%version-arm64
+%elifarch armv7l
+%global src ArmCord-%version-armv7l
+%endif
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/armcord/.*\\.so
+
+Name:			armcord-bin
+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
+Source0:		%url/releases/download/v%version/%src.tar.gz
+Source1:		armcord.png
+Source2:		https://raw.githubusercontent.com/ArmCord/ArmCord/v%version/README.md
+Requires:		electron xdg-utils
+ExclusiveArch:	x86_64 aarch64 armv7l
+Conflicts:		armcord
+
+%description
+ArmCord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+%autosetup -n %src
+
+cat <<EOF > .armcord.desktop
+[Desktop Entry]
+Name=ArmCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=%_bindir/armcord
+Icon=armcord
+Categories=Network;InstantMessaging;
+StartupWMClass=armcord
+Keywords=discord;armcord;vencord;shelter;electron;
+EOF
+
+%build
+
+%install
+mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/armcord %buildroot%_docdir/%name
+cp -a * %buildroot%_datadir/armcord/
+ln -s %_datadir/armcord/armcord %buildroot%_bindir/armcord
+chmod +x -R %buildroot%_datadir/armcord/*
+chmod 755 %buildroot%_datadir/armcord/armcord
+install -Dm644 .armcord.desktop %buildroot%_datadir/applications/ArmCord.desktop
+install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/armcord.png
+install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
+
+%files
+%doc README.md
+%_datadir/armcord
+%_bindir/armcord
+%_datadir/applications/ArmCord.desktop
+%_datadir/pixmaps/armcord.png
+
+%changelog
+* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
+- Remove libnotify dependency.
+- Fix desktop entry.
+- Set as noarch package because there are not binary files.
+- Use /usr/share/ instead of /opt/
+
+* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gh("ArmCord/ArmCord"));
@@ -0,0 +1,6 @@
+project pkg {
+	arches = ["x86_64"]
+	rpm {
+		spec = "armcord.spec"
+	}
+}
@@ -0,0 +1,66 @@
+%define debug_package %nil
+
+Name:		armcord
+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
+Conflicts:	armcord-bin
+BuildArch:	noarch
+
+%description
+ArmCord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+git clone %url .
+git checkout v%version
+
+cat <<EOF > armcord.desktop
+[Desktop Entry]
+Name=ArmCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=/usr/bin/armcord
+Icon=armcord
+Categories=Network;InstantMessaging;
+StartupWMClass=armcord
+Keywords=discord;armcord;vencord;shelter;electron;
+EOF
+
+
+%build
+npx pnpm@7 install --no-frozen-lockfile
+npm run packageQuick
+
+
+%install
+install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/armcord/app.asar
+
+install -Dm755 %SOURCE1 %buildroot/usr/bin/armcord
+install -Dm644 armcord.desktop %buildroot/usr/share/applications/ArmCord.desktop
+install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png
+
+%files
+%doc README.md
+%license LICENSE
+/usr/bin/armcord
+/usr/share/applications/ArmCord.desktop
+/usr/share/pixmaps/armcord.png
+/usr/share/armcord/app.asar
+
+%changelog
+* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
+- Remove libnotify dependency.
+- Fix desktop entry.
+- Set as noarch package because there are not binary files.
+
+* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
+- Initial package
+
@@ -0,0 +1,13 @@
+#!/bin/sh
+electron=/usr/bin/electron
+
+CONFIG=${XDG_CONFIG_HOME:-~/.config}
+FLAGS="$CONFIG/armcord-flags.conf"
+
+# Allow users to override command-line options
+if [ -f "$FLAGS" ]; then
+  USER_FLAGS="$(cat "$FLAGS")"
+fi
+
+# shellcheck disable=SC2086 # USER_FLAGS has to be unquoted
+"$electron" /usr/share/armcord/app.asar $USER_FLAGS "$@"
@@ -0,0 +1 @@
+rpm.version(gh("ArmCord/ArmCord"));
@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
-        spec = "authy.spec"
-    }
+	rpm {
+		spec = "authy.spec"
+	}
 }
@@ -1,13 +1,20 @@
+%define debug_package %nil
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
+
 Name: authy
-Version: 2.2.2
-Release: 2%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
 Summary: Two factor authentication desktop application
-License: Unknown
+License: Unlicense
 URL: https://authy.com/
-Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_12.snap
+Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_23.snap
 Requires: gtk3
 Requires: nss
-BuildRequires: squashfs-tools
+BuildRequires: squashfs-tools desktop-file-utils

 %description
 %{summary}.
@@ -18,24 +25,30 @@ unsquashfs -q -f -d snap %{SOURCE0}
 %build

 %install
-install -d "%{buildroot}/opt/authy"
-cp -r "snap/." "%{buildroot}/opt/authy"
+install -d %buildroot%_datadir/authy
+cp -r snap/. %buildroot%_datadir/authy

-sed -i 's|${SNAP}/meta/gui/icon.png|authy|g' "%{buildroot}/opt/authy/meta/gui/authy.desktop"
-install -Dm644 "%{buildroot}/opt/authy/meta/gui/authy.desktop" -t "%{buildroot}/usr/share/applications"
-install -Dm644 "%{buildroot}/opt/authy/meta/gui/icon.png" "%{buildroot}/usr/share/pixmaps/authy.png"
+sed -i 's|${SNAP}/meta/gui/icon.png|authy|g' %buildroot%_datadir/authy/meta/gui/authy.desktop
+install -Dm644 %buildroot%_datadir/authy/meta/gui/authy.desktop -t %buildroot%_datadir/applications
+install -Dm644 %buildroot%_datadir/authy/meta/gui/icon.png %buildroot%_datadir/pixmaps/authy.png

-rm -rf "%{buildroot}/opt/authy"/{data-dir,gnome-platform,lib,meta,scripts,usr,*.sh}
+rm -rf %buildroot%_datadir/authy/{data-dir,gnome-platform,lib,meta,scripts,usr,*.sh}

-install -d "%{buildroot}/usr/bin"
-ln -s "/opt/authy/authy" "%{buildroot}/usr/bin"
+install -d %buildroot%_bindir
+ln -s %_datadir/authy/authy %buildroot%_bindir
+
+%check
+desktop-file-validate %buildroot%_datadir/applications/authy.desktop

 %files
-/opt/authy/
-/usr/bin/authy
-/usr/share/applications/authy.desktop
-/usr/share/pixmaps/authy.png
+%_datadir/authy/
+%_bindir/authy
+%_datadir/applications/authy.desktop
+%_datadir/pixmaps/authy.png

 %changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.3.0-2
+- Use /usr/share/ instead of /opt/
+
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 2.2.1-2
 - Initial release
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "blackbox-terminal.spec"
+	}
+}
@@ -0,0 +1,58 @@
+Name:           blackbox-terminal
+Version:        0.14.0
+Release:        1%{?dist}
+Summary:        A beautiful GTK 4 terminal
+License:        GPL-3.0
+URL:            https://gitlab.gnome.org/raggesilver/blackbox
+BuildRequires:  vala meson gettext 
+BuildRequires:  pkgconfig(gtk4) >= 4.6.2
+BuildRequires:  pkgconfig(gio-2.0) >= 2.50
+BuildRequires:  libadwaita-devel >= 1.1
+BuildRequires:  pkgconfig(pqmarble) >= 2
+BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.69.0
+BuildRequires:  pkgconfig(json-glib-1.0) >= 1.4.4
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.9.12
+BuildRequires:  pkgconfig(librsvg-2.0) >= 2.54.0
+BuildRequires:  pkgconfig(libpcre2-8)
+BuildRequires:  pkgconfig(graphene-gobject-1.0)
+BuildRequires:  pkgconfig(gee-0.8)
+BuildRequires:  desktop-file-utils libappstream-glib cmake
+Source0:        %url/-/archive/v%version/blackbox-v%version.tar.gz
+
+%description
+%{summary}.
+
+%prep
+%autosetup -p1 -n blackbox-v%version
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+%check
+appstream-util validate-relax --nonet %buildroot/%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
+
+%files
+%doc README.md
+%license COPYING
+%_bindir/blackbox
+%_bindir/terminal-toolbox
+%_datadir/applications/com.raggesilver.BlackBox.desktop
+%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
+%_datadir/blackbox/
+%_datadir/glib-2.0/schemas/com.raggesilver.BlackBox.gschema.xml
+%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-fullscreen-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-show-headerbar-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/external-link-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/settings-symbolic.svg
+%_datadir/icons/hicolor/scalable/apps/com.raggesilver.BlackBox.svg
+%_datadir/locale/*/LC_MESSAGES/blackbox.mo
+
+
+
+%changelog
+* Sun Oct 23 2022 windowsboy111 <windowsboy111@fyralabs.com>
+- Initial package
@@ -1,5 +1,6 @@
 project pkg {
-    rpm {
-        spec = "discord-canary-openasar.spec"
-    }
+	arches = ["x86_64"]
+	rpm {
+		spec = "discord-canary-openasar.spec"
+	}
 }
@@ -1,19 +1,29 @@
 %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:           discord-canary-openasar
-Version:        0.0.148
-Release:        1%{?dist}
-Summary:        OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
-License:        MIT and https://discord.com/terms
+Version:        0.0.324
+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
 Source0:        https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
 Source1:        %{url}/releases/download/nightly/app.asar
 Group:          Applications/Internet
-Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires:       glibc GConf2
+Requires:       nspr >= 4.13
+Requires:       nss >= 3.27
+Requires:       libX11 >= 1.6
+Requires:       libXtst >= 1.2
 ExclusiveArch:  x86_64

 %description
-%{summary}.
+OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and
+include more features like further customization and theming.

 %prep
 %autosetup -n DiscordCanary
@@ -28,8 +38,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-canary-openasar
 cp -rv * %{buildroot}%{_datadir}/discord-canary-openasar
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary-openasar.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary-openasar.png
+ln -s %_datadir/discord-canary-openasar/discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary-openasar.desktop
+ln -s %_datadir/discord-canary-openasar/discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary-openasar.png
 cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-canary-openasar/resources/app.asar
 chmod o+w %{buildroot}%{_datadir}/discord-canary-openasar/resources -R

@@ -47,4 +57,4 @@ chmod o+w %{buildroot}%{_datadir}/discord-canary-openasar/resources -R
 - Bundle discord-canary

 * Thu Oct 20 2022 Cappy Ishihara <cappy@cappuchino.xyz>
- 
+-
@@ -1,5 +1,6 @@
 project pkg {
-    rpm {
-        spec = "discord-canary.spec"
-    }
+	arches = ["x86_64"]
+	rpm {
+		spec = "discord-canary.spec"
+	}
 }
@@ -1,32 +1,38 @@
 %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:           discord-canary
-Version:        0.0.148
-Release:        1%{?dist}
-Summary:        Free Voice and Text Chat for Gamers.
+Version:        0.0.324
+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
 License:        https://discord.com/terms
-Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires:       glibc GConf2 nspr >= 4.13 nss >= 3.27 libX11 >= 1.6 libXtst >= 1.2
 Group:          Applications/Internet
 ExclusiveArch:  x86_64
 %description
-Imagine a place where you can belong to a school club, a gaming group, or a worldwide art community. Where just you and a handful of friends can spend time together. A place that makes it easy to talk every day and hang out more often.
+Imagine a place where you can belong to a school club, a gaming group, or a
+worldwide art community. Where just you and a handful of friends can spend time
+together. A place that makes it easy to talk every day and hang out more often.

 %prep
 %autosetup -n DiscordCanary

 %build

-
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p %{buildroot}%{_datadir}/discord-canary
 cp -rv * %{buildroot}%{_datadir}/discord-canary
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary.png
+ln -s %_datadir/discord-canary/discord-canary.desktop %{buildroot}%{_datadir}/applications/
+ln -s %_datadir/discord-canary/discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary.png

 %files
 %{_datadir}/discord-canary/
@@ -1,4 +1,5 @@
 project pkg {
+	arches = ["x86_64"]
 	rpm {
 		spec = "discord-openasar.spec"
 	}
@@ -1,19 +1,29 @@
 %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:           discord-openasar
-Version:        0.0.25
-Release:        1%{?dist}
-Summary:        OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
-License:        MIT and https://discord.com/terms
+Version:        0.0.46
+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
 Source0:        https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
 Source1:        %{url}/releases/download/nightly/app.asar
 Group:          Applications/Internet
-Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires:       glibc GConf2
+Requires:       nspr >= 4.13
+Requires:       nss >= 3.27
+Requires:       libX11 >= 1.6
+Requires:       libXtst >= 1.2
 ExclusiveArch:  x86_64

 %description
-%{summary}.
+OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and
+include more features like further customization and theming.

 %prep
 %autosetup -n Discord
@@ -28,8 +38,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-openasar
 cp -rv * %{buildroot}%{_datadir}/discord-openasar
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord.desktop %{buildroot}%{_datadir}/applications/discord-openasar.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-openasar.png
+ln -s %_datadir/discord-openasar/discord.desktop %{buildroot}%{_datadir}/applications/discord-openasar.desktop
+ln -s %_datadir/discord-openasar/discord.png %{buildroot}%{_datadir}/pixmaps/discord-openasar.png
 cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-openasar/resources/app.asar
 chmod o+w %{buildroot}%{_datadir}/discord-openasar/resources -R

@@ -1,6 +1,6 @@
 project pkg {
-    rpm {
-        spec = "discord-ptb-openasar.spec"
-        update = ""
-    }
+	arches = ["x86_64"]
+	rpm {
+		spec = "discord-ptb-openasar.spec"
+	}
 }
@@ -1,19 +1,29 @@
 %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:           discord-ptb-openasar
-Version:        0.0.39
-Release:        1%{?dist}
-Summary:        OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
-License:        MIT and https://discord.com/terms
+Version:        0.0.76
+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
 Source0:        https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
 Source1:        %{url}/releases/download/nightly/app.asar
 Group:          Applications/Internet
-Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires:       glibc GConf2
+Requires:       nspr >= 4.13
+Requires:       nss >= 3.27
+Requires:       libX11 >= 1.6
+Requires:       libXtst >= 1.2
 ExclusiveArch:  x86_64

 %description
-%{summary}.
+OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and
+include more features like further customization and theming.

 %prep
 %autosetup -n DiscordPTB
@@ -28,6 +38,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-ptb-openasar
 cp -rv * %{buildroot}%{_datadir}/discord-ptb-openasar
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
+ln -s %_datadir/discord-ptb-openasar/discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb-openasar.desktop
+ln -s %_datadir/discord-ptb-openasar/discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb-openasar.png
 install discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb-openasar.desktop
 install discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb-openasar.png
 cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-ptb-openasar/resources/app.asar
@@ -1,5 +1,6 @@
 project pkg {
-    rpm {
-        spec = "discord-ptb.spec"
-    }
+	arches = ["x86_64"]
+	rpm {
+		spec = "discord-ptb.spec"
+	}
 }
@@ -1,17 +1,28 @@
 %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:           discord-ptb
-Version:        0.0.39
-Release:        1%{?dist}
+Version:        0.0.76
+Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
-URL:            discord.com
+URL:            https://discord.com
 Source0:        https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
 License:        https://discord.com/terms
-Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires:       glibc GConf2
+Requires:       nspr >= 4.13
+Requires:       nss >= 3.27
+Requires:       libX11 >= 1.6
+Requires:       libXtst >= 1.2
 Group:          Applications/Internet
 ExclusiveArch:  x86_64
 %description
-Imagine a place where you can belong to a school club, a gaming group, or a worldwide art community. Where just you and a handful of friends can spend time together. A place that makes it easy to talk every day and hang out more often.
+Imagine a place where you can belong to a school club, a gaming group, or a
+worldwide art community. Where just you and a handful of friends can spend time
+together. A place that makes it easy to talk every day and hang out more often.

 %prep
 %autosetup -n DiscordPTB
@@ -24,8 +35,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-ptb
 cp -rv * %{buildroot}%{_datadir}/discord-ptb
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb.png
+ln -s %_datadir/discord-ptb/discord-ptb.desktop %{buildroot}%{_datadir}/applications/
+ln -s %_datadir/discord-ptb/discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb.png

 %files
 %{_datadir}/discord-ptb/
@@ -1,4 +1,5 @@
 project pkg {
+	arches = ["x86_64"]
 	rpm {
 		spec = "discord.spec"
 	}
@@ -1,13 +1,18 @@
 %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:			discord
-Version:		0.0.25
-Release:		1%{?dist}
-Summary:		Free Voice and Text Chat for Gamers.
-URL:			discord.com
+Version:		0.0.46
+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
 License:		https://discord.com/terms
-Requires:		libatomic glibc alsa-lib GConf2 libnotify libstdc++ libappindicator libcxx libXScrnSaver
+Requires:		glibc GConf2
 Requires:		nspr >= 4.13
 Requires:		nss >= 3.27
 Requires:		libX11 >= 1.6
@@ -15,10 +20,9 @@ Requires:		libXtst >= 1.2
 Group:			Applications/Internet
 ExclusiveArch:	x86_64
 %description
-Imagine a place where you can belong to a school club, a gaming group,
-or a worldwide art community. Where just you and a handful of friends
-can spend time together. A place that makes it easy to talk every day
-and hang out more often.
+Imagine a place where you can belong to a school club, a gaming group, or a
+worldwide art community. Where just you and a handful of friends can spend time
+together. A place that makes it easy to talk every day and hang out more often.

 %prep
 %autosetup -n Discord
@@ -31,8 +35,8 @@ mkdir -p %{buildroot}%{_datadir}/discord
 cp -rv * %{buildroot}%{_datadir}/discord
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord.desktop %{buildroot}%{_datadir}/applications/discord.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord.png
+ln -s %_datadir/discord/discord.desktop %{buildroot}%{_datadir}/applications/discord.desktop
+ln -s %_datadir/discord/discord.png %{buildroot}%{_datadir}/pixmaps/discord.png

 %files
 %{_datadir}/discord/
@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "feishin.spec"
+  }
+}
@@ -0,0 +1,69 @@
+%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.6.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
@@ -0,0 +1 @@
+rpm.version(gh("jeffvli/feishin"));
@@ -0,0 +1,8 @@
+project pkg {
+  rpm {
+	  spec = "mpv-nightly.spec"
+  }
+  labels {
+    nightly = "1"
+  }
+}
@@ -0,0 +1,230 @@
+%global commit 27fb4c474f5ca850470cd07dfc789ba8bf94b35c
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20240312
+%global ver v0.37.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
@@ -0,0 +1,8 @@
+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();
+	}
+}
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "rust-sccache.spec"
+	}
+}
@@ -1,35 +1,48 @@
-# Generated by rust2rpm 22
-%bcond_without check
-# dont run brp scriptlet
-%undefine __brp_mangle_shebangs
+# Generated by rust2rpm 25
+%bcond_with check
+# aarch64 dist is not available
+%ifarch aarch64
+%bcond_with dist_server
+%else
+%bcond_without dist_server
+%endif
+
+# Don't mangle shebangs
+%global __brp_mangle_shebangs %{nil}

 %global crate sccache

 Name:           rust-sccache
-Version:        0.3.3
+Version:        0.7.7
 Release:        1%{?dist}
 Summary:        Ccache-like tool

 License:        Apache-2.0
 URL:            https://crates.io/crates/sccache
 Source:         %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
 Patch:          sccache-fix-metadata-auto.diff

 ExclusiveArch:  %{rust_arches}

-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  anda-srpm-macros
 BuildRequires:  openssl-devel
+BuildRequires:  gcc
+BuildRequires:  perl
+BuildRequires:  rust-packaging

 %global _description %{expand:
-Ccache-like tool. It is used as a compiler wrapper and avoids compilation when
-possible, storing a cache in a remote storage using the S3 API.}
+Sccache is a ccache-like tool. It is used as a compiler wrapper and
+avoids compilation when possible. Sccache has the capability to utilize
+caching in remote storage environments, including various cloud storage
+options, or alternatively, in local storage.}

 %description %{_description}

 %package     -n %{crate}
 Summary:        %{summary}
+License:        MIT

 %description -n %{crate} %{_description}

@@ -37,25 +50,17 @@ Summary:        %{summary}
 %license LICENSE
 %doc CODE_OF_CONDUCT.md
 %doc README.md
-#%%{_bindir}/sccache-dist
 %{_bindir}/sccache
-
-
-# if x86_64
-%ifarch x86_64
-%package     -n %{crate}-dist
-Summary:        sccache distributed server
-
-%description -n %{crate}-dist
-Distributed server for sccache.
-
-%files       -n %{crate}-dist
+%if %{with dist_server}
 %{_bindir}/sccache-dist
 %endif

 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache) = 0.7.4
+Requires:       cargo
+Requires:       rust >= 1.67.1

 %description    devel %{_description}

@@ -63,14 +68,15 @@ This package contains library source intended for building other packages which
 use the "%{crate}" crate.

 %files          devel
-%license %{crate_instdir}/LICENSE
-%doc %{crate_instdir}/CODE_OF_CONDUCT.md
-%doc %{crate_instdir}/README.md
 %{crate_instdir}/

 %package     -n %{name}+default-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/default) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/all) = 0.7.4

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

@@ -83,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}

@@ -95,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}

@@ -104,33 +124,12 @@ use the "azure" feature of the "%{crate}" crate.
 %files       -n %{name}+azure-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+chrono-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+chrono-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "chrono" feature of the "%{crate}" crate.
-
-%files       -n %{name}+chrono-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+crossbeam-utils-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+crossbeam-utils-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "crossbeam-utils" feature of the "%{crate}" crate.
-
-%files       -n %{name}+crossbeam-utils-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %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}

@@ -139,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}

@@ -155,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}

@@ -163,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}

@@ -179,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}

@@ -188,21 +203,30 @@ use the "gcs" feature of the "%{crate}" crate.
 %files       -n %{name}+gcs-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+hmac-devel
+%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}+hmac-devel %{_description}
+%description -n %{name}+gha-devel %{_description}

 This package contains library source intended for building other packages which
-use the "hmac" feature of the "%{crate}" crate.
+use the "gha" feature of the "%{crate}" crate.

-%files       -n %{name}+hmac-devel
+%files       -n %{name}+gha-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}

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

-%package     -n %{name}+hyperx-devel
+%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}+hyperx-devel %{_description}
+%description -n %{name}+jwt-devel %{_description}

 This package contains library source intended for building other packages which
-use the "hyperx" feature of the "%{crate}" crate.
+use the "jwt" feature of the "%{crate}" crate.

-%files       -n %{name}+hyperx-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+jsonwebtoken-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+jsonwebtoken-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "jsonwebtoken" feature of the "%{crate}" crate.
-
-%files       -n %{name}+jsonwebtoken-devel
+%files       -n %{name}+jwt-devel
 %ghost %{crate_instdir}/Cargo.toml

 %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}

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

-%package     -n %{name}+md-5-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+md-5-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "md-5" feature of the "%{crate}" crate.
-
-%files       -n %{name}+md-5-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %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}

@@ -272,21 +285,12 @@ use the "memcached" feature of the "%{crate}" crate.
 %files       -n %{name}+memcached-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+memcached-rs-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+memcached-rs-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "memcached-rs" feature of the "%{crate}" crate.
-
-%files       -n %{name}+memcached-rs-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %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}

@@ -299,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}

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

+%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}
+
+This package contains library source intended for building other packages which
+use the "opendal" feature of the "%{crate}" crate.
+
+%files       -n %{name}+opendal-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %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}

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

-%package     -n %{name}+percent-encoding-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+percent-encoding-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "percent-encoding" feature of the "%{crate}" crate.
-
-%files       -n %{name}+percent-encoding-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}

@@ -344,9 +367,34 @@ use the "redis" feature of the "%{crate}" crate.
 %files       -n %{name}+redis-devel
 %ghost %{crate_instdir}/Cargo.toml

+%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}
+
+This package contains library source intended for building other packages which
+use the "reqsign" feature of the "%{crate}" crate.
+
+%files       -n %{name}+reqsign-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %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}

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

-%package     -n %{name}+ring-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+ring-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "ring" feature of the "%{crate}" crate.
-
-%files       -n %{name}+ring-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %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}

@@ -383,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}

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

-%package     -n %{name}+sha-1-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+sha-1-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "sha-1" feature of the "%{crate}" crate.
-
-%files       -n %{name}+sha-1-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %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}

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

-%package     -n %{name}+simple-s3-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+simple-s3-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "simple-s3" feature of the "%{crate}" crate.
-
-%files       -n %{name}+simple-s3-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %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}

@@ -440,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}

@@ -455,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}

@@ -464,9 +518,28 @@ use the "url" feature of the "%{crate}" crate.
 %files       -n %{name}+url-devel
 %ghost %{crate_instdir}/Cargo.toml

+%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}
+
+This package contains library source intended for building other packages which
+use the "vendored-openssl" feature of the "%{crate}" crate.
+
+%files       -n %{name}+vendored-openssl-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %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}

@@ -476,36 +549,51 @@ use the "version-compare" feature of the "%{crate}" crate.
 %files       -n %{name}+version-compare-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+void-devel
+%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}+void-devel %{_description}
+%description -n %{name}+webdav-devel %{_description}

 This package contains library source intended for building other packages which
-use the "void" feature of the "%{crate}" crate.
+use the "webdav" feature of the "%{crate}" crate.

-%files       -n %{name}+void-devel
+%files       -n %{name}+webdav-devel
 %ghost %{crate_instdir}/Cargo.toml

 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep_online

+
 %build
-%ifarch x86_64
-%cargo_build -a
+%if %{with dist_server}
+%cargo_build -f dist-server
 %else
 %cargo_build
 %endif

 %install
-%ifarch x86_64
-%cargo_install -a
+%if %{with dist_server}
+%cargo_install -f dist-server
 %else
 %cargo_install
 %endif

+%if %{with check}
+%check
+%if %{with dist_server}
+%cargo_test -f dist-server
+%else
+%cargo_test
+%endif
+
+%endif

 %changelog
-%autochangelog
+* Mon Dec 18 2023 Cappy Ishihara <cappy@cappuchino.xyz> - 0.7.4-1
+- Initial package
@@ -0,0 +1,14 @@
+--- 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"
+ 
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = [
+-    "fileapi",
+-    "handleapi",
+-    "stringapiset",
+-    "winnls",
+-]
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "tectonic.spec"
-    }
-}
@@ -1,35 +0,0 @@
-%define debug_package %{nil}
-
-Name:           tectonic
-Version:        0.12.0
-Release:        2%{?dist}
-Summary:        A modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive
-URL:            https://github.com/tectonic-typesetting/tectonic
-License:        MIT
-Source0:        %{url}/archive/refs/tags/tectonic@%{version}.tar.gz
-Requires:       openssl harfbuzz-icu libpng freetype graphite2 zlib fontconfig
-BuildRequires:  cargo gcc gcc-c++ mold openssl-devel libpng-devel freetype graphite2-devel zlib-devel fontconfig-devel pkgconfig(icu-uc)
-
-%description
-Tectonic is a modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive.
-
-%prep
-%autosetup -n tectonic-tectonic-%{version}
-
-
-%build
-# cargo build --features external-harfbuzz
-
-
-%install
-cargo install --path . --features external-harfbuzz
-
-
-%files
-%doc README.md
-%license LICENSE 
-
-
-%changelog
-* Tue Nov 1 2022 windowsboy111 <windowsboy111@fyralabs.com>
- Repackaged for Terra
@@ -1,3 +0,0 @@
-let v = gh("tectonic-typesetting/tectonic");
-v.crop(9);
-rpm.version(v);
@@ -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:	1.5.1
+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
+
+
@@ -0,0 +1,22 @@
+From 6b8c81d1d4ac0ac562b69e7f8164c8a92dafe13a Mon Sep 17 00:00:00 2001
+From: windowsboy111 <wboy111@outlook.com>
+Date: Mon, 19 Jun 2023 10:33:20 +0800
+Subject: [PATCH] feat: add repository entry in package.json
+
+---
+ package.json | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/package.json b/package.json
+index 622756a..b3d3dfa 100644
+--- a/package.json
+++ b/package.json
+@@ -1,4 +1,5 @@
+ {
+  "repository": "github:VOICEVOX/voicevox",
+   "name": "voicevox",
+   "version": "999.999.999",
+   "author": "Hiroshiba Kazuyuki",
+-- 
+2.40.1
+
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "voicevox.spec"
+	}
+}
@@ -0,0 +1,5 @@
+let v = gh("VOICEVOX/voicevox");
+rpm.global("ver", v);
+let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines;
+rpm.global("nodev", find(">=([\\d.]+)", engines.node, 1));
+rpm.global("npmv", find(">=([\\d.]+)", engines.npm, 1));
@@ -0,0 +1,66 @@
+%global nodev 18.13.0
+%global npmv 8.19.3
+%global ver 0.18.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:			voicevox
+Version:		%ver
+Release:		4%?dist
+Summary:		Free Japanese text-to-speech editor
+License:		LGPL-3.0
+URL:			https://voicevox.hiroshiba.jp
+Source0:		https://github.com/VOICEVOX/voicevox/archive/refs/tags/%version.tar.gz
+# requires specific node and npm version
+%ifarch x86_64
+%global a x64
+%elifarch aarch64
+%global a arm64
+%endif
+Source1:		https://nodejs.org/download/release/v%nodev/node-v%nodev-linux-%a.tar.xz
+Patch0:			0001-feat-add-repository-entry-in-package.json.patch
+
+%description
+VOICEVOX is a free Japanese text-to-speech software with medium output quality.
+
+%package doc
+Summary: Documentation files for voicevox (Japanese)
+
+%description doc
+%summary.
+
+%prep
+%autosetup -p1
+tar xf %SOURCE1
+PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
+npx npm@%npmv i
+
+%build
+PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
+npx browserslist@latest --update-db
+PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
+npm run electron:build
+
+%install
+rm dist_electron/linux-unpacked/README.txt # dummy
+mkdir -p %buildroot%_datadir/%name %buildroot%_bindir %buildroot%_docdir/%name/res
+mv dist_electron/linux-unpacked/* %buildroot%_datadir/%name/
+ln -s %_datadir/%name/%name %buildroot%_bindir/%name
+install -Dm644 docs/*.md %buildroot%_docdir/%name/
+install -Dm644 docs/res/* %buildroot%_docdir/%name/res/
+
+%files
+%doc README.md
+%license LICENSE LGPL_LICENSE
+%_bindir/%name
+%_datadir/%name/
+
+%files doc
+%doc %_docdir/%name/
+
+%changelog
+%autochangelog
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "distrho.spec"
-    }
-}
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "dart.spec"
-    }
-}
@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
-        spec = "budgie-extras.spec"
-    }
+	rpm {
+		spec = "budgie-extras.spec"
+	}
 }
@@ -1,15 +1,15 @@
-
 Name:		budgie-extras
-Version:	1.5.90
-Release:	1%{dist}
+Version:	1.8.0
+Release:	1%{?dist}

-License:	GPLv3
+License:	GPL-3.0
 Summary:	Additional Budgie Desktop enhancements for user experience
 URL:		https://ubuntubudgie.org/

 Source0:	https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz
 Patch0: 0001-fix-weathershow-desktop-widget-icon-path.patch

+BuildRequires:	rpm_macro(fdupes)
 BuildRequires:	cmake
 BuildRequires:	meson
 BuildRequires:	vala
@@ -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
@@ -69,6 +68,7 @@ The applets can be used individually or as a set.
 %package	common
 Requires:	budgie-desktop
 Summary:	Shared component of budgie-extras applets
+BuildArch:	noarch
 %description	common
 The shared component provides for capabilities that are utilised between
 budgie-extra applets.
@@ -207,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)
@@ -282,6 +274,8 @@ workspaces.
 # Remove absolute symlink and replace with relative symlink
 rm -f %{buildroot}%{_bindir}/quickchar

+%fdupes %_libdir/budgie-desktop/plugins/budgie-weathershow/weather_icons
+
 %post

 %{__ln_s} -fv %{_bindir}/quickchar %{_libdir}/quickchar/quickchar
@@ -294,7 +288,7 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/glib-2.0/schemas/20_budgie-extras.gschema.override

 %files daemon
-%{_sysconfdir}/xdg/autostart/budgie-extras-daemon.desktop
+%config %{_sysconfdir}/xdg/autostart/budgie-extras-daemon.desktop
 %{_bindir}/budgie-extras-daemon
 %{_libdir}/budgie-extras-daemon/invoke.py
 %{_datadir}/budgie-desktop/layouts/*.layout
@@ -335,7 +329,7 @@ rm -f %{buildroot}%{_bindir}/quickchar

 %files -n budgie-applet-hotcorners
 %{_libdir}/budgie-desktop/plugins/budgie-hotcorners
-%{_sysconfdir}/xdg/autostart/org.ubuntubudgie.budgie-extras.HotCorners-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/org.ubuntubudgie.budgie-extras.HotCorners-autostart.desktop
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.budgie-extras.HotCorners.gschema.xml
 %{_datadir}/applications/org.ubuntubudgie.budgie-extras.HotCorners.desktop
 %{_datadir}/budgie-hotcorners
@@ -357,7 +351,7 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_libdir}/budgie-desktop/plugins/budgie-network-manager

 %files -n budgie-applet-quickchar
-%{_sysconfdir}/xdg/autostart/quickchar-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/quickchar-autostart.desktop
 %ghost %{_bindir}/quickchar
 %{_libdir}/quickchar
 %{_datadir}/applications/org.ubuntubudgie.quickchar.desktop
@@ -390,17 +384,14 @@ 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
-%{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
 %{_libdir}/budgie-desktop/plugins/budgie-visualspace
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.budgie-visualspace.gschema.xml
 %{_datadir}/pixmaps/visualspace-symbolic.svg

 %files -n budgie-applet-wallstreet
-%{_sysconfdir}/xdg/autostart/wallstreet-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/wallstreet-autostart.desktop
 %{_libdir}/budgie-wallstreet/wallstreet*
 %{_datadir}/applications/org.ubuntubudgie.wallstreetcontrol.desktop
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.budgie-wallstreet.gschema.xml
@@ -413,9 +404,9 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/pixmaps/budgie-wticon-symbolic.svg

 %files -n budgie-applet-window-shuffler
-%{_sysconfdir}/xdg/autostart/layoutspopup-autostart.desktop
-%{_sysconfdir}/xdg/autostart/dragsnap-autostart.desktop
-%{_sysconfdir}/xdg/autostart/shuffler*.desktop
+%config %{_sysconfdir}/xdg/autostart/layoutspopup-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/dragsnap-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/shuffler*.desktop
 %{_libdir}/budgie-window-shuffler
 %{_datadir}/applications/org.ubuntubudgie.shufflercontrol.desktop
 %{_datadir}/icons/hicolor/scalable/apps/org.ubuntubudgie.shuffler-control.svg
@@ -433,7 +424,7 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/pixmaps/budgie-wstopwatch-symbolic.svg

 %files -n budgie-applet-wpreviews
-%{_sysconfdir}/xdg/autostart/previews-*.desktop
+%config %{_sysconfdir}/xdg/autostart/previews-*.desktop
 %{_libdir}/budgie-previews
 %{_datadir}/applications/org.ubuntubudgie.previewscontrols.desktop
 %{_datadir}/metainfo/org.ubuntubudgie.previewscontrols.metainfo.xml
@@ -1,5 +1,5 @@
-project "pkg" {
-    rpm {
-        spec = "compiz9.spec"
-    }
-}
+project pkg {
+	rpm {
+		spec = "compiz9.spec"
+	}
+}
@@ -1,16 +1,20 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu1
+%define _ubuntu_rel 22.10.20220822-0ubuntu11
+%global _hardened_build 0

 Name:           compiz9
 Version:        0.9.14.2
-Release:        %autorelease
+Release:        3%?dist
 Summary:        OpenGL window and compositing manager 0.9.X.X series

-License:        GPLv2+ AND LGPLv2+ AND MIT
+License:        GPL-2.0-or-later AND LGPL-2.0-or-later AND MIT
 URL:            https://launchpad.net/compiz
 Source0:        http://archive.ubuntu.com/ubuntu/pool/universe/c/compiz/compiz_%{version}+%{_ubuntu_rel}.tar.xz
 Patch0:         https://raw.githubusercontent.com/cat-master21/unityDE-specs/main/patches/compiz-cmake-install-path.patch
+Patch1:         gtk-extents.patch
+Patch2:         focus-prevention-disable.patch

 Conflicts:     compiz
+BuildRequires: rpm_macro(fdupes)
 BuildRequires: libX11-devel
 BuildRequires: libdrm-devel
 BuildRequires: libXcursor-devel
@@ -38,28 +42,24 @@ BuildRequires: libwnck3-devel
 BuildRequires: cmake
 BuildRequires: gcc
 BuildRequires: g++
-BuildRequires: make
 BuildRequires: glibmm24-devel
-BuildRequires: lcov
 BuildRequires: python3-devel
+BuildRequires: python3-setuptools
 BuildRequires: boost-devel
 BuildRequires: libnotify-devel
 BuildRequires: python3-Cython
-BuildRequires: glibc-headers-x86
 BuildRequires: metacity-devel
 BuildRequires: libglvnd-devel
-BuildRequires: gcovr
 BuildRequires: mesa-libEGL-devel
 BuildRequires: glib2-devel
 BuildRequires: xorg-x11-server-devel
-Requires:      glib2
 Requires:      xorg-x11-server-Xorg
 Requires:      metacity
 Requires:      glx-utils

 %package devel
-Summary:	Development files for %{name}
-Requires:	%{name}%{?_isa} = %{version}-%{release}
+Summary:    Development files for %{name}
+Requires:   %{name}%{?_isa} = %{version}-%{release}

 %description devel
 This package contains the development files for %{name}.
@@ -67,6 +67,7 @@ This package contains the development files for %{name}.
 %package -n python3-ccsm
 Summary: Compiz Config Manager
 Conflicts: ccsm
+BuildArch: noarch
 Requires: %{name}%{?_isa}

 %description -n python3-ccsm
@@ -76,12 +77,12 @@ 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
 sed -i 's/(nouveau|Intel).*Mesa 8.0//' plugins/opengl/opengl.xml.in
-%cmake -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DBUILD_GTK=ON -DBUILD_METACITY=ON -DCOMPIZ_BUILD_TESTING=OFF -DBUILD_GLES=ON -DCOMPIZ_PACKAGING_ENABLED=TRUE -DBUILD_XORG_GTEST=OFF -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_WERROR=OFF
+%cmake -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DBUILD_GTK=ON -DBUILD_METACITY=ON -DCOMPIZ_BUILD_TESTING=OFF -DBUILD_GLES=OFF -DCOMPIZ_PACKAGING_ENABLED=TRUE -DBUILD_XORG_GTEST=OFF -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_WERROR=OFF
 %cmake_build

 %install
@@ -103,10 +104,14 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 mkdir -p %{buildroot}%{_datadir}/compiz/icons/hicolor/{scalable/{apps,\
 categories},22x22/{categories,devices,mimetypes}}

+%fdupes %buildroot%_datadir/glib-2.0/schemas/
+%fdupes %buildroot%_datadir/ccsm/icons/hicolor/scalable/apps/
+
+
 %files -f compiz.lang
-%doc AUTHORS README INSTALL NEWS
+%doc AUTHORS README NEWS
 %license COPYING COPYING.GPL COPYING.LGPL COPYING.MIT
-%config %{_sysconfdir}/compizconfig/config.conf
+%config(noreplace) %{_sysconfdir}/compizconfig/config.conf
 %{_bindir}/compiz
 %{_bindir}/compiz-decorator
 %{_bindir}/gtk-window-decorator
@@ -119,10 +124,21 @@ categories},22x22/{categories,devices,mimetypes}}
 %dir %{_libdir}/compizconfig
 %dir %{_libdir}/compizconfig/backends
 %{_libdir}/compizconfig/backends/*.so
-%{python3_sitearch}/compizconfig.cpython*.so
-%{python3_sitearch}/compizconfig_python*.egg-info/
+%{python3_sitearch}/*
 %{_datadir}/applications/compiz.desktop
-#{_datadir}/compiz/
+%dir %{_datadir}/compiz
+%{_datadir}/compiz/*.xml
+%{_datadir}/compiz/*.png
+%{_datadir}/compiz/colorfilter/
+%{_datadir}/compiz/cube/
+%{_datadir}/compiz/cubeaddon/
+%{_datadir}/compiz/icons/
+%{_datadir}/compiz/mag/
+%{_datadir}/compiz/notification/
+%{_datadir}/compiz/scale/
+%{_datadir}/compiz/showmouse/
+%{_datadir}/compiz/splash/
+%{_datadir}/compiz/xslt/
 %{_datadir}/glib-2.0/schemas/org.compiz*.gschema.xml
 %{_datadir}/gnome-control-center/keybindings/50-compiz-*.xml

@@ -134,6 +150,7 @@ categories},22x22/{categories,devices,mimetypes}}
 %{_libdir}/libcompiz_core.so
 %{_libdir}/libdecoration.so
 %{_libdir}/pkgconfig/*.pc
+%{_datadir}/compiz/cmake/
 %{_datadir}/cmake/Modules/*.cmake

 %files -n python3-ccsm -f ccsm.lang
@@ -150,4 +167,4 @@ categories},22x22/{categories,devices,mimetypes}}
 %{python3_sitelib}/ccsm-%{version}-py%{python3_version}.egg-info

 %changelog
-%autochangelog
+%autochangelog
@@ -0,0 +1,12 @@
+diff -Naur original/metadata/core.xml.in modified/metadata/core.xml.in
+--- original/metadata/core.xml.in	2013-07-23 20:58:03.000000000 +0100
+++ modified/metadata/core.xml.in	2014-06-11 09:06:53.839302487 +0100
+@@ -114,7 +114,7 @@
+ 			<_long>Level of focus stealing prevention</_long>
+ 			<min>0</min>
+ 			<max>4</max>
+-			<default>1</default>
+			<default>0</default>
+ 			<desc>
+ 				<value>0</value>
+ 				<_name>Off</_name>
@@ -0,0 +1,13 @@
+# Diff from https://code.launchpad.net/~albertsmuktupavels/compiz/add-gtk-frame-extents-to-net-supported/+merge/257303
+=== modified file 'src/screen.cpp'
+--- a/src/screen.cpp	2014-12-02 19:37:10 +0000
+++ b/src/screen.cpp	2015-04-23 20:41:24 +0000
+@@ -2362,6 +2362,7 @@
+ 
+     atoms.push_back (Atoms::wmUserTime);
+     atoms.push_back (Atoms::frameExtents);
+    atoms.push_back (Atoms::frameGtkExtents);
+     atoms.push_back (Atoms::frameWindow);
+ 
+     atoms.push_back (Atoms::winState);
+
@@ -0,0 +1,5 @@
+let html = get("http://archive.ubuntu.com/ubuntu/pool/universe/c/compiz/?C=N;O=D");
+let v = find("compiz_([\\d.]+)\\+(.+?).tar.xz", html, 1);
+let r = find("compiz_([\\d.]+)\\+(.+?).tar.xz", html, 2);
+rpm.version(v);
+rpm.define("_ubuntu_rel", r);
@@ -0,0 +1,99 @@
+diff --git a/src/Core/Package.vala b/src/Core/Package.vala
+index 62d206fa..cbf05983 100644
+--- a/src/Core/Package.vala
+++ b/src/Core/Package.vala
+@@ -42,8 +42,29 @@ public enum RuntimeStatus {
+ }
+
+ public class AppCenterCore.Package : Object {
+    // locally installed packages
+     public const string APPCENTER_PACKAGE_ORIGIN = "appcenter";
+-    private const string ELEMENTARY_STABLE_PACKAGE_ORIGIN = "elementary-stable-jammy-main";
+
+    // Fedora repositories
+    private const string FEDORA_STABLE_PACKAGE_ORIGIN = "fedora";
+    private const string FEDORA_UPDATES_PACKAGE_ORIGIN = "updates";
+    private const string FEDORA_TESTING_PACKAGE_ORIGIN = "updates-testing";
+
+    // RPMFusion repositories
+    private const string RPMFUSION_FREE_STABLE_PACKAGE_ORIGIN = "rpmfusion-free";
+    private const string RPMFUSION_FREE_UPDATES_PACKAGE_ORIGIN = "rpmfusion-free-updates";
+    private const string RPMFUSION_FREE_TESTING_PACKAGE_ORIGIN = "rpmfusion-free-updates-testing";
+    private const string RPMFUSION_NONFREE_STABLE_PACKAGE_ORIGIN = "rpmfusion-nonfree";
+    private const string RPMFUSION_NONFREE_UPDATES_PACKAGE_ORIGIN = "rpmfusion-nonfree-updates";
+    private const string RPMFUSION_NONFREE_TESTING_PACKAGE_ORIGIN = "rpmfusion-nonfree-updates-testing";
+
+    // Ultramarine repositories
+    private const string ULTRAMARINE_PACKAGE_ORIGIN = "ultramarine";
+    private const string AKMODS_SECUREBOOT_PACKAGE_ORIGIN = "copr::egeretto:akmods-secureboot";
+    private const string KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN = "copr::egeretto:kmodtool-secureboot";
+
+    // Terra repositories
+    private const string TERRA_PACKAGE_ORIGIN = "terra";
+
+     public RuntimeStatus runtime_status { get; set; default = RuntimeStatus.UP_TO_DATE; }
+
+@@ -216,8 +237,12 @@ public class AppCenterCore.Package : Object {
+     public bool is_native {
+         get {
+             switch (component.get_origin ()) {
+-                case APPCENTER_PACKAGE_ORIGIN:
+-                case ELEMENTARY_STABLE_PACKAGE_ORIGIN:
+                case FEDORA_STABLE_PACKAGE_ORIGIN:
+                case FEDORA_UPDATES_PACKAGE_ORIGIN:
+                case FEDORA_TESTING_PACKAGE_ORIGIN:
+                case ULTRAMARINE_PACKAGE_ORIGIN:
+                case AKMODS_SECUREBOOT_PACKAGE_ORIGIN:
+                case KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN:
+                     return true;
+                 default:
+                     return false;
+@@ -328,12 +353,33 @@ public class AppCenterCore.Package : Object {
+         owned get {
+             unowned string origin = component.get_origin ();
+             if (backend is PackageKitBackend) {
+-                if (origin == APPCENTER_PACKAGE_ORIGIN) {
+-                    return _("AppCenter");
+-                } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) {
+-                    return _("elementary Updates");
+-                } else if (origin.has_prefix ("ubuntu-")) {
+-                    return _("Ubuntu (non-curated)");
+                switch (origin) {
+                    case FEDORA_STABLE_PACKAGE_ORIGIN:
+                        return "Fedora";
+                    case FEDORA_UPDATES_PACKAGE_ORIGIN:
+                        return "Fedora Updates";
+                    case FEDORA_TESTING_PACKAGE_ORIGIN:
+                        return "Fedora Updates (Testing)";
+                    case RPMFUSION_FREE_STABLE_PACKAGE_ORIGIN:
+                        return "RPMFusion";
+                    case RPMFUSION_FREE_UPDATES_PACKAGE_ORIGIN:
+                        return "RPMFusion Updates";
+                    case RPMFUSION_FREE_TESTING_PACKAGE_ORIGIN:
+                        return "RPMFusion Updates (Testing)";
+                    case RPMFUSION_NONFREE_STABLE_PACKAGE_ORIGIN:
+                        return "RPMFusion (Non-free Software)";
+                    case RPMFUSION_NONFREE_UPDATES_PACKAGE_ORIGIN:
+                        return "RPMFusion (Non-free Software) Updates";
+                    case RPMFUSION_NONFREE_TESTING_PACKAGE_ORIGIN:
+                        return "RPMFusion (Non-free Software) Updates (Testing)";
+                    case ULTRAMARINE_PACKAGE_ORIGIN:
+                        return "Ultramarine";
+                    case AKMODS_SECUREBOOT_PACKAGE_ORIGIN:
+                        return "Secureboot support for akmods";
+                    case KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN:
+                        return "Secureboot support for kmodtool";
+                    case TERRA_PACKAGE_ORIGIN:
+                        return "Terra";
+                 }
+             } else if (backend is FlatpakBackend) {
+                 var fp_package = this as FlatpakPackage;
+@@ -342,8 +388,6 @@ public class AppCenterCore.Package : Object {
+                 }
+
+                 return fp_package.remote_title;
+-            } else if (backend is UbuntuDriversBackend) {
+-                return _("Ubuntu Drivers");
+             }
+
+             return _("Unknown Origin (non-curated)");
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "elementary-appcenter.spec"
+	}
+}
@@ -0,0 +1,10 @@
+# false positives
+addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*")
+addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*")
+
+# don't care about manpages
+addFilter("W: no-manual-page-for-binary io.elementary.appcenter*")
+
+# don't care about no documentation for sub-packages
+addFilter("W: no-documentation*")
+
@@ -0,0 +1,313 @@
+%global appname io.elementary.appcenter
+
+Name:           elementary-appcenter
+Summary:        Software Center from elementary
+Version:        7.4.0
+Release:        1%{?dist}
+License:        GPL-3.0
+
+Provides:       appcenter = %{version}-%{release}
+Obsoletes:      appcenter < 7.2.1-2
+
+URL:            https://github.com/elementary/appcenter
+Source0:        %url/archive/%{version}/appcenter-%{version}.tar.gz
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  libappstream-glib
+BuildRequires:  meson
+BuildRequires:  vala
+
+BuildRequires:  appstream-vala
+
+BuildRequires:  pkgconfig(appstream) >= 0.10.0
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(flatpak)
+BuildRequires:  pkgconfig(gee-0.8)
+BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(packagekit-glib2)
+BuildRequires:  pkgconfig(polkit-gobject-1)
+
+Requires:       PackageKit
+Requires:       hicolor-icon-theme
+
+%description
+AppCenter is a native Gtk+ app store built on AppStream and Packagekit.
+
+
+%package        gnome-shell-search-provider
+Summary:        Software Center from elementary (gnome-shell search provider)
+
+Provides:       appcenter-gnome-shell-search-provider = %{version}-%{release}
+Obsoletes:      appcenter-gnome-shell-search-provider < 7.2.1-2
+
+BuildArch:      noarch
+
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnome-shell
+
+Supplements:    (%{name} and gnome-shell)
+
+%description    gnome-shell-search-provider
+AppCenter is a native Gtk+ app store built on AppStream and Packagekit.
+
+This package contains the gnome-shell search provider.
+
+
+%prep
+%autosetup -p1 -n appcenter-%version
+
+
+%build
+%meson -Dpayments=false -Dcurated=false -Dhide_upstream_distro_apps=false
+%meson_build
+
+
+%install
+%meson_install
+
+%find_lang %{appname}
+
+# remove empty hidden apps file
+rm -r %{buildroot}/%{_sysconfdir}/%{appname}/appcenter.hiddenapps
+
+# create autostart entry symlink
+mkdir -p %{buildroot}/%{_sysconfdir}/xdg/autostart/
+
+ln -s %{_datadir}/applications/%{appname}-daemon.desktop \
+    %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+
+
+%check
+desktop-file-validate \
+    %{buildroot}/%{_datadir}/applications/%{appname}*.desktop
+
+appstream-util validate-relax --nonet \
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+
+
+%files -f %{appname}.lang
+%doc README.md
+%license COPYING
+
+%dir %{_sysconfdir}/%{appname}
+%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+
+%{_bindir}/%{appname}
+
+%{_datadir}/applications/%{appname}*.desktop
+%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
+%{_datadir}/icons/hicolor/*/apps/%{appname}{,-symbolic}.svg
+%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/polkit-1/actions/%{appname}.policy
+
+
+%files gnome-shell-search-provider
+%{_datadir}/gnome-shell/search-providers/%{appname}.search-provider.ini
+
+
+%changelog
+* Tue Jun 07 2022 Fabio Valentini <decathorpe@gmail.com> - 3.10.0-1
+- Update to version 3.10.0.
+
+* Tue Dec 14 2021 Fabio Valentini <decathorpe@gmail.com> - 3.9.1-1
+- Update to version 3.9.1.
+
+* Wed Nov 24 2021 Fabio Valentini <decathorpe@gmail.com> - 3.9.0-1
+- Update to version 3.9.0.
+
+* Sat Oct 30 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.2-1
+- Update to version 3.8.2.
+
+* Wed Oct 27 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.1-1
+- Update to version 3.8.1.
+
+* Tue Sep 28 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.0-1
+- Update to version 3.8.0.
+
+* Fri Sep 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-3
+- Mark flatpak sources in the UI.
+
+* Fri Sep 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-2
+- Hard-code Fedora instead of ubuntu repository names.
+
+* Tue Aug 31 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-1
+- Update to version 3.7.1.
+
+* Fri Aug 27 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.0-1
+- Update to version 3.7.0.
+
+* Tue Aug 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.3-1
+- Update to version 3.6.3.
+
+* Wed Aug 11 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.2-1
+- Update to version 3.6.2.
+
+* Thu Aug 05 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.1-1
+- Update to version 3.6.1.
+
+* Fri Jul 16 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.0-1
+- Update to version 3.6.0.
+
+* Fri Oct 09 2020 Fabio Valentini <decathorpe@gmail.com> - 3.5.1-1
+- Update to version 3.5.1.
+
+* Wed Oct 07 2020 Fabio Valentini <decathorpe@gmail.com> - 3.5.0-1
+- Update to version 3.5.0.
+
+* Fri Aug 07 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.2-1
+- Update to version 3.4.2.
+
+* Thu Jul 02 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.1-1
+- Update to version 3.4.1.
+
+* Thu May 28 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.0-1
+- Update to version 3.4.0.
+
+* Thu Apr 30 2020 Fabio Valentini <decathorpe@gmail.com> - 3.3.0-1
+- Update to version 3.3.0.
+
+* Thu Apr 09 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.4-1
+- Update to version 3.2.4.
+
+* Thu Apr 02 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.3-1
+- Update to version 3.2.3.
+
+* Mon Mar 23 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-1
+- Update to version 3.2.2.
+
+* Fri Feb 28 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.1-1
+- Update to version 3.2.1.
+
+* Fri Feb 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.1-1
+- Update to version 3.1.1.
+
+* Wed Jan 02 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.0-1
+- Update to version 3.1.0.
+- Remove empty blacklist file.
+
+* Fri Nov 30 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0.1-2
+- Drop elementaryOS blacklist in favor of the version shipped with appcenter.
+
+* Thu Oct 25 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0.1-1
+- Update to version 3.0.1.
+
+* Tue Oct 16 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0-2
+- Add missing autostart entry symlink for the daemon.
+
+* Tue Oct 16 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0-1
+- Update to version 3.0.
+- Add gnome-shell search provider sub-package.
+- Explicitly disable payment system and curated applications.
+- Update blacklist file to current version from elementaryOS.
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jun 13 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.9-2
+- Rebuild for granite5 soname bump.
+
+* Thu Mar 08 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.9-1
+- Update to version 0.2.9.
+- Add patch to fix build with the newer vala and PackageKit on f28+.
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 26 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.8-1
+- Update to version 0.2.8.
+
+* Tue Nov 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.7-1
+- Update to version 0.2.7.
+
+* Fri Nov 03 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.6-2
+- Rebuild for granite soname bump.
+
+* Mon Sep 18 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.6-1
+- Update to version 0.2.6.
+
+* Sat Aug 05 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.5-1
+- Update to version 0.2.5.
+- Include fedora-specific blacklist adapted from elementaryOS.
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jul 04 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.4-1
+- Update to version 0.2.4.
+
+* Thu Jun 01 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.3-1
+- Update to version 0.2.3.
+
+* Mon May 22 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.2-1
+- Update to version 0.2.2.
+
+* Sat May 20 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.1-1
+- Update to version 0.2.1.
+
+* Wed May 17 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2-1
+- Update to version 0.2.
+
+* Thu Mar 16 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.4-1
+- Update to version 0.1.4.
+- Depend on generic icon again, since it _should_ work.
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jan 27 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-7
+- Add patch to rename generic icon to something branded.
+
+* Wed Jan 25 2017 Fabio Valentini <decathorpe@gmail.com>
+- Remove explicit BR: /usr/bin/pkgconfig.
+
+* Mon Jan 23 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-6
+- Explicitly depend on /usr/bin/pkg-config.
+
+* Mon Jan 23 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-5
+- Add missing scriptlets.
+
+* Sat Jan 21 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-4
+- Include icon to fix appdata metadata generation.
+
+* Tue Jan 10 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-3
+- Clean up spec file.
+
+* Sat Dec 24 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-2
+- Enable libunity support.
+
+* Mon Dec 05 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-1
+- Update to version 0.1.3.
+
+* Sun Nov 20 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.2-2
+- Build out of tree.
+
+* Sat Oct 29 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.2-1
+- Update to version 0.1.2.
+
+* Fri Oct 07 2016 Neal Gompa <ngompa13@gmail.com> - 0.1.1-4
+- Add patch to support AppStream 0.10.0 in F25 (LP#1626398)
+
+* Thu Sep 29 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-3
+- Mass rebuild.
+
+* Wed Sep 28 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-2
+- Spec file cleanups.
+
+* Tue Sep 27 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-1
+- Update to version 0.1.1.
+
+* Sat Sep 17 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1-2
+- Require PackageKit.
+
+* Thu Aug 18 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1-1
+- Update to version 0.1.
+
@@ -0,0 +1 @@
+rpm.version(gh("elementary/appcenter"));
@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
-        spec = "contractor.spec"
-    }
+	rpm {
+		spec = "contractor.spec"
+	}
 }
@@ -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
@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
-        spec = "elementary-calculator.spec"
-    }
+	rpm {
+		spec = "elementary-calculator.spec"
+	}
 }
@@ -3,9 +3,9 @@

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

 URL:            https://github.com/elementary/%{srcname}
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
@@ -18,6 +18,7 @@ BuildRequires:  vala

 BuildRequires:  pkgconfig(granite-7) >= 7.0.0
 BuildRequires:  pkgconfig(gtk4)
+BuildRequires:  fdupes

 Requires:       hicolor-icon-theme

@@ -45,13 +46,15 @@ functions (sin, cos, and tan).

 %find_lang %{appname}

+%fdupes %buildroot/%_datadir/icons/hicolor
+

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

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


 %files -f %{appname}.lang
@@ -63,9 +66,9 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml


 %changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 1.7.2-1
 - Repackaged for Terra
@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
-        spec = "elementary-calendar.spec"
-    }
+	rpm {
+		spec = "elementary-calendar.spec"
+	}
 }
@@ -5,15 +5,13 @@

 Name:           elementary-calendar
 Summary:        Desktop calendar app designed for elementary
-Version:        6.1.2
+Version:        7.0.0
 Release:        1%{?dist}
-License:        GPLv3+
+License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/calendar
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

-Patch0:         https://patch-diff.githubusercontent.com/raw/elementary/calendar/pull/758.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -21,6 +19,8 @@ BuildRequires:  pkgconfig(champlain-0.12)
 BuildRequires:  pkgconfig(libecal-2.0)
 BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(libhandy-1)
+# BuildRequires:  pkgconfig(libportal)
+BuildRequires:  pkgconfig(libportal-gtk3)
 BuildRequires:  folks-devel
 BuildRequires:  libgee-devel
 BuildRequires:  pkgconfig(geocode-glib-2.0)
@@ -32,6 +32,7 @@ BuildRequires:  libhandy >= 0.90.0
 BuildRequires:  meson
 BuildRequires:  vala
 BuildRequires:  evolution-data-server-devel
+BuildRequires:  fdupes

 Requires:       hicolor-icon-theme

@@ -64,22 +65,21 @@ This package contains the development files.

 %find_lang %{appname}

+%fdupes %buildroot/%_datadir/icons/hicolor
+

 %check
-desktop-file-validate \
-    %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
-desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{appname}.desktop
+%dnl desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{appname}.desktop

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


 %files -f %{appname}.lang
 %doc README.md
 %license COPYING

-%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop

 %{_bindir}/%{appname}

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

 %files devel
 %{_includedir}/%{name}/
@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
-        spec = "elementary-camera.spec"
-    }
+	rpm {
+		spec = "elementary-camera.spec"
+	}
 }
@@ -3,9 +3,9 @@

 Name:           elementary-camera
 Summary:        Camera app designed for elementary
-Version:        6.2.1
-Release:        1%{?dist}
-License:        GPLv3
+Version:        6.2.2
+Release:        2%{?dist}
+License:        GPL-3.0

 URL:            https://github.com/elementary/camera
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
@@ -15,6 +15,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46
 BuildRequires:  vala
+BuildRequires:  fdupes

 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -46,13 +47,16 @@ Camera is a simple app to take photos with a webcam.

 %find_lang %{appname}

+%fdupes %buildroot/%_datadir/icons/hicolor
+
+

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

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


 %files -f %{appname}.lang
@@ -64,7 +68,7 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml


 %changelog
@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
-        spec = "elementary-capnet-assist.spec"
-    }
+	rpm {
+		spec = "elementary-capnet-assist.spec"
+	}
 }
@@ -3,9 +3,9 @@

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

 URL:            https://github.com/elementary/capnet-assist
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
@@ -25,6 +25,7 @@ BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1) >= 1.0.0
 BuildRequires:  pkgconfig(webkit2gtk-4.1)
+BuildRequires:  fdupes

 Requires:       NetworkManager
 Requires:       hicolor-icon-theme
@@ -54,13 +55,15 @@ Written in Vala and using WebkitGtk+.

 %find_lang %{appname}

+%fdupes %buildroot%_datadir/icons/hicolor/
+

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

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


 %files -f %{appname}.lang
@@ -72,9 +75,9 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml


 %changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 2.4.2-1
 - Repackaged for Terra
--- a/Show More
+++ b/Show More