Merge branch 'f38' into p/rustdesk

feat: port #994 to 38 (#997 )
bump: iosevka-fusion anda
2026-05-31 09:01:55 +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
418 changed files with 3276 additions and 10337 deletions
@@ -1,9 +0,0 @@
-{
-  "repoOwner": "terrapkg",
-  "repoName": "packages",
-  "resetAuthor": true,
-  "targetBranchChoices": ["f39", "f40", "frawhide"],
-  "branchLabelMapping": {
-    "^sync-(.+)$": "$1"
-  }
-}
@@ -1,4 +1,4 @@
-ARG VARIANT="rawhide"
+ARG VARIANT="38"
 FROM fedora:${VARIANT}

 RUN useradd -m vscode
@@ -2,7 +2,7 @@
  "name": "Fedora",
  "build": {
    "dockerfile": "Dockerfile",
-    "args": { "VARIANT": "rawhide" }
+    "args": { "VARIANT": "38" }
  },
  "remoteUser": "vscode",
  "runArgs": [
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f41
+      - f38
  pull_request:
    branches:
-      - f41
+      - f38
  merge_group:
    branches:
-      - f41
+      - f38
  workflow_dispatch:
  workflow_call:

@@ -23,13 +23,13 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:f41
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Generate build matrix
@@ -40,38 +40,33 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["41"]
+        version: ["38"]
      fail-fast: false
-    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
-
-      - name: Checkout latest Mock configs
-        uses: actions/checkout@v4
-        with:
-          repository: terrapkg/mock-configs
-          path: mock-configs
-
      - 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 mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
-
-      - name: Build with Andaman (alternate arch)
-        if: |
-          matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib']
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-i386.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -80,13 +75,10 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

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

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

-      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
      - name: Notify Madoguchi (Success)
        if: success() && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
        if: ( cancelled() || failure() ) && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -7,55 +7,71 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["41"]
+        version: ["38"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
+      image: fedora:38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
-      - name: Install repositories
-        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel-engine cargo podman fuse-overlayfs
-
-      - name: Install Anda
-        run: cargo install anda
-
-      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v3
        with:
-          ref: f${{ matrix.version }}
+          go-version: "^1.19"
+
+      - name: Install repositories
+        run: |
+          sudo dnf install -y dnf-plugins-core
+          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
+          sudo dnf install -y mock createrepo_c rpm-build gcc curl wget git-core openssl-devel
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install Anda
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: anda
+
+
+      - uses: actions/checkout@v3
+        with:
+          ref: f${{ matrix.version} }}
          fetch-depth: 1
      - name: Build terra-mock-configs
        run: |
-          echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV
-          export PATH=$PATH:/github/home/.cargo/bin
          git config --global --add safe.directory "$GITHUB_WORKSPACE"
          anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/terra/mock-configs/pkg -p rpm
      - name: Install terra-mock-configs
-        run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
-
-      - name: Build anda-srpm-macros
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/terra/srpm-macros/pkg
+        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 terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/subatomic/pkg
+        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: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+        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 terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda -p rpm

-      - name: Upload packages to subatomic
+
+      - name: Upload to Subatomic
        run: |
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*
-
-      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
@@ -5,73 +5,46 @@ on:
      packages:
        description: "Packages to Build"
        required: true
-      custom_builder:
-        description: "Custom Builder"
-        required: false
-        default: ""
-      architecture:
-        description: "Architecture"
-        required: false
-        default: all
-        type: string

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

  build:
    needs: parse
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["41"]
-        arch: ${{ fromJson(needs.parse.outputs.arch) }}
+        version: ["38"]
+        arch: ["x86_64", "aarch64"]
      fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
-
-      - name: Checkout latest Mock configs
-        uses: actions/checkout@v4
-        with:
-          repository: terrapkg/mock-configs
-          path: mock-configs
-
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: Include custom build template instead of package default
-        run: |
-          cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+      - 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 mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg
+        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -80,13 +53,10 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

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

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

-      - name: Upload source packages to subatomic
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
      - name: Notify Madoguchi (Success)
-        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        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()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        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}}
@@ -11,33 +11,29 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["41"]
+        version: ["38"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
-
-      - name: Checkout latest Mock configs
-        uses: actions/checkout@v4
-        with:
-          repository: terrapkg/mock-configs
-          path: mock-configs
-
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: Include custom build template instead of package default
-        run: |
-          cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+      - 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 mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -46,13 +42,10 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

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

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

-      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
      - name: Notify Madoguchi (Success)
-        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        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()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        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}}
@@ -3,20 +3,20 @@ name: Lint
 on:
  push:
    branches:
-      - frawhide
+      - f38
  pull_request:
    branches:
-      - frawhide
+      - f38
  merge_group:
    branches:
-      - frawhide
+      - f38
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f38
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Lint spec files
        run: rpmlint $(find anda -type f -name "*.spec" -type f)
@@ -2,7 +2,7 @@ set -x

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

 if [[ $1 == false ]]; then
 	d=${p/\%v/?}
@@ -17,5 +17,5 @@ for f in anda-build/rpm/rpms/*; do
 	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/ci5/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
+	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
@@ -1,37 +0,0 @@
-name: Automatic backport/sync action
-
-on:
-  pull_request_target:
-    types: ["labeled", "closed"]
-
-jobs:
-  backport:
-    name: Backport/sync PR
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.merged
-    steps:
-      - name: Install SSH signing key
-        run: |
-          mkdir -p ${{ runner.temp }}
-          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
-          chmod 0700 ${{ runner.temp }}/signing_key
-
-      - name: Setup Raboneko Signing
-        run: |
-          git config --global gpg.format "ssh"
-          git config --global user.signingkey "${{ runner.temp }}/signing_key"
-          git config --global commit.gpgsign true
-
-      - name: Backport Action
-        uses: sorenlouv/backport-github-action@v9.3.0
-        with:
-          github_token: ${{ secrets.RABONEKO_BACKPORT_GITHUB_TOKEN }}
-          auto_backport_label_prefix: sync-
-
-      - name: Info log
-        if: ${{ success() }}
-        run: cat ~/.backport/backport.info.log
-
-      - name: Debug log
-        if: ${{ failure() }}
-        run: cat ~/.backport/backport.debug.log
@@ -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,9 +3,8 @@ name: Push comps updates
 on:
  push:
    branches:
-      - frawhide
-      - f41
-      - f40
+      - f38
+      - f37
    paths:
      - comps.xml
  workflow_dispatch:
@@ -14,9 +13,9 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f38
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Push to subatomic
        run: |
          branch=${{ github.ref_name }}
@@ -8,21 +8,20 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

-      - name: Install SSH signing key & Set up git repository
+      - name: Install SSH signing key
        run: |
          mkdir -p ${{ runner.temp }}
          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Nightly Update
        run: anda update -vv --filters nightly=1
@@ -31,6 +30,7 @@ jobs:

      - name: Save
        run: |
+          git config --global --add safe.directory "*"
          if [[ `git status --porcelain` ]]; then
            git config user.name "Raboneko"
            git config user.email "raboneko@fyralabs.com"
@@ -46,7 +46,7 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
+            copy_over f37 || true
            copy_over f39 || true
-            copy_over f40 || true
            git push -u origin --all
          fi
@@ -8,30 +8,30 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

-      - name: Install SSH signing key & Set up git repository
+      - name: Install SSH signing key
        run: |
          mkdir -p ${{ runner.temp }}
          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
-        run: anda update -vv --filters nightly=0
+        run: anda update -vv
        env:
          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full

      - name: Save
        run: |
+          git config --global --add safe.directory "*"
          if [[ `git status --porcelain` ]]; then
            git config user.name "Raboneko"
            git config user.email "raboneko@fyralabs.com"
@@ -47,7 +47,7 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
+            copy_over f37 || true
            copy_over f39 || true
-            copy_over f40 || true
            git push -u origin --all
          fi
@@ -1,2 +1 @@
 anda-build/
-**/*.tar*
@@ -1,9 +1,7 @@
 # Contributing

-First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q).
+First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q). Since we use a GitHub Wiki for [documention](https://github.com/terrapkg/packages/wiki), our guidelines may be found there. See the links below:

-## Documentations
-
-* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
-* [FAQ](https://developer.fyralabs.com/terra/faq)
-* [Policy](https://developer.fyralabs.com/terra/policy)
+* [Contribution Guide](https://github.com/terrapkg/packages/wiki/Contribute)
+* [FAQ](https://github.com/terrapkg/packages/wiki/FAQ)
+* [Policy](https://github.com/terrapkg/packages/wiki/Policy)
@@ -1,5 +1,6 @@
 # Terra Sources

+[![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)
@@ -11,7 +12,7 @@ This monorepo contains the package manifests for all packages in Terra.

 ## Installation
 ```bash
-sudo dnf install --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' --setopt='terra.gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc' terra-release
+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.

@@ -3,7 +3,7 @@
 ## Our Process

 Fyra Labs is committed to ensuring user security and privacy.
-As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://developer.fyralabs.com/terra/faq#technical-details).
+As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://github.com/terrapkg/packages/wiki/FAQ#technical-details).

 As a part of Fyra Labs's transparency measures, we will publicize details of any known breaches. This information will include, but will not be limited to:
 * Affected users, infrastructure, and data.
@@ -11,7 +11,7 @@ As a part of Fyra Labs's transparency measures, we will publicize details of any
 * An in-depth explanation of how the breach occurred, including relevant security vulnerabilities.
 * How Fyra Labs will better protect user data in the future, ensuring our commitment to security and privacy.

-We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs), [Fedi](https://fedi.fyralabs.com/@hq), and [Discord](https://discord.gg/5fdPuxTg5Q).
+We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs) and [Discord](https://discord.gg/5fdPuxTg5Q).

 ## Reporting a Vulnerability

@@ -1,26 +1,18 @@
-%global xurl https://files.pythonhosted.org/packages/51/5f/6f52b958fe38a36a0799c01fbd56a742ebdfcf41f89438dbee998b8ce692/anki-24.06.3-cp39-abi3-manylinux_2_28_x86_64.whl
-%global aurl https://files.pythonhosted.org/packages/df/bb/b0bfbc6a06a598b0b614d18dd8c4f40827828649f9742f1f44a4e44d6a2c/anki-24.06.3-cp39-abi3-manylinux_2_31_aarch64.whl
-%global qurl https://files.pythonhosted.org/packages/21/2a/d8e22a9521be04ef29a30d21a2c3008783ab03b6f07cc14696a040f747a4/aqt-24.06.3-py3-none-any.whl
-
 Name:			anki-bin
-Version:		24.06.3
-Release:		1%?dist
+Version:		23.12.1
+Release:		1%{?dist}
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:			https://apps.ankiweb.net/
-BuildRequires:	python3-pip rpm_macro(fdupes) cargo
+BuildRequires:	python3-pip rpm_macro(fdupes)
 Requires:		python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
 Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
 Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
 Requires:       libxcrypt-compat hicolor-icon-theme sox mpv 
 ExclusiveArch:	x86_64
 Conflicts:		anki
-%ifarch x86_64
-Source0:		%xurl
-%elifarch aarch64
-Source0:        %aurl
-%endif
-Source1:		%qurl
+Source0:		https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
+Source1:		https://files.pythonhosted.org/packages/py3/a/aqt/aqt-%{version}-py3-none-any.whl
 Source2:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/runanki.py
 Source3:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.desktop
 Source4:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.png
@@ -1,15 +1 @@
-let aarch64_regex = `<a href="https://files\.pythonhosted\.org/packages/(..)/(..)/(.{60})/anki-([\d.]+)-cp(\d+)-abi3-manylinux_.+?_aarch64.whl">`;
-let html = get("https://pypi.org/project/anki/");
-let relevant = find(aarch64_regex, html, 0);
-let ver = find(aarch64_regex, relevant, 4);
-rpm.version(ver);
-if rpm.changed() {
-    rpm.release();
-    rpm.global("aurl", find(`"(.+)"`, relevant, 1));
-    let cp = find(aarch64_regex, relevant, 5);
-    let x86_64_regex = `<a href="https://files\.pythonhosted\.org/packages/(..)/(..)/(.{60})/anki-${ver}-cp${cp}-abi3-manylinux_.+?_x86_64.whl">`;
-    let relevant1 = find(x86_64_regex, html, 0);
-    rpm.global("xurl", find(`"(.+)"`, relevant1, 1));
-    let qhtml = get("https://pypi.org/project/aqt/");
-    rpm.global("qurl", find(`<a href="(https://files\.pythonhosted\.org/packages/../../.{60}/aqt-${ver}-py3-none.any.whl)">`, qhtml, 1));
-}
+rpm.version(gh("ankitects/anki"));
@@ -1,6 +1,6 @@
 Name:           anki-qt5
-Version:        24.06.3
-Release:        1%?dist
+Version:        23.12.1
+Release:        1%{?dist}
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
@@ -20,10 +20,9 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
 Anki is based on a theory called spaced repetition.

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

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

@@ -1,6 +1,6 @@
 Name:           anki
-Version:        24.06.3
-Release:        1%?dist
+Version:        23.12.1
+Release:        1%{?dist}
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
@@ -20,10 +20,8 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
 Anki is based on a theory called spaced repetition.

 %prep
-rm -rf *
 git clone https://github.com/ankitects/anki .
 git checkout %{version}
-%patch 0 -p1

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

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

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

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

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

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

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

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

 Name:           discord-canary-openasar
-Version:        0.0.471
+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
@@ -34,7 +34,6 @@ sed "s@Discord Canary@Discord Canary OpenAsar@g" a > discord-canary.desktop

 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/discord-canary-openasar
 cp -rv * %{buildroot}%{_datadir}/discord-canary-openasar
 mkdir -p %{buildroot}%{_datadir}/applications/
@@ -43,11 +42,9 @@ ln -s %_datadir/discord-canary-openasar/discord-canary.desktop %{buildroot}%{_da
 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
-ln -s %_datadir/discord-canary-openasar/DiscordCanary %buildroot%_bindir/discord-canary-openasar


 %files
-%_bindir/discord-canary-openasar
 %{_datadir}/discord-canary-openasar/
 %{_datadir}/applications/discord-canary-openasar.desktop
 %{_datadir}/pixmaps/discord-canary-openasar.png
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary
-Version:        0.0.471
+Version:        0.0.324
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
@@ -16,8 +16,9 @@ Requires:       glibc GConf2 nspr >= 4.13 nss >= 3.27 libX11 >= 1.6 libXtst >= 1
 Group:          Applications/Internet
 ExclusiveArch:  x86_64
 %description
-All-in-one voice and text chat for gamers that's free, secure, and works on
-both your desktop and phone.
+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
@@ -26,17 +27,14 @@ both your desktop and phone.

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

 %files
-%_bindir/discord-canary
 %{_datadir}/discord-canary/
 %{_datadir}/applications/discord-canary.desktop
 %{_datadir}/pixmaps/discord-canary.png
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.64
+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
@@ -34,7 +34,6 @@ sed "s@Discord@Discord OpenAsar@g" a > discord.desktop

 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/discord-openasar
 cp -rv * %{buildroot}%{_datadir}/discord-openasar
 mkdir -p %{buildroot}%{_datadir}/applications/
@@ -43,11 +42,9 @@ ln -s %_datadir/discord-openasar/discord.desktop %{buildroot}%{_datadir}/applica
 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
-ln -s %_datadir/discord-openasar/Discord %buildroot%_bindir/discord-openasar


 %files
-%_bindir/discord-openasar
 %{_datadir}/discord-openasar/
 %{_datadir}/applications/discord-openasar.desktop
 %{_datadir}/pixmaps/discord-openasar.png
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb-openasar
-Version:        0.0.99
+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
@@ -34,7 +34,6 @@ sed "s@Discord Ptb@Discord Ptb OpenAsar@g" a > discord-ptb.desktop

 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_datadir}/discord-ptb-openasar
 cp -rv * %{buildroot}%{_datadir}/discord-ptb-openasar
 mkdir -p %{buildroot}%{_datadir}/applications/
@@ -45,11 +44,9 @@ install discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb-ope
 install discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb-openasar.png
 cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-ptb-openasar/resources/app.asar
 chmod o+w %{buildroot}%{_datadir}/discord-ptb-openasar/resources -R
-ln -s %_datadir/discord-ptb-openasar/Discord %buildroot%_bindir/discord-ptb-openasar


 %files
-%_bindir/discord-ptb-openasar
 %{_datadir}/discord-ptb-openasar/
 %{_datadir}/applications/discord-ptb-openasar.desktop
 %{_datadir}/pixmaps/discord-ptb-openasar.png
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb
-Version:        0.0.99
+Version:        0.0.76
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
@@ -20,8 +20,9 @@ Requires:       libXtst >= 1.2
 Group:          Applications/Internet
 ExclusiveArch:  x86_64
 %description
-All-in-one voice and text chat for gamers that's free, secure, and works on
-both your desktop and phone.
+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
@@ -30,17 +31,14 @@ both your desktop and phone.

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

 %files
-%_bindir/discord-ptb
 %{_datadir}/discord-ptb/
 %{_datadir}/applications/discord-ptb.desktop
 %{_datadir}/pixmaps/discord-ptb.png
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.64
+Version:		0.0.46
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -20,8 +20,9 @@ Requires:		libXtst >= 1.2
 Group:			Applications/Internet
 ExclusiveArch:	x86_64
 %description
-All-in-one voice and text chat for gamers that's free, secure, and works on
-both your desktop and phone.
+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
@@ -30,17 +31,14 @@ both your desktop and phone.

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

 %files
-%_bindir/discord
 %{_datadir}/discord/
 %{_datadir}/applications/discord.desktop
 %{_datadir}/pixmaps/discord.png
@@ -1,8 +0,0 @@
-project pkg {
-    rpm {
-        spec = "envision.spec"
-    }
-    labels {
-        nightly = 1
-    }
-}
@@ -1,47 +0,0 @@
-%global commit 56f2e0b0d6378fcf31d43d349c1e5ff57b6eb985
-%global commit_date 20240729
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name:           envision
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
-License:        AGPL-3.0-or-later
-URL:            https://gitlab.com/gabmus/envision/
-Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo
-BuildRequires:  pkgconfig(glib-2.0) >= 2.66
-BuildRequires:  pkgconfig(gio-2.0) >= 2.66
-BuildRequires:  pkgconfig(gtk4) >= 4.10.0
-BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  openssl-devel-engine
-BuildRequires:  openxr-devel
-BuildRequires:  libappstream-glib
-BuildRequires:  desktop-file-utils
-BuildRequires:  glib2-devel
-Recommends:     android-tools
-
-%description
-%summary.
-
-%prep
-%autosetup -n envision-%commit
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/envision
-%_datadir/applications/org.gabmus.envision.desktop
-%_datadir/envision/
-%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.svg
-%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg
-%_metainfodir/org.gabmus.envision.appdata.xml
@@ -1,5 +0,0 @@
-rpm.global("commit", gitlab_commit("gitlab.com", "46446166", "main"));
-if rpm.changed() {
-	rpm.global("commit_date", date());
-	rpm.release();
-}
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			feishin
-Version:		0.7.3
+Version:		0.6.1
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-	  spec = "komikku.spec"
-  }
-}
@@ -1,109 +0,0 @@
-%global appname Komikku
-%global uuid    info.febvre.%{appname}
-%global gtk4_version        4.14.4
-%global libadwaita_version  1.5.1
-%global pure_protobuf_version 2.0.0
-
-Name:           komikku
-Version:        1.54.0
-%forgemeta
-Release:        1%?dist
-Summary:        A manga reader for GNOME
-
-BuildArch:      noarch
-
-License:        GPL-3.0-or-later
-URL:            https://valos.gitlab.io/Komikku
-Source0:        https://codeberg.org/valos/%{appname}/archive/v%{version}.tar.gz#/%{name}-v%{version}.tar.gz
-
-BuildRequires:  desktop-file-utils
-BuildRequires:  intltool
-BuildRequires:  libappstream-glib
-BuildRequires:  meson >= 0.59.0
-BuildRequires:  python3-devel >= 3.8
-BuildRequires:  blueprint-compiler
-
-BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 1.35.9
-BuildRequires:  pkgconfig(gtk4) >= %{gtk4_version}
-BuildRequires:  pkgconfig(libadwaita-1) >= %{libadwaita_version}
-
-Requires:       hicolor-icon-theme
-Requires:       gtk4 >= %{gtk4_version}
-Requires:       libadwaita >= %{libadwaita_version}
-Requires:       libnotify
-Requires:       webkitgtk6.0
-Requires:       python3-beautifulsoup4
-Requires:       python3-brotli
-Requires:       python3-colorthief
-Requires:       python3-dateparser  %dnl >= 1.1.4 | https://bugzilla.redhat.com/show_bug.cgi?id=2115204
-Requires:       python3-emoji
-Requires:       python3-gobject
-Requires:       python3-keyring >= 21.6.0
-Requires:       python3-lxml
-Requires:       python3-natsort
-Requires:       python3-file-magic
-Requires:       python3-piexif
-Requires:       python3-pillow
-Requires:       python3-pillow-heif
-Requires:       python3-pure-protobuf >= %{pure_protobuf_version}
-Requires:       python3-rarfile
-Requires:       python3-requests
-Requires:       python3-unidecode
-
-%description
-Komikku is a manga reader for GNOME. It focuses on providing a clean, intuitive
-and adaptive interface.
-
-Keys features
-
-* Online reading from dozens of servers
-* Offline reading of downloaded comics
-* Categories to organize your library
-* RTL, LTR, Vertical and Webtoon reading modes
-* Several types of navigation:
-  * Keyboard arrow keys
-  * Right and left navigation layout via mouse click or tapping
-    (touchpad/touch screen)
-  * Mouse wheel
-  * 2-fingers swipe gesture (touchpad)
-  * Swipe gesture (touch screen)
-* Automatic update of comics
-* Automatic download of new chapters
-* Reading history
-* Light and dark themes
-
-%prep
-%autosetup -n %{name} -p1
-
-
-%build
-%meson
-%meson_build
-
-
-%install
-%meson_install
-%find_lang %{name}
-
-
-%check
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml
-desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-
-
-%files -f %{name}.lang
-%license LICENSE
-%doc README.md
-%{_bindir}/%{name}
-%{_datadir}/%{name}/
-%{_datadir}/applications/*.desktop
-%{_datadir}/glib-2.0/schemas/*.gschema.xml
-%{_datadir}/icons/hicolor/scalable/*/*.svg
-%{_datadir}/icons/hicolor/symbolic/*/*.svg
-%{_metainfodir}/*.xml
-%{python3_sitelib}/%{name}/
-
-
-%changelog
-* Thu Jul 11 2024 Trung Lê <8@tle.id.au> - 1.51.1-0
- Initial RPM package
@@ -1,3 +0,0 @@
-let latest_tag = get("https://codeberg.org/api/v1/repos/valos/Komikku/tags").json_arr()[0].name;
-let new_version = find("([\\.\\d]+)", latest_tag, 1);
-rpm.version(new_version);
@@ -1,7 +1,7 @@
-%global commit 3c7b6db205c027d3c4f12285719367792e471b57
+%global commit 27fb4c474f5ca850470cd07dfc789ba8bf94b35c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240725
-%global ver 0.38.0
+%global commit_date 20240312
+%global ver v0.37.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
@@ -1,11 +1,7 @@
 if filters.contains("nightly") {
 	rpm.global("commit", gh_commit("mpv-player/mpv"));
 	if rpm.changed() {
-		let v = gh("mpv-player/mpv");
-		if v.starts_with("v") {
-			v.crop(1);
-		}
-		rpm.global("ver", v);
+		rpm.global("ver", gh("mpv-player/mpv"));
 		rpm.global("commit_date", date());
 		rpm.release();
 	}
@@ -1,6 +0,0 @@
-project pkg {
-    arches = ["x86_64"]
-    rpm {
-        spec = "mugshot.spec"
-    }
-}
@@ -1,62 +0,0 @@
-%global app org.bluesabre.Mugshot
-%global _description %{expand:
-Mugshot is a lightweight user configuration utility for Linux designed for simplicity and ease of
-use. Quickly update your personal profile and sync your updates across applications.}
-
-
-Name:           python-mugshot
-Version:        0.4.3
-Release:        1%?dist
-Summary:        User Management Utility for Linux
-License:        GPL-3.0
-URL:            https://github.com/bluesabre/mugshot
-Source0:        %url/archive/refs/tags/mugshot-%version.tar.gz
-BuildArch:      noarch
-BuildRequires:  python3-devel
-BuildRequires:  python3-pip
-BuildRequires:  python3-distutils-extra
-BuildRequires:  python3-wheel
-BuildRequires:  python3-setuptools
-BuildRequires:  glib2
-BuildRequires:  desktop-file-utils
-BuildRequires:  libappstream-glib
-
-%description %_description
-
-%package -n mugshot
-Requires:       util-linux-user
-Requires:       python3-cairo
-Requires:       python3-pexpect
-Requires:       python3-gobject
-Summary:        User Management Utility for Linux
-
-%description -n mugshot %_description
-
-%prep
-%autosetup -n mugshot-mugshot-%version
-
-%build
-%pyproject_wheel
-
-%install
-%pyproject_install
-%pyproject_save_files -L 'mugshot*'
-install -Dm644 data/glib-2.0/schemas/%{lower:%app}.gschema.xml %buildroot%_datadir/glib-2.0/schemas/
-
-%find_lang mugshot
-
-%check
-#pyproject_check_import
-desktop-file-validate %buildroot%_datadir/applications/%app.desktop
-appstream-util validate-relax --nonet %buildroot%_metainfodir/mugshot.appdata.xml
-
-%files -n mugshot -f %{pyproject_files} -f mugshot.lang
-%doc README.md NEWS
-%license COPYING
-%_bindir/mugshot
-%_datadir/glib-2.0/schemas/%{lower:%app}.gschema.xml
-%_datadir/applications/%app.desktop
-%_datadir/mugshot/
-%_metainfodir/mugshot.appdata.xml
-%_mandir/man1/mugshot.1.gz
-%_iconsdir/hicolor/*/apps/mugshot.svg
@@ -1,3 +0,0 @@
-let v = gh("bluesabre/mugshot");
-v.crop(8);
-rpm.version(v);
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "ruffle-nightly.spec"
-    }
-}
@@ -1,67 +0,0 @@
-%global ver 2024-08-16
-%global goodver %(echo %ver | sed 's/-//g')
-%global __brp_mangle_shebangs %{nil}
-%bcond_without mold
-
-%global _description %{expand:
-Ruffle is an Adobe Flash Player emulator written in the Rust programming
-language. Ruffle targets both the desktop and the web using WebAssembly.}
-
-Name:           ruffle-nightly
-Version:        %goodver
-Release:        1%?dist
-Summary:        A Flash Player emulator written in Rust
-License:        Apache-2.0 OR MIT
-URL:            https://ruffle.rs/
-Source0:        https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-%ver.tar.gz
-Provides:       ruffle
-BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  anda-srpm-macros
-BuildRequires:  gcc-c++ cmake java
-BuildRequires:  java-latest-openjdk-headless
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(xcb-cursor)
-Packager:       madonuko <mado@fyralabs.com>
-
-%description %_description
-
-%files
-%doc README.md
-%license LICENSE.md
-%license LICENSE.dependencies
-%_bindir/ruffle_desktop
-%_datadir/applications/ruffle_desktop.desktop
-%_iconsdir/hicolor/scalable/apps/ruffle_desktop.svg
-
-%prep
-%autosetup -n ruffle-nightly-%ver
-%cargo_prep_online
-
-cat<<EOF > ruffle_desktop.desktop
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Ruffle Desktop
-Comment=%summary
-Exec=%_bindir/ruffle_desktop
-Icon=ruffle_desktop
-Terminal=false
-StartupNotify=false
-Categories=Application;
-MimeType=application/x-shockwave-flash;
-EOF
-
-%build
-%{cargo_license_online} > LICENSE.dependencies
-
-%install
-cd desktop
-%cargo_install
-install -Dm644 assets/icon.svg %buildroot%_iconsdir/hicolor/scalable/apps/ruffle_desktop.svg
-install -Dm644 ../ruffle_desktop.desktop %buildroot%_datadir/applications/ruffle_desktop.desktop
-
-%changelog
-* Mon Jul 29 2024 madonuko <mado@fyralabs.com>
- Initial package
@@ -1,13 +0,0 @@
-let releases = "https://api.github.com/repos/ruffle-rs/ruffle/releases".get().json_arr();
-for release in releases {
-  let tag = release.tag_name;
-  if !tag.starts_with("nightly-") {
-    continue;
-  }
-  tag.crop(8); // remove "nightly-"
-  rpm.global("ver", tag);
-  break;
-}
-if rpm.changed() {
-  rpm.release();
-}
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 26
+# Generated by rust2rpm 25
 %bcond_with check
 # aarch64 dist is not available
 %ifarch aarch64
@@ -13,8 +13,8 @@
 %global crate sccache

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.3
+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
@@ -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
+
@@ -1,5 +1,4 @@
 project pkg {
-	arches = ["x86_64"]
 	rpm {
 		spec = "voicevox.spec"
 	}
@@ -1 +1,5 @@
-rpm.version(gh("VOICEVOX/voicevox"));
+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));
@@ -1,25 +1,28 @@
+%global nodev 18.13.0
+%global npmv 8.19.3
+%global ver 0.18.0
 %define debug_package %nil
 %global _build_id_links none

-# do not strip binaries
-%define __strip /bin/true
-
 # Exclude private libraries
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			voicevox
-Version:		0.20.0
-Release:		1%?dist
+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/releases/download/%version/VOICEVOX.AppImage.7z.001
-Source1:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.002
-Source2:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.003
-Packager:       madonuko <mado@fyralabs.com>
-BuildRequires:  p7zip-plugins
-ExclusiveArch:  x86_64
+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.
@@ -31,28 +34,33 @@ Summary: Documentation files for voicevox (Japanese)
 %summary.

 %prep
-cat<<EOF > voicevox.sh
-#!/usr/bin/sh
-/usr/share/voicevox/VOICEVOX.AppImage
-EOF
-7z x %SOURCE0
-chmod a+x VOICEVOX.AppImage
-
-./VOICEVOX.AppImage --appimage-extract '*.desktop'
-./VOICEVOX.AppImage --appimage-extract 'usr/share/icons/**'
-
-sed -i "s|Exec=.*|Exec=/usr/share/voicevox/VOICEVOX.AppImage|" squashfs-root/voicevox.desktop
+%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
-install -Dm755 VOICEVOX.AppImage %buildroot%_datadir/voicevox/VOICEVOX.AppImage
-install -Dm755 voicevox.sh %buildroot%_bindir/voicevox
-install -Dm644 squashfs-root%_iconsdir/hicolor/0x0/apps/voicevox.png %buildroot%_iconsdir/hicolor/256x256/apps/voicevox.png
-install -Dm644 squashfs-root/voicevox.desktop %buildroot%_datadir/applications/voicevox.desktop
+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
-%_bindir/voicevox
-%_datadir/applications/voicevox.desktop
-%_datadir/voicevox/VOICEVOX.AppImage
-%_iconsdir/hicolor/256x256/apps/voicevox.png
+%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 = "youtube-music.spec"
-	}
-}
@@ -1 +0,0 @@
-rpm.version(gh("th-ch/youtube-music"));
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=YouTube Music
-Exec=/usr/bin/youtube-music --no-sandbox %U
-TryExec=/usr/bin/youtube-music
-Icon=youtube-music
-Terminal=false
-Type=Application
-StartupWMClass=YouTube Music
-Comment=YouTube Music Desktop App - including custom plugins
-Categories=AudioVideo;
@@ -1,91 +0,0 @@
-%define debug_package %nil
-
-
-# macro shorthand for calling pnpm
-%global pnpm npx pnpm@%{pnpm_version}
-
-Name:           youtube-music
-Version:        3.5.1
-Release:        1%{?dist}
-Summary:        YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
-Source1:        youtube-music.desktop
-License:        MIT
-URL:            https://github.com/th-ch/youtube-music
-Packager:       Cappy Ishihara <cappy@fyralabs.com>
-
-# For some unknown reason, PNPM is not working with Node.js 22 on Aarch64 devices.
-# todo: investigate why
-#ExclusiveArch: x86_64
-
-BuildRequires:  git-core gcc make
-# Required for usocket native module built with node-gyp
-BuildRequires:  python3 gcc-c++
-
-%description
-YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
-
-
-%prep
-rm -rf ./*
-git clone --recursive %{url} .
-git checkout v%{version}
-
-
-
-%build
-# Vendor PNPM directly instead of installing from packages, because we need to somehow force PNPM to use Node.js 20
-# We are not using Fedora's PNPM because we need to use `pnpm env`, which PNPM does not support when not vendored directly from upstream
-curl -fsSL https://get.pnpm.io/install.sh | sh -
-source /builddir/.bashrc
-pnpm env use --global 20
-pnpm install
-pnpm build
-pnpm electron-builder --linux --dir
-
-
-
-%install
-
-# Install assets
-install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/1024x1024/apps
-install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
-
-# Copy icon files
-ls -laR pack
-%ifarch aarch64
-pushd pack/linux-arm64-unpacked/resources/app.asar.unpacked/assets
-%else
-pushd pack/linux-unpacked/resources/app.asar.unpacked/assets
-%endif
-install -m 0644 youtube-music.png %{buildroot}%{_datadir}/icons/hicolor/1024x1024/apps/youtube-music.png
-install -m 0644 youtube-music.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/youtube-music.svg
-install -m 0644 youtube-music-tray-paused.png %{buildroot}%{_datadir}/icons/hicolor/1024x1024/apps/youtube-music-tray-paused.png
-install -m 0644 youtube-music-tray.png %{buildroot}%{_datadir}/icons/hicolor/1024x1024/apps/youtube-music-tray.png
-popd
-
-# Actually install the app
-
-install -d -m 0755 %{buildroot}%{_datadir}/youtube-music
-# Delete unpacked asar files before copying
-rm -rfv pack/linux*-unpacked/resources/app.asar.unpacked
-cp -rv pack/linux*-unpacked/* %{buildroot}%{_datadir}/youtube-music
-install -d -m 0755 %{buildroot}%{_bindir}
-ln -svf %{_datadir}/youtube-music/youtube-music %{buildroot}%{_bindir}/youtube-music
-
-# Install desktop file
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/youtube-music.desktop
-
-%files
-%license license
-%doc README.md
-%doc docs
-%{_bindir}/youtube-music
-%{_datadir}/youtube-music
-%{_datadir}/icons/hicolor/*/apps/youtube-music*
-%{_datadir}/applications/youtube-music.desktop
-
-
-
-%changelog
-* Sat Aug 03 2024 Cappy Ishihara <cappy@cappuchino.xyz>
- Initial Release
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu12
+%define _ubuntu_rel 22.10.20220822-0ubuntu11
 %global _hardened_build 0

 Name:           compiz9
@@ -3,7 +3,7 @@
 Name:           elementary-appcenter
 Summary:        Software Center from elementary
 Version:        7.4.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0

 Provides:       appcenter = %{version}-%{release}
@@ -12,8 +12,6 @@ Obsoletes:      appcenter < 7.2.1-2
 URL:            https://github.com/elementary/appcenter
 Source0:        %url/archive/%{version}/appcenter-%{version}.tar.gz

-Patch0:         pr2099.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -1,311 +0,0 @@
-commit fce55d9373bfb82953191b32e276a2129ffcb8c1
-Author: Marius Meisenzahl <meisenzahl@users.noreply.github.com>
-Date:   Wed Feb 7 00:14:43 2024 +0100
-
-    Add support for AppStream 1.0 (#2099)
-
-diff --git a/src/Core/FlatpakBackend.vala b/src/Core/FlatpakBackend.vala
-index 98931505..10f2baab 100644
--- a/src/Core/FlatpakBackend.vala
-+++ b/src/Core/FlatpakBackend.vala
-@@ -400,8 +400,13 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
- 
-         var category_array = new GLib.GenericArray<AppStream.Category> ();
-         category_array.add (category);
-+#if HAS_APPSTREAM_1_0
-+        AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components ().as_array (), category_array, false);
-+        AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components ().as_array (), category_array, false);
-+#else
-         AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components (), category_array, false);
-         AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components (), category_array, false);
-+#endif
-         components = category.get_components ();
- 
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-@@ -417,13 +422,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-         var comps = user_appstream_pool.search (query);
-         if (category == null) {
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 apps.add_all (packages);
-             });
-         } else {
-             var cat_packages = get_applications_for_category (category);
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 foreach (var package in packages) {
-                     if (package in cat_packages) {
-@@ -435,13 +448,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
- 
-         comps = system_appstream_pool.search (query);
-         if (category == null) {
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 apps.add_all (packages);
-             });
-         } else {
-             var cat_packages = get_applications_for_category (category);
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 foreach (var package in packages) {
-                     if (package in cat_packages) {
-@@ -510,7 +531,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-                 continue;
-             }
- 
-+#if HAS_APPSTREAM_1_0
-+            if (package.component.get_developer ().get_name () == author) {
-+#else
-             if (package.component.developer_name == author) {
-+#endif
-                 package_ids.add (package.component.id);
- 
-                 AppCenterCore.Package? user_package = null;
-@@ -1095,7 +1120,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-             warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
-         } finally {
-             var comp_validator = ComponentValidator.get_default ();
-+#if HAS_APPSTREAM_1_0
-+            user_appstream_pool.get_components ().as_array ().foreach ((comp) => {
-+#else
-             user_appstream_pool.get_components ().foreach ((comp) => {
-+#endif
-                 if (!comp_validator.validate (comp)) {
-                     return;
-                 }
-@@ -1133,7 +1162,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-             warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
-         } finally {
-             var comp_validator = ComponentValidator.get_default ();
-+#if HAS_APPSTREAM_1_0
-+            system_appstream_pool.get_components ().as_array ().foreach ((comp) => {
-+#else
-             system_appstream_pool.get_components ().foreach ((comp) => {
-+#endif
-                 if (!comp_validator.validate (comp)) {
-                     return;
-                 }
-diff --git a/src/Core/Package.vala b/src/Core/Package.vala
-index 0f9a90c4..ed141292 100644
--- a/src/Core/Package.vala
-+++ b/src/Core/Package.vala
-@@ -306,7 +306,11 @@ public class AppCenterCore.Package : Object {
-                 return _author;
-             }
- 
-+#if HAS_APPSTREAM_1_0
-+            _author = component.get_developer ().get_name ();
-+#else
-             _author = component.developer_name;
-+#endif
- 
-             if (_author == null) {
-                 var project_group = component.project_group;
-@@ -677,7 +681,11 @@ public class AppCenterCore.Package : Object {
-             }
- 
-             try {
-+#if HAS_APPSTREAM_1_0
-+                description = AppStream.markup_convert (description, TEXT);
-+#else
-                 description = AppStream.markup_convert_simple (description);
-+#endif
-             } catch (Error e) {
-                 warning ("Failed to convert description to markup: %s", e.message);
-             }
-@@ -919,7 +927,11 @@ public class AppCenterCore.Package : Object {
-     }
- 
-     public AppStream.Release? get_newest_release () {
-+#if HAS_APPSTREAM_1_0
-+        var releases = component.get_releases_plain ().get_entries ();
-+#else
-         var releases = component.get_releases ();
-+#endif
-         releases.sort_with_data ((a, b) => {
-             if (a.get_version () == null || b.get_version () == null) {
-                 if (a.get_version () != null) {
-diff --git a/src/Core/PackageKitBackend.vala b/src/Core/PackageKitBackend.vala
-index 09da4074..a108831e 100644
--- a/src/Core/PackageKitBackend.vala
-+++ b/src/Core/PackageKitBackend.vala
-@@ -275,7 +275,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-         } finally {
-             var new_package_list = new Gee.HashMap<string, Package> ();
-             var comp_validator = ComponentValidator.get_default ();
-+#if HAS_APPSTREAM_1_0
-+            appstream_pool.get_components ().as_array ().foreach ((comp) => {
-+#else
-             appstream_pool.get_components ().foreach ((comp) => {
-+#endif
-                 if (!comp_validator.validate (comp)) {
-                     return;
-                 }
-@@ -317,7 +321,12 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-             component.set_id (id);
-             component.set_origin (Package.APPCENTER_PACKAGE_ORIGIN);
- 
-#if HAS_APPSTREAM_0_15
-+#if HAS_APPSTREAM_1_0
-+            var components = new AppStream.ComponentBox (AppStream.ComponentBoxFlags.NONE);
-+            components.add (component);
-+
-+            appstream_pool.add_components (components);
-+#elif HAS_APPSTREAM_0_15
-             var components = new GenericArray<AppStream.Component> ();
-             components.add (component);
- 
-@@ -430,7 +439,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-                 break;
-             }
- 
-+#if HAS_APPSTREAM_1_0
-+            if (package.component.get_developer ().get_name () == author) {
-+#else
-             if (package.component.developer_name == author) {
-+#endif
-                 packages.add (package);
-             }
-         }
-@@ -447,7 +460,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
- 
-         var category_array = new GLib.GenericArray<AppStream.Category> ();
-         category_array.add (category);
-+#if HAS_APPSTREAM_1_0
-+        AppStream.utils_sort_components_into_categories (appstream_pool.get_components ().as_array (), category_array, true);
-+#else
-         AppStream.utils_sort_components_into_categories (appstream_pool.get_components (), category_array, true);
-+#endif
-         components = category.get_components ();
- 
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-@@ -465,7 +482,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-         var comps = appstream_pool.search (query);
-         if (category == null) {
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var package = get_package_for_component_id (comp.get_id ());
-                 if (package != null) {
-                     apps.add (package);
-@@ -473,7 +494,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-             });
-         } else {
-             var cat_packages = get_applications_for_category (category);
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var package = get_package_for_component_id (comp.get_id ());
-                 if (package != null && package in cat_packages) {
-                     apps.add (package);
-diff --git a/src/Views/AppInfoView.vala b/src/Views/AppInfoView.vala
-index 5a3a361a..bef37f0e 100644
--- a/src/Views/AppInfoView.vala
-+++ b/src/Views/AppInfoView.vala
-@@ -310,8 +310,16 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
-                 oars_flowbox.add (uncurated);
-             }
- #endif
-+
-+#if HAS_APPSTREAM_1_0
-+            var active_locale = "en-US";
-+            if (package_component.get_context () != null) {
-+                active_locale = package_component.get_context ().get_locale () ?? "en-US";
-+            }
-+#else
-             var active_locale = package_component.get_active_locale ();
-            if (active_locale != "en_US") {
-+#endif
-+            if (active_locale != "en_US" && active_locale != "en-US") {
-                 var percent_translated = package_component.get_language (
-                     // Expects language without locale
-                     active_locale.split ("_")[0]
-@@ -492,7 +500,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
-             }
-         }
- 
-+#if HAS_APPSTREAM_1_0
-+        screenshots = package_component.get_screenshots_all ();
-+#else
-         screenshots = package_component.get_screenshots ();
-+#endif
- 
-         if (screenshots.length > 0) {
-             screenshot_carousel = new Hdy.Carousel () {
-@@ -1030,7 +1042,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
-             get_app_download_size.begin ();
- 
-             Idle.add (() => {
-+#if HAS_APPSTREAM_1_0
-+                var releases = package.component.get_releases_plain ().get_entries ();
-+#else
-                 var releases = package.component.get_releases ();
-+#endif
- 
-                 foreach (unowned var release in releases) {
-                     if (release.get_version () == null) {
-@@ -1049,7 +1065,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
- 
-                         release_carousel.add (release_row);
- 
-+#if HAS_APPSTREAM_1_0
-+                        if (package.installed && AppStream.vercmp_simple (release.get_version (), package.get_version ()) <= 0) {
-+#else
-                         if (package.installed && AppStream.utils_compare_versions (release.get_version (), package.get_version ()) <= 0) {
-+#endif
-                             break;
-                         }
-                     }
-diff --git a/src/Widgets/ReleaseRow.vala b/src/Widgets/ReleaseRow.vala
-index 3b487914..36fcbc76 100644
--- a/src/Widgets/ReleaseRow.vala
-+++ b/src/Widgets/ReleaseRow.vala
-@@ -116,7 +116,11 @@ public class AppCenter.Widgets.ReleaseRow : Gtk.Box {
-     private string format_release_description (string? description ) {
-         if (description != null) {
-             try {
-+#if HAS_APPSTREAM_1_0
-+                var markup = AppStream.markup_convert (description, TEXT);
-+#else
-                 var markup = AppStream.markup_convert_simple (description);
-+#endif
- 
-                 if (markup.strip () != "") {
-                     return markup;
-diff --git a/src/meson.build b/src/meson.build
-index d3d558ef..df69a0bf 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -78,6 +78,10 @@ if appstream.version().version_compare('>=0.16')
-     args += '--define=HAS_APPSTREAM_0_16'
- endif
- 
-+if appstream.version().version_compare('>=1.0')
-+    args += '--define=HAS_APPSTREAM_1_0'
-+endif
-+
- if get_option('packagekit_backend')
-     appcenter_files += files(
-         'Core/PackageKitBackend.vala',
@@ -3,8 +3,8 @@

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

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

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

 URL:            https://github.com/elementary/calendar
@@ -20,7 +20,7 @@ BuildRequires:  fdupes
 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(granite) >= 6.0.0
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
@@ -3,8 +3,8 @@

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

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

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

 Name:           elementary-code
 Summary:        Code editor from elementary
-Version:        7.3.0
-Release:        1%?dist
+Version:        7.2.0
+Release:        1%{?dist}
 License:        GPL-3.0

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

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

 URL:            https://github.com/elementary/%{srcname}
@@ -42,8 +42,6 @@ BuildRequires:  pkgconfig(pango) >= 1.1.2
 BuildRequires:  pkgconfig(plank) >= 0.10.9
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(systemd) >= 206
-BuildRequires:  pkgconfig(libportal)
-BuildRequires:  pkgconfig(libportal-gtk3)

 Requires:       contractor
 Requires:       file-roller
@@ -78,7 +76,6 @@ This package contains the development headers.


 %build
-CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
 %meson -Dwith-zeitgeist=disabled
 %meson_build

@@ -88,6 +85,11 @@ CFLAGS="$CFLAGS -Wno-implicit-function-declaration"

 %find_lang %{appname}

+%fdupes %buildroot%_datadir/icons/hicolor/
+
+# remove unused pixmaps
+rm -r %{buildroot}/%{_datadir}/pixmaps
+
 # install file-roller contracts
 mkdir -p %{buildroot}/%{_datadir}/contractor
 cp -pav %{SOURCE1} %{buildroot}/%{_datadir}/contractor/
@@ -118,7 +120,7 @@ appstream-util validate-relax --nonet \
 %{_bindir}/%{appname}-pkexec

 %{_libdir}/%{appname}/
-%{_libdir}/libpantheon-files-core.so.*
+%{_libdir}/libpantheon-files-core.so.6*

 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/contractor/*.contract
@@ -11,7 +11,7 @@ URL:            https://github.com/elementary/greeter
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source1:        40-%{appname}.conf

-Patch0:         https://github.com/elementary/greeter/compare/7.0.0..42320c266395606b0c20782603e7407124c3f7a4.patch
+Patch0:         https://github.com/elementary/greeter/commit/dbd9b6f9701f5992c3b3257c025b9cd80d041cc8.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -36,9 +36,9 @@ BuildRequires:  pkgconfig(granite) >= 5.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(liblightdm-gobject-1)
-BuildRequires:  pkgconfig(mutter-clutter-14)
-BuildRequires:  pkgconfig(mutter-cogl-14)
-BuildRequires:  pkgconfig(mutter-cogl-pango-14)
+BuildRequires:  pkgconfig(mutter-clutter-13)
+BuildRequires:  pkgconfig(mutter-cogl-13)
+BuildRequires:  pkgconfig(mutter-cogl-pango-13)
 BuildRequires:  pkgconfig(x11)

 Provides:       pantheon-greeter = %{version}-%{release}
@@ -3,8 +3,8 @@

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

 URL:            https://github.com/elementary/icons
@@ -10,8 +10,8 @@ utilizes Granite for a consistent and slick UI.}

 Name:           elementary-music
 Summary:        Music player and library from elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.1.0
+Release:        2%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{srcname}
@@ -41,7 +41,6 @@ BuildRequires:  pkgconfig(libpeas-1.0)
 BuildRequires:  pkgconfig(libpeas-gtk-1.0)
 BuildRequires:  pkgconfig(taglib_c)
 BuildRequires:  pkgconfig(zeitgeist-2.0)
-BuildRequires:  pkgconfig(libadwaita-1)

 Requires:       hicolor-icon-theme

@@ -100,6 +99,7 @@ appstream-util validate-relax --nonet \
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
 %{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/locale/*/LC_MESSAGES/%{appname}.mo

 %files devel

@@ -3,8 +3,8 @@


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

 License:        GPL-3.0
@@ -54,6 +54,7 @@ appstream-util validate-relax --nonet %buildroot%_datadir/metainfo/%appname.meta
 %{_bindir}/%{appname}.demo
 %{_datadir}/applications/%{appname}.demo.desktop

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

@@ -3,8 +3,8 @@

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

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

 Name:           elementary-photos
 Summary:        Photo manager and viewer from elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.8.0
+Release:        2%?dist
 License:        LGPL-2.0-or-later

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

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

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

 Requires:       hicolor-icon-theme

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

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


 %build
@@ -74,10 +75,10 @@ desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

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

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


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

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


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

 Name:           elementary-screenshot-tool
 Summary:        Screenshot tool designed for elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.0.4
+Release:        2%{?dist}
 License:        LGPL-3.0

 URL:            https://github.com/elementary/screenshot
@@ -3,8 +3,8 @@
 %global iface   io.elementary.SettingsDaemon.AccountsService

 Name:           elementary-settings-daemon
-Version:        8.0.0
-Release:        1%?dist
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Settings Daemon and Portal for Pantheon
 License:        GPL-3.0-or-later

@@ -26,8 +26,6 @@ BuildRequires:  pkgconfig(granite) >= 5.3.0
 BuildRequires:  pkgconfig(libgeoclue-2.0)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(fwupd)
-BuildRequires:  pkgconfig(gexiv2)
-BuildRequires:  pkgconfig(packagekit-glib2)

 Requires:       xdg-desktop-portal

@@ -47,8 +45,6 @@ Requires:       xdg-desktop-portal
 %install
 %meson_install

-%find_lang %appname
-

 %check
 desktop-file-validate \
@@ -68,7 +64,7 @@ appstream-util validate-relax --nonet \
 %systemd_preun %{appname}.check-for-firmware-updates.timer


-%files -f %appname.lang
+%files
 %license LICENSE
 %doc README.md

@@ -91,6 +87,8 @@ appstream-util validate-relax --nonet \

 %{_sysconfdir}/xdg/autostart/%appname.desktop

+%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
+

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

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

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

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


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

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


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

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

 URL:            https://github.com/elementary/%{srcname}
@@ -90,9 +90,16 @@ appstream-util validate-relax --nonet \
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/%{appname}/
 %{_datadir}/metainfo/%{appname}.appdata.xml
-%{_mandir}/man1/%{appname}.1.gz

 %files fish
 %doc README.md
 %license COPYING
 %{_datadir}/fish/vendor_conf.d/pantheon_terminal_process_completion_notifications.fish
+
+
+%changelog
+* Thu Nov 17 2022 windowsboy111 <wboy111@outlook.com> - 6.1.1-1
+- new version
+
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+- Repackaged for Terra
@@ -3,8 +3,8 @@

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

 URL:            https://github.com/elementary/stylesheet
@@ -3,8 +3,8 @@

 Name:           elementary-videos
 Summary:        Video player and library app from elementary
-Version:        8.0.1
-Release:        1%?dist
+Version:        3.0.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%{srcname}
@@ -22,14 +22,13 @@ BuildRequires:  pkgconfig(clutter-gtk-1.0)
 BuildRequires:  pkgconfig(gdk-x11-3.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
 BuildRequires:  pkgconfig(gstreamer-tag-1.0)
 BuildRequires:  pkgconfig(gstreamer-video-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.22
 BuildRequires:  pkgconfig(libhandy-1)
-BuildRequires:  pkgconfig(libadwaita-1)

 Requires:       hicolor-icon-theme

@@ -3,8 +3,8 @@

 Name:           elementary-wallpapers
 Summary:        Collection of wallpapers from the elementary project
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.0
+Release:        1%{?dist}

 # License breakdown is available in debian/copyright
 License:        CC-BY-SA-4.0 AND CC0-1.0 AND Unlicense
@@ -3,16 +3,14 @@
 Name:           gala
 Summary:        Gala window manager
 Version:        7.1.3
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
-Epoch:          1

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

 # patch some default settings to better match Fedora
 Patch0:         0000-Modify-default-settings-for-Fedora.patch
-Patch:          https://github.com/elementary/gala/compare/7.1.3..43d1e6a01b56a84a4e752e1970a35c19402941eb.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -33,13 +31,11 @@ BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libbamf3)
 BuildRequires:  pkgconfig(libcanberra)
-BuildRequires:  pkgconfig(libhandy-1)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(mutter-clutter-14)
-BuildRequires:  pkgconfig(mutter-cogl-14)
-BuildRequires:  pkgconfig(mutter-cogl-pango-14)
+BuildRequires:  pkgconfig(mutter-clutter-13)
+BuildRequires:  pkgconfig(mutter-cogl-13)
+BuildRequires:  pkgconfig(mutter-cogl-pango-13)

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

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

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

 %description    devel
 Gala is Pantheon's Window Manager, part of the elementary project.
@@ -89,8 +85,8 @@ This package contains the development headers.


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

 desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/gala*.desktop
@@ -102,7 +98,7 @@ desktop-file-validate \
 %files -f gala.lang
 %doc README.md
 %license COPYING
-%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
+%config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop

 %{_bindir}/gala
 %{_bindir}/gala-daemon
@@ -5,8 +5,8 @@ apps built for elementary.}

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

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

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


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

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

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

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

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

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


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

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


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

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

 Name:           switchboard-plug-about
 Summary:        Switchboard System Information plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.2.0
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-about
@@ -18,16 +18,21 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
+BuildRequires:  vala >= 0.22.0
 BuildRequires:  fdupes

+BuildRequires:  pkgconfig(appstream) >= 0.12.10
 BuildRequires:  pkgconfig(fwupd)
-BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.64.0
+BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libgtop-2.0)
-BuildRequires:  pkgconfig(switchboard-3)
-BuildRequires:  pkgconfig(udisks2)
+BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(switchboard-2.0)
 BuildRequires:  pkgconfig(gudev-1.0)
-BuildRequires:  pkgconfig(packagekit-glib2)
-BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  pkgconfig(udisks2)

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -50,25 +55,24 @@ This switchboard plug shows system information.
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug

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


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


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

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

-%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml


 %changelog
@@ -4,12 +4,12 @@

 %global plug_type personal
 %global plug_name applications
-%global plug_rdnn io.elementary.settings.%{plug_name}
+%global plug_rdnn io.elementary.switchboard.%{plug_name}

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

 URL:            https://github.com/elementary/switchboard-plug-applications
@@ -18,11 +18,16 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
+BuildRequires:  vala >= 0.22.0
 BuildRequires:  fdupes

-BuildRequires:  pkgconfig(flatpak)
+BuildRequires:  pkgconfig(flatpak) >= 1.1.2
 BuildRequires:  pkgconfig(glib-2.0) >= 2.34
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(switchboard-2.0)
+BuildRequires:  pkgconfig(libhandy-1)

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -44,10 +49,10 @@ that allows the user to manage application settings.
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-mv %buildroot%_datadir/metainfo/%plug_rdnn.metainfo.xml %buildroot%_datadir/metainfo/%plug_rdnn.metainfo.xml || true
-%find_lang %{plug_rdnn}
+mv %buildroot%_datadir/metainfo/%plug_rdnn.appdata.xml %buildroot%_datadir/metainfo/%plug_rdnn.metainfo.xml || true
+%find_lang %{plug_name}-plug

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


@@ -56,11 +61,11 @@ appstream-util validate-relax --nonet \
    %{buildroot}%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


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

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

 %{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
 %{_datadir}/icons/hicolor/*/apps/io.elementary.settings.applications.svg
@@ -8,8 +8,8 @@

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

 URL:            https://github.com/elementary/switchboard-plug-bluetooth
@@ -4,12 +4,12 @@

 %global plug_type system
 %global plug_name datetime
-%global plug_rdnn io.elementary.settings.datetime
+%global plug_rdnn io.elementary.switchboard.datetime

 Name:           switchboard-plug-datetime
 Summary:        Switchboard Date & Time Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.2.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-datetime
@@ -18,8 +18,11 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
+BuildRequires:  vala
 BuildRequires:  fdupes

+BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  switchboard-devel

 Requires:       switchboard%{?_isa}
@@ -41,24 +44,24 @@ Supplements:    switchboard%{?_isa}
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug

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


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


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

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

-%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml


 %changelog
@@ -4,12 +4,12 @@

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

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

 URL:            https://github.com/elementary/switchboard-plug-keyboard
@@ -21,8 +21,14 @@ BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
 BuildRequires:  fdupes

+BuildRequires:  pkgconfig(glib-2.0) >= 2.32
+BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(ibus-1.0) >= 1.5.19
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  pkgconfig(libgnomekbd)
+BuildRequires:  pkgconfig(libgnomekbdui)
+BuildRequires:  pkgconfig(libhandy-1) >= 0.90.0
+BuildRequires:  pkgconfig(switchboard-2.0)
 BuildRequires:  pkgconfig(xkeyboard-config)

 Requires:       gala
@@ -48,7 +54,7 @@ same time. Keyboard shortcuts are also part of this plug.
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug


 %check
@@ -56,12 +62,12 @@ appstream-util validate-relax --nonet \
    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


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

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


@@ -4,12 +4,12 @@

 %global plug_type personal
 %global plug_name locale
-%global plug_rdnn io.elementary.settings.locale
+%global plug_rdnn io.elementary.switchboard.locale

 Name:           switchboard-plug-locale
 Summary:        Switchboard Locale Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.5.9
+Release:        2%?dist
 License:        LGPL-3.0-or-later

 URL:            https://github.com/elementary/%name
@@ -23,7 +23,9 @@ BuildRequires:  fdupes

 BuildRequires:  pkgconfig(accountsservice)
 BuildRequires:  pkgconfig(ibus-1.0)
-BuildRequires:  pkgconfig(gnome-desktop-4)
+BuildRequires:  pkgconfig(gnome-desktop-3.0)
+BuildRequires:  pkgconfig(granite)
+BuildRequires:  polkit-devel
 BuildRequires:  switchboard-devel

 Requires:       switchboard%?_isa
@@ -44,7 +46,7 @@ Supplements:    switchboard%?_isa
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %plug_rdnn
+%find_lang %plug_name-plug


 %check
@@ -52,13 +54,13 @@ appstream-util validate-relax --nonet \
    %buildroot/%_datadir/metainfo/%plug_rdnn.appdata.xml


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

-%_libdir/switchboard-3/%plug_type/lib%plug_rdnn.so
-%_libdir/switchboard-3/%plug_type/pantheon-locale/languagelist
-%_libdir/switchboard-3/%plug_type/pantheon-locale/packages_blocklist
+%_libdir/switchboard/%plug_type/lib%plug_name-plug.so
+%_libdir/switchboard/personal/pantheon-locale/languagelist
+%_libdir/switchboard/personal/pantheon-locale/packages_blacklist
 %_datadir/glib-2.0/schemas/%plug_rdnn.gschema.xml
 %_datadir/polkit-1/actions/%plug_rdnn.policy

@@ -4,12 +4,12 @@

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

 Name:           switchboard-plug-mouse-touchpad
 Summary:        Switchboard Mouse and Touchpad plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-mouse-touchpad
@@ -18,9 +18,13 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
+BuildRequires:  vala >= 0.22.0

-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.32
+BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(switchboard-2.0)
+BuildRequires:  pkgconfig(libxml-2.0)

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -41,21 +45,21 @@ A switchboard plug to configure the behavior of mice and touchpads.
 %install
 %meson_install

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


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


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

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

-%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml


 %changelog
@@ -4,12 +4,12 @@

 %global plug_type network
 %global plug_name networking
-%global plug_rdnn io.elementary.settings.network
+%global plug_rdnn io.elementary.switchboard.network

 Name:           switchboard-plug-networking
 Summary:        Switchboard Networking plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.5.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-network
@@ -22,9 +22,13 @@ BuildRequires:  vala >= 0.22.0
 BuildRequires:  fdupes

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
-BuildRequires:  pkgconfig(libnm)
-BuildRequires:  pkgconfig(libnma-gtk4)
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(gthread-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libnm) >= 1.20.6
+BuildRequires:  pkgconfig(libnma)
+BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  pkgconfig(switchboard-2.0)

 Requires:       network-manager-applet%{?_isa}
 Requires:       switchboard%{?_isa}
@@ -48,21 +52,21 @@ A switchboard plug for configuring available networks.
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug


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


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

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

-%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml


 %changelog
@@ -4,12 +4,12 @@

 %global plug_type personal
 %global plug_name notifications
-%global plug_rdnn io.elementary.settings.notifications
+%global plug_rdnn io.elementary.switchboard.notifications

 Name:           switchboard-plug-notifications
 Summary:        Switchboard Notifications plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.2.0
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-notifications
@@ -18,10 +18,13 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
+BuildRequires:  vala >= 0.22.0
 BuildRequires:  fdupes

-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.32
+BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.12
+BuildRequires:  pkgconfig(switchboard-2.0)

 Requires:       gala%{?_isa}
 Requires:       switchboard%{?_isa}
@@ -47,21 +50,21 @@ related to the Notifications plugin for Gala.
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug


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


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

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

-%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml


 %changelog
@@ -6,8 +6,8 @@

 Name:           switchboard-plug-onlineaccounts
 Summary:        Switchboard Online Accounts plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.5.3
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-onlineaccounts
@@ -3,13 +3,13 @@
 %global srcname switchboard-plug-parental-controls

 %global plug_type system
-%global plug_name screentime-limits
-%global plug_rdnn io.elementary.settings.screentime-limits
+%global plug_name parental-controls
+%global plug_rdnn io.elementary.switchboard.parental-controls

 Name:           switchboard-plug-parental-controls
 Summary:        Switchboard Screen Time & Limits Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.0.1
+Release:        2%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%name
@@ -25,8 +25,12 @@ BuildRequires:  pkgconfig(accountsservice)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(flatpak)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(libhandy-1) >= 0.90.0
+BuildRequires:  pkgconfig(malcontent-0)
+BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  polkit-devel
 BuildRequires:  switchboard-devel
-BuildRequires:  rpm_macro(_unitdir)

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -47,25 +51,24 @@ Supplements:    switchboard%{?_isa}
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug

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


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


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

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

-%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
-%_iconsdir/hicolor/*/apps/%plug_rdnn.svg
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml

 %_sysconfdir/pantheon-parental-controls/daemon.conf
 %_bindir/pantheon-parental-controls-daemon
@@ -73,8 +76,8 @@ appstream-util validate-relax --nonet \
 %_datadir/applications/pantheon-parental-controls-client.desktop
 %_datadir/dbus-1/system-services/org.pantheon.ParentalControls.service
 %_datadir/dbus-1/system.d/org.pantheon.ParentalControls.conf
-%_datadir/polkit-1/actions/%plug_rdnn.policy
-%_unitdir/pantheon-parental-controls.service
+%_datadir/polkit-1/actions/io.elementary.switchboard.screentime-limits.policy
+/usr/lib/systemd/system/pantheon-parental-controls.service

 %changelog
 * Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - 6.0.1-1
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`rpm.version(gh("pantheon-tweaks/pantheon-tweaks"));`