dunno

fix: bandwhich
2026-05-31 17:11:56 +00:00 · 2023-02-20 15:15:47 +08:00 · 2023-02-20 14:10:01 +08:00
982 changed files with 4060 additions and 23843 deletions
@@ -1,9 +0,0 @@
-{
-  "repoOwner": "terrapkg",
-  "repoName": "packages",
-  "resetAuthor": true,
-  "targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
-  "branchLabelMapping": {
-    "^sync-(.+)$": "$1"
-  }
-}
@@ -1,4 +1,4 @@
-ARG VARIANT="38"
+ARG VARIANT="37"
 FROM fedora:${VARIANT}

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

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

      - name: Upload packages to subatomic
-        if: github.event_name == 'push'
        run: |
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*
-
-      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
-      - name: Notify Madoguchi (Success)
-        if: success() && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
-      - name: Notify Madoguchi (Failure)
-        if: ( cancelled() || failure() ) && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -0,0 +1,54 @@
+name: Bootstrap anda
+
+on:
+  workflow_dispatch:
+
+jobs:
+  bootstrap:
+    strategy:
+      matrix:
+        version: ["37"]
+        arch: ["x86_64", "aarch64"]
+      fail-fast: true
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    container:
+      image: fedora:37
+      options: --cap-add=SYS_ADMIN --privileged
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/anda
+
+      # - name: Run shell commands
+      #   run: |
+      #     git config --global url.https://github.com/.insteadOf git://github.com/
+      #     git clone https://github.com/FyraLabs/anda.git
+      - uses: actions/setup-go@v3
+        with:
+          go-version: "^1.19"
+
+      - name: Install repositories
+        run: |
+          sudo dnf install -y dnf-plugins-core
+          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
+      - run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install Anda
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: anda
+
+      - name: Install Subatomic
+        run: go install github.com/FyraLabs/subatomic/subatomic-cli@latest
+
+      - name: Build
+        run: anda build -c anda-37-${{ matrix.arch }} anda -p rpm
+
+      - run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }} anda-build/rpm/rpms/*
@@ -0,0 +1,57 @@
+name: Bootstrap Andaman and Subatomic (Fedora 38)
+
+on:
+  workflow_dispatch:
+
+jobs:
+  bootstrap:
+    strategy:
+      matrix:
+        version: ["38"]
+        arch: ["x86_64", "aarch64"]
+      fail-fast: true
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    container:
+      image: fedora:38
+      options: --cap-add=SYS_ADMIN --privileged
+    steps:
+      - uses: actions/setup-go@v3
+        with:
+          go-version: "^1.19"
+
+      - name: Install repositories
+        run: |
+          sudo dnf install -y dnf-plugins-core
+          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
+          sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/subatomic
+          ref: bootstrap
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install Anda
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: anda
+
+      - name: Build Subatomic
+        run: anda build -c anda-38-${{ matrix.arch }} subatomic -p rpm
+      - name: Install Subatomic
+        run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/anda
+
+      - name: Build Andaman
+        run: anda build -c anda-38-${{ matrix.arch }} anda -p rpm
+
+      - 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/*
@@ -0,0 +1,58 @@
+name: Bootstrap subatomic
+
+on:
+  workflow_dispatch:
+
+jobs:
+  bootstrap:
+    strategy:
+      matrix:
+        version: ["37"]
+        arch: ["x86_64", "aarch64"]
+      fail-fast: true
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    container:
+      image: fedora:37
+      options: --cap-add=SYS_ADMIN --privileged
+    steps:
+      # - name: Run shell commands
+      #   run: |
+      #     git config --global url.https://github.com/.insteadOf git://github.com/
+      #     git clone https://github.com/FyraLabs/anda.git
+
+      - uses: actions/setup-go@v3
+        with:
+          go-version: "^1.19"
+
+      - name: Install repositories
+        run: |
+          sudo dnf install -y dnf-plugins-core
+          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
+      - run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/subatomic
+          set-safe-directory: true
+          fetch-depth: 1
+      - name: Set up git repository
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: Install Anda
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: anda
+
+      - name: Install Subatomic
+        run: go install github.com/FyraLabs/subatomic/subatomic-cli@latest
+
+      - name: Build
+        run: anda build -c anda-37-${{ matrix.arch }} subatomic -p rpm
+      - run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }} anda-build/rpm/rpms/*
@@ -1,61 +0,0 @@
-name: Bootstrap Andaman and Subatomic
-
-on:
-  workflow_dispatch:
-
-jobs:
-  bootstrap:
-    strategy:
-      matrix:
-        version: ["40"]
-        arch: ["x86_64", "aarch64"]
-      fail-fast: true
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
-    container:
-      image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
-      options: --cap-add=SYS_ADMIN --privileged
-    steps:
-      - name: Install repositories
-        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel cargo podman fuse-overlayfs
-
-      - name: Install Anda
-        run: cargo install 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
-
-      - name: Build Subatomic
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/subatomic/pkg
-      - name: Install Subatomic
-        run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
-
-      - name: Build Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg
-
-      - name: Upload packages to subatomic
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }} anda-build/rpm/rpms/*
-
-      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
@@ -1,9 +1,9 @@
-name: Manual Builds
+name: Build Packages
 on:
  workflow_dispatch:
    inputs:
      packages:
-        description: "Packages to Build"
+        description: "Packages to Build (pkg-a, pkg-b, ...)"
        required: true

 jobs:
@@ -15,50 +15,25 @@ jobs:
      - name: Parse Input
        id: parsing
        run: echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
-
  build:
    needs: parse
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["40"]
+        version: ["37"]
        arch: ["x86_64", "aarch64"]
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:main
      options: --cap-add=SYS_ADMIN --privileged
    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: terrapkg/anda-build@main
        with:
-          fetch-depth: 0
-      - name: Set up git repository
-        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
-
-      - name: Cache buildroot
-        id: br-cache
-        uses: actions/cache@v3
-        with:
-          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
-
-      - name: Build with Andaman
-        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg
-
-      - name: Generating artifact name
-        id: art
-        run: |
-          NAME=${{ matrix.pkg }}-${{ matrix.arch }}-${{ matrix.version }}
-          x=${NAME//\//@}
-          echo "name=$x" >> $GITHUB_OUTPUT
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ steps.art.outputs.name }}
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
+          name: "${{ matrix.pkg }}pkg"
+          mockConfig: anda-37-${{ matrix.arch }}
+          extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
+          andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo

      - name: Upload packages to subatomic
        run: |
@@ -66,17 +41,3 @@ jobs:
            --server https://subatomic.fyralabs.com \
            --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}}
-      - 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}}
@@ -1,72 +0,0 @@
-name: JSON Build
-on:
-  workflow_dispatch:
-    inputs:
-      packages:
-        description: "Packages to Build"
-        required: true
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["40"]
-      fail-fast: false
-    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
-    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
-      options: --cap-add=SYS_ADMIN --privileged
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Set up git repository
-        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
-
-      - name: Cache buildroot
-        id: br-cache
-        uses: actions/cache@v3
-        with:
-          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
-
-      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
-
-      - name: Generating artifact name
-        id: art
-        run: |
-          NAME=${{ matrix.pkg.pkg }}-${{ matrix.pkg.arch }}-${{ matrix.version }}
-          x=${NAME//\//@}
-          echo "name=$x" >> $GITHUB_OUTPUT
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ steps.art.outputs.name }}
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
-
-      - name: Upload packages to subatomic
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }} anda-build/rpm/rpms/*
-
-      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
-      - 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}}
-      - 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}}
@@ -1,20 +1,12 @@
 name: Lint

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

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

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

      - name: Install SSH signing key
@@ -26,7 +29,7 @@ jobs:
      - name: Run Update
        run: anda update -vv
        env:
-          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          RUST_BACKTRACE: full

      - name: Save
@@ -37,19 +40,6 @@ jobs:
            git config user.email "raboneko@fyralabs.com"
            git config gpg.format "ssh"
            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
-            git commit -S -a -m "$msg"
-            copy_over () {
-              git format-patch HEAD^
-              git checkout $1
-              git apply *.patch || true
-              rm *.patch
-              git add *
-              git commit -S -a -m "$msg"
-            }
-            copy_over f39 || true
-            copy_over f37 || true
-            copy_over f38 || true
-            copy_over frawhide || true
-            git push -u origin --all
+            git commit -S -a -m "Automatic Update: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            git push -u origin main
          fi
@@ -1 +1 @@
-anda-build/
+anda-build/
@@ -1,5 +0,0 @@
-{
-  "recommendations": [
-    "rhaiscript.vscode-rhai"
-  ]
-}
@@ -0,0 +1,32 @@
+# Repository
+/.github @lleyton 
+/.devcontainer @lleyton 
+/.gitignore @windowsboy111 
+/CODE_OF_CONDUCT.md @lleyton 
+/CONTRIBUTING.md @lleyton 
+/LICENSE @lleyton 
+/README.md @windowsboy111 
+/SECURITY.md @lleyton 
+/anda.hcl @lleyton 
+/comps.xml @lleyton 
+
+# Package maintainers
+/anda/lib/libbismuth @lainsce
+/anda/lib/libhelium @lainsce
+/anda/others/tau-helium @lainsce
+/anda/others/tau-hydrogen @lainsce
+
+/anda/tools/melody @lleyton
+/anda/go/curlie @lleyton
+
+/anda/games/prismlauncher @getchoo
+/anda/games/prismlauncher-nightly @getchoo
+/anda/games/prismlauncher-qt5-nightly @getchoo
+/anda/games/prismlauncher-qt5 @getchoo
+
+/anda/srpm-macros @korewaChino
+/anda/rust/starship @korewaChino
+/anda/rust/zellij @korewaChino
+/anda/audio/distrho @korewaChino
+
+/anda/desktop/compiz9 @cat-master21
@@ -1,7 +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). Since we use a GitHub Wiki for [documentation](https://developer.fyralabs.com/terra), our guidelines may be found there. See the links below:
+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:

-* [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,12 +1,10 @@
 # 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)
+[![Repository status](https://repology.org/badge/repository-big/terra_37.svg)](https://repology.org/repository/terra_37)

 Terra is a rolling-release Fedora repository for all the software you need.
 With Terra, you can install the latest packages knowing that quality and security are assured.
+[Contributions](https://github.com/terrapkg/packages/wiki/Contribute) are always welcome, but please read our [documentation](https://github.com/terrapkg/packages/wiki) first.

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

@@ -14,10 +12,10 @@ This monorepo contains the package manifests for all packages in Terra.
 ```bash
 sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 ```
-You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is.

 ## Documentation
-Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/). Alternatively, the GitHub Wiki contains older versions of the documentations.
+Our documentation can be found on our [GitHub Wiki](https://github.com/terrapkg/packages/wiki).

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

-project {}
+project {}
@@ -1,6 +1,5 @@
 project pkg {
-	arches = ["x86_64"]
-	rpm {
-		spec = "anki-bin.spec"
-	}
+    rpm {
+        spec = "anki-bin.spec"
+    }
 }
@@ -1,15 +1,14 @@
 Name:			anki-bin
-Version:		24.04.1
-Release:		1%?dist
+Version:		2.1.58
+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
+License:		AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY
 URL:			https://apps.ankiweb.net/
-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
+BuildRequires:	python3-installer python3.11
+Requires:		hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
+Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
+Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress
+BuildArch:		noarch
 Conflicts:		anki
 Source0:		https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
 Source1:		https://files.pythonhosted.org/packages/py3/a/aqt/aqt-%{version}-py3-none-any.whl
@@ -20,46 +19,36 @@ Source5:		https://raw.githubusercontent.com/ankitects/anki/%{version}/LICENSE
 Source6:		https://raw.githubusercontent.com/ankitects/anki/%{version}/README.md

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

 %prep

 %build

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

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

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

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

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

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

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

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

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

 %changelog
-* Tue Jan 3 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.1.60
+* Tue Jan 3 2023 windowsboy111 <windowsboy111@fyralabs.com>
 - Initial package
@@ -1,13 +1,17 @@
-diff --git a/qt/aqt/update.py b/qt/aqt/update.py
-index 212ddf93d..6f716cc04 100644
--- a/qt/aqt/update.py
-+++ b/qt/aqt/update.py
-@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
+diff -uNr anki-2.1.55.old/qt/aqt/profiles.py anki-2.1.55/qt/aqt/profiles.py
+--- anki-2.1.55.old/qt/aqt/profiles.py	2023-01-02 18:35:44.574467892 +0800
+++ anki-2.1.55/qt/aqt/profiles.py	2023-01-02 18:34:00.412033736 +0800
+@@ -77,11 +77,11 @@
 
- 
- def check_for_update() -> None:
-+    return
-+
-     from aqt import mw
- 
-     def do_check(_col: Collection) -> CheckForUpdateResponse:
+ metaConf = dict(
+     ver=0,
+-    updates=True,
+    updates=False,
+     created=int_time(),
+     id=random.randrange(0, 2**63),
+     lastMsg=-1,
+-    suppressUpdate=False,
+    suppressUpdate=True,
+     firstRun=True,
+     defaultLang=None,
+ )
@@ -1,6 +1,5 @@
 project pkg {
-	arches = ["x86_64"]
-	rpm {
-		spec = "anki.spec"
-	}
+    rpm {
+        spec = "anki.spec"
+    }
 }
@@ -1,33 +1,32 @@
 Name:           anki
-Version:        24.04.1
-Release:        1%?dist
+Version:        2.1.58
+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
+License:        AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY
 URL:            https://apps.ankiweb.net/
-BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
+BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks 
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson
-BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-webengine
+BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
 Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
-Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt6-webengine
-Recommends:     mpv
+Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
 Obsoletes:      anki <= 2.1.15
+BuildArch:      noarch
 Conflicts:      anki-qt5
 Patch0:         0001-No-update.patch

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

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

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

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


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

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

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

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


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

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

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

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

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

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

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

 %changelog
-* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.3.0-2
- Use /usr/share/ instead of /opt/
-
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 2.2.1-2
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
 - Initial release
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "blackbox-terminal.spec"
-	}
-}
@@ -1,58 +0,0 @@
-Name:           blackbox-terminal
-Version:        0.14.0
-Release:        1%{?dist}
-Summary:        A beautiful GTK 4 terminal
-License:        GPL-3.0
-URL:            https://gitlab.gnome.org/raggesilver/blackbox
-BuildRequires:  vala meson gettext 
-BuildRequires:  pkgconfig(gtk4) >= 4.6.2
-BuildRequires:  pkgconfig(gio-2.0) >= 2.50
-BuildRequires:  libadwaita-devel >= 1.1
-BuildRequires:  pkgconfig(pqmarble) >= 2
-BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.69.0
-BuildRequires:  pkgconfig(json-glib-1.0) >= 1.4.4
-BuildRequires:  pkgconfig(libxml-2.0) >= 2.9.12
-BuildRequires:  pkgconfig(librsvg-2.0) >= 2.54.0
-BuildRequires:  pkgconfig(libpcre2-8)
-BuildRequires:  pkgconfig(graphene-gobject-1.0)
-BuildRequires:  pkgconfig(gee-0.8)
-BuildRequires:  desktop-file-utils libappstream-glib cmake
-Source0:        %url/-/archive/v%version/blackbox-v%version.tar.gz
-
-%description
-%{summary}.
-
-%prep
-%autosetup -p1 -n blackbox-v%version
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%check
-appstream-util validate-relax --nonet %buildroot/%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
-
-%files
-%doc README.md
-%license COPYING
-%_bindir/blackbox
-%_bindir/terminal-toolbox
-%_datadir/applications/com.raggesilver.BlackBox.desktop
-%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
-%_datadir/blackbox/
-%_datadir/glib-2.0/schemas/com.raggesilver.BlackBox.gschema.xml
-%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-fullscreen-symbolic.svg
-%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-show-headerbar-symbolic.svg
-%_datadir/icons/hicolor/scalable/actions/external-link-symbolic.svg
-%_datadir/icons/hicolor/scalable/actions/settings-symbolic.svg
-%_datadir/icons/hicolor/scalable/apps/com.raggesilver.BlackBox.svg
-%_datadir/locale/*/LC_MESSAGES/blackbox.mo
-
-
-
-%changelog
-* Sun Oct 23 2022 windowsboy111 <windowsboy111@fyralabs.com>
- Initial package
@@ -1,6 +1,5 @@
 project pkg {
-	arches = ["x86_64"]
-	rpm {
-		spec = "discord-canary-openasar.spec"
-	}
+    rpm {
+        spec = "discord-canary-openasar.spec"
+    }
 }
@@ -1,29 +1,19 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.346
-Release:        1%?dist
-Summary:        A snappier Discord rewrite with features like further customization and theming
-License:        MIT AND https://discord.com/terms
+Version:        0.0.148
+Release:        1%{?dist}
+Summary:        OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
+License:        MIT and https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
 Source0:        https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
 Source1:        %{url}/releases/download/nightly/app.asar
 Group:          Applications/Internet
-Requires:       glibc GConf2
-Requires:       nspr >= 4.13
-Requires:       nss >= 3.27
-Requires:       libX11 >= 1.6
-Requires:       libXtst >= 1.2
+Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
 ExclusiveArch:  x86_64

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

 %prep
 %autosetup -n DiscordCanary
@@ -38,8 +28,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-canary-openasar
 cp -rv * %{buildroot}%{_datadir}/discord-canary-openasar
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-ln -s %_datadir/discord-canary-openasar/discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary-openasar.desktop
-ln -s %_datadir/discord-canary-openasar/discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary-openasar.png
+install discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary-openasar.desktop
+install 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

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

 * Thu Oct 20 2022 Cappy Ishihara <cappy@cappuchino.xyz>
-
+- 
@@ -1,6 +1,5 @@
 project pkg {
-	arches = ["x86_64"]
-	rpm {
-		spec = "discord-canary.spec"
-	}
+    rpm {
+        spec = "discord-canary.spec"
+    }
 }
@@ -1,38 +1,32 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary
-Version:        0.0.346
-Release:        1%?dist
-Summary:        Free Voice and Text Chat for Gamers
+Version:        0.0.148
+Release:        1%{?dist}
+Summary:        Free Voice and Text Chat for Gamers.
 URL:            discord.com
 Source0:        https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
 License:        https://discord.com/terms
-Requires:       glibc GConf2 nspr >= 4.13 nss >= 3.27 libX11 >= 1.6 libXtst >= 1.2
+Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
 Group:          Applications/Internet
 ExclusiveArch:  x86_64
 %description
-Imagine a place where you can belong to a school club, a gaming group, or a
-worldwide art community. Where just you and a handful of friends can spend time
-together. A place that makes it easy to talk every day and hang out more often.
+Imagine a place where you can belong to a school club, a gaming group, or a worldwide art community. Where just you and a handful of friends can spend time together. A place that makes it easy to talk every day and hang out more often.

 %prep
 %autosetup -n DiscordCanary

 %build

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

 %files
 %{_datadir}/discord-canary/
@@ -1,5 +1,4 @@
 project pkg {
-	arches = ["x86_64"]
 	rpm {
 		spec = "discord-openasar.spec"
 	}
@@ -1,29 +1,19 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.49
-Release:        1%?dist
-Summary:        A snappier Discord rewrite with features like further customization and theming
-License:        MIT AND https://discord.com/terms
+Version:        0.0.25
+Release:        1%{?dist}
+Summary:        OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
+License:        MIT and https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
 Source0:        https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
 Source1:        %{url}/releases/download/nightly/app.asar
 Group:          Applications/Internet
-Requires:       glibc GConf2
-Requires:       nspr >= 4.13
-Requires:       nss >= 3.27
-Requires:       libX11 >= 1.6
-Requires:       libXtst >= 1.2
+Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
 ExclusiveArch:  x86_64

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

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

@@ -1,6 +1,6 @@
 project pkg {
-	arches = ["x86_64"]
-	rpm {
-		spec = "discord-ptb-openasar.spec"
-	}
+    rpm {
+        spec = "discord-ptb-openasar.spec"
+        update = ""
+    }
 }
@@ -1,29 +1,19 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb-openasar
-Version:        0.0.79
-Release:        1%?dist
-Summary:        A snappier Discord rewrite with features like further customization and theming
-License:        MIT AND https://discord.com/terms
+Version:        0.0.39
+Release:        1%{?dist}
+Summary:        OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
+License:        MIT and https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
 Source0:        https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
 Source1:        %{url}/releases/download/nightly/app.asar
 Group:          Applications/Internet
-Requires:       glibc GConf2
-Requires:       nspr >= 4.13
-Requires:       nss >= 3.27
-Requires:       libX11 >= 1.6
-Requires:       libXtst >= 1.2
+Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
 ExclusiveArch:  x86_64

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

 %prep
 %autosetup -n DiscordPTB
@@ -38,8 +28,6 @@ mkdir -p %{buildroot}%{_datadir}/discord-ptb-openasar
 cp -rv * %{buildroot}%{_datadir}/discord-ptb-openasar
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-ln -s %_datadir/discord-ptb-openasar/discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb-openasar.desktop
-ln -s %_datadir/discord-ptb-openasar/discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb-openasar.png
 install discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb-openasar.desktop
 install discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb-openasar.png
 cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-ptb-openasar/resources/app.asar
@@ -1,6 +1,5 @@
 project pkg {
-	arches = ["x86_64"]
-	rpm {
-		spec = "discord-ptb.spec"
-	}
+    rpm {
+        spec = "discord-ptb.spec"
+    }
 }
@@ -1,28 +1,17 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb
-Version:        0.0.79
-Release:        1%?dist
+Version:        0.0.39
+Release:        1%{?dist}
 Summary:        Free Voice and Text Chat for Gamers.
-URL:            https://discord.com
+URL:            discord.com
 Source0:        https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
 License:        https://discord.com/terms
-Requires:       glibc GConf2
-Requires:       nspr >= 4.13
-Requires:       nss >= 3.27
-Requires:       libX11 >= 1.6
-Requires:       libXtst >= 1.2
+Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
 Group:          Applications/Internet
 ExclusiveArch:  x86_64
 %description
-Imagine a place where you can belong to a school club, a gaming group, or a
-worldwide art community. Where just you and a handful of friends can spend time
-together. A place that makes it easy to talk every day and hang out more often.
+Imagine a place where you can belong to a school club, a gaming group, or a worldwide art community. Where just you and a handful of friends can spend time together. A place that makes it easy to talk every day and hang out more often.

 %prep
 %autosetup -n DiscordPTB
@@ -35,8 +24,8 @@ 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
+install discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb.desktop
+install discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb.png

 %files
 %{_datadir}/discord-ptb/
@@ -1,5 +1,4 @@
 project pkg {
-	arches = ["x86_64"]
 	rpm {
 		spec = "discord.spec"
 	}
@@ -1,18 +1,13 @@
 %define debug_package %{nil}
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.49
-Release:		1%?dist
-Summary:		Free Voice and Text Chat for Gamers
-URL:			https://discord.com
+Version:		0.0.25
+Release:		1%{?dist}
+Summary:		Free Voice and Text Chat for Gamers.
+URL:			discord.com
 Source0:		https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
 License:		https://discord.com/terms
-Requires:		glibc GConf2
+Requires:		libatomic glibc alsa-lib GConf2 libnotify libstdc++ libappindicator libcxx libXScrnSaver
 Requires:		nspr >= 4.13
 Requires:		nss >= 3.27
 Requires:		libX11 >= 1.6
@@ -20,9 +15,10 @@ Requires:		libXtst >= 1.2
 Group:			Applications/Internet
 ExclusiveArch:	x86_64
 %description
-Imagine a place where you can belong to a school club, a gaming group, or a
-worldwide art community. Where just you and a handful of friends can spend time
-together. A place that makes it easy to talk every day and hang out more often.
+Imagine a place where you can belong to a school club, a gaming group,
+or a worldwide art community. Where just you and a handful of friends
+can spend time together. A place that makes it easy to talk every day
+and hang out more often.

 %prep
 %autosetup -n Discord
@@ -35,8 +31,8 @@ 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
+install discord.desktop %{buildroot}%{_datadir}/applications/discord.desktop
+install discord.png %{buildroot}%{_datadir}/pixmaps/discord.png

 %files
 %{_datadir}/discord/
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "feishin.spec"
-  }
-}
@@ -1,69 +0,0 @@
-%define debug_package %nil
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
-
-Name:			feishin
-Version:		0.6.1
-Release:		1%?dist
-Summary:		A modern self-hosted music player
-License:		GPL-3.0
-URL:			https://github.com/jeffvli/feishin
-Source0:		%url/archive/refs/tags/v%version.tar.gz
-Requires:		fuse mpv
-BuildRequires:	nodejs-npm jq libxcrypt-compat
-
-%description
-%summary.
-
-%prep
-%autosetup
-
-cat package.json | jq '.author += { "email": "jeffvictorli@gmail.com" }' | jq '.build.linux += { "maintainer": "mado@fyralabs.com", "vendor": "Fyra Labs Terra" }' > a
-mv a package.json
-cat package.json
-
-cat<<EOF > feishin.desktop
-[Desktop Entry]
-Type=Application
-Name=Feishin
-Comment=Rewrite of Sonixd
-Exec=/usr/bin/feishin
-Icon=feishin
-Terminal=false
-Categories=Network;Audio;Music
-Keywords=Music;Jellyfin;Audio;Stream;Sonixd
-EOF
-
-%build
-npm install --legacy-peer-deps
-npm run postinstall
-npm run build
-%ifarch x86_64
-
-%define a linux
-%elifarch aarch64
-%define a arm64
-%endif
-
-npx electron-builder --linux dir --%a
-
-%install
-mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir
-mv release/build/*-unpacked %buildroot%_datadir/feishin
-install -Dm644 assets/icons/icon.png %buildroot%_datadir/pixmaps/feishin.png
-ln -s %_datadir/feishin/feishin %buildroot%_bindir/feishin
-install -Dm644 feishin.desktop %buildroot%_datadir/applications/
-
-%files
-%doc README.md CHANGELOG.md
-%license LICENSE
-%_bindir/feishin
-%_datadir/feishin/
-%_datadir/applications/feishin.desktop
-%_datadir/pixmaps/feishin.png
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(gh("jeffvli/feishin"));
@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-	  spec = "mpv-nightly.spec"
-  }
-  labels {
-    nightly = "1"
-  }
-}
@@ -1,230 +0,0 @@
-%global commit a46ce9e28cd97f7280c085649a79f85aa1d0fe70
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240325
-%global ver v0.37.0
-
-Name:           mpv-nightly
-Version:        %ver^%commit_date.%shortcommit
-Release:        1%?dist
-
-License:        GPL-2.0-or-later AND LGPL-2.1-or-later
-Summary:        Movie player playing most video formats and DVDs
-URL:            https://mpv.io/
-Source0:        https://github.com/mpv-player/mpv/archive/%commit/mpv-%commit.tar.gz
-Conflicts:		mpv
-
-BuildRequires:  desktop-file-utils
-BuildRequires:  gcc
-BuildRequires:  libappstream-glib
-BuildRequires:  libatomic
-BuildRequires:  meson
-BuildRequires:  python3-docutils
-
-BuildRequires:  perl(Encode)
-BuildRequires:  perl(Math::BigInt)
-BuildRequires:  perl(Math::BigRat)
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(caca)
-BuildRequires:  pkgconfig(dvdnav)
-BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(ffnvcodec)
-BuildRequires:  pkgconfig(gbm)
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libarchive) >= 3.4.0
-BuildRequires:  pkgconfig(libass)
-BuildRequires:  pkgconfig(libavcodec) >= 59.27.100
-BuildRequires:  pkgconfig(libavdevice) >= 58.13.100
-BuildRequires:  pkgconfig(libavfilter) >= 7.110.100
-BuildRequires:  pkgconfig(libavformat) >= 59.24.100
-BuildRequires:  pkgconfig(libavutil) >= 57.24.100
-BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio)
-BuildRequires:  pkgconfig(libcdio_paranoia)
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(libjpeg)
-BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.19
-BuildRequires:  pkgconfig(libplacebo) >= 6.338.0
-BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libswresample) >= 3.9.100
-BuildRequires:  pkgconfig(libswscale) >= 5.9.100
-BuildRequires:  pkgconfig(libva)
-BuildRequires:  pkgconfig(lua-5.1)
-BuildRequires:  pkgconfig(mujs)
-BuildRequires:  pkgconfig(openal)
-BuildRequires:  pkgconfig(rubberband)
-BuildRequires:  pkgconfig(sdl2)
-BuildRequires:  pkgconfig(shaderc)
-BuildRequires:  pkgconfig(uchardet) >= 0.0.5
-BuildRequires:  pkgconfig(vapoursynth)
-BuildRequires:  pkgconfig(vdpau)
-BuildRequires:  pkgconfig(vulkan)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-cursor)
-BuildRequires:  pkgconfig(wayland-egl)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xdamage)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xinerama)
-BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(xpresent)
-BuildRequires:  pkgconfig(xrandr)
-BuildRequires:  pkgconfig(xscrnsaver)
-BuildRequires:  pkgconfig(xv)
-BuildRequires:  pkgconfig(zimg) >= 2.9
-BuildRequires:  pkgconfig(zlib)
-
-Requires:       hicolor-icon-theme
-Provides:       mplayer-backend
-Recommends:     (yt-dlp or youtube-dl)
-Suggests:       yt-dlp
-
-%description
-Mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
-of video file formats, audio and video codecs, and subtitle types. Special
-input URL types are available to read input from a variety of sources other
-than disk files. Depending on platform, a variety of different video and audio
-output methods are supported.
-
-Mpv has an OpenGL, Vulkan, and D3D11 based video output that is capable of many
-features loved by videophiles, such as video scaling with popular high quality
-algorithms, color management, frame timing, interpolation, HDR, and more.
-
-While mpv strives for minimalism and provides no real GUI, it has a small
-controller on top of the video for basic control.
-
-Mpv can leverage most hardware decoding APIs on all platforms. Hardware
-decoding can be enabled at runtime on demand.
-
-Powerful scripting capabilities can make the player do almost anything. There
-is a large selection of user scripts on the wiki.
-
-A straightforward C API was designed from the ground up to make mpv usable as
-a library and facilitate easy integration into other applications.
-
-%package libs
-Summary: Dynamic library for Mpv frontends
-
-%description libs
-This package contains the dynamic library libmpv, which provides access to Mpv.
-
-%package devel
-Summary: Development package for libmpv
-Provides: mpv-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: mpv-nightly-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: mpv-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: mpv-nightly-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: mpv-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: mpv-nightly-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This package contains development header files and libraries for Mpv.
-
-%prep
-%autosetup -p1 -n mpv-%commit
-sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf
-
-%build
-%meson --auto-features=auto \
-    -Dalsa=enabled \
-    -Dbuild-date=false \
-    -Dcaca=enabled \
-    -Dcdda=enabled \
-    -Dcplayer=true \
-    -Dcplugins=enabled \
-    -Dcuda-hwaccel=enabled \
-    -Dcuda-interop=enabled \
-    -Ddmabuf-wayland=enabled \
-    -Ddrm=enabled \
-    -Ddvbin=enabled \
-    -Ddvdnav=enabled \
-    -Degl-drm=enabled \
-    -Degl-wayland=enabled \
-    -Degl-x11=enabled \
-    -Degl=enabled \
-    -Dgbm=enabled \
-    -Dgl-x11=enabled \
-    -Dgl=enabled \
-    -Dhtml-build=enabled \
-    -Diconv=enabled \
-    -Djack=enabled \
-    -Djavascript=enabled \
-    -Djpeg=enabled \
-    -Dlcms2=enabled \
-    -Dlibarchive=enabled \
-    -Dlibavdevice=enabled \
-    -Dlibbluray=enabled \
-    -Dlibmpv=true \
-    -Dlua=enabled \
-    -Dmanpage-build=enabled \
-    -Dopenal=enabled \
-    -Dopensles=disabled \
-    -Doss-audio=disabled \
-    -Dpipewire=enabled \
-    -Dplain-gl=enabled \
-    -Dpulse=enabled \
-    -Drubberband=enabled \
-    -Dsdl2-audio=enabled \
-    -Dsdl2-gamepad=enabled \
-    -Dsdl2-video=enabled \
-    -Dsdl2=enabled \
-    -Dsndio=disabled \
-    -Dspirv-cross=disabled \
-    -Duchardet=enabled \
-    -Dvaapi-drm=enabled \
-    -Dvaapi-wayland=enabled \
-    -Dvaapi-x11=enabled \
-    -Dvaapi=enabled \
-    -Dvapoursynth=enabled \
-    -Dvdpau-gl-x11=enabled \
-    -Dvdpau=enabled \
-    -Dvector=enabled \
-    -Dvulkan-interop=disabled \
-    -Dvulkan=enabled \
-    -Dwayland=enabled \
-    -Dwerror=false \
-    -Dx11=enabled \
-    -Dxv=enabled \
-    -Dzimg=enabled \
-    -Dzlib=enabled
-%meson_build
-
-%install
-%meson_install
-
-%check
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/mpv.metainfo.xml
-desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop
-
-%files
-%docdir %{_docdir}/mpv/
-%license LICENSE.GPL LICENSE.LGPL Copyright
-%{_docdir}/mpv/
-%{_bindir}/mpv
-%{_datadir}/applications/mpv.desktop
-%dir %{_datadir}/bash-completion/
-%dir %{_datadir}/bash-completion/completions/
-%{_datadir}/bash-completion/completions/mpv
-%{_datadir}/icons/hicolor/*/apps/mpv*.*
-%dir %{_datadir}/zsh/
-%dir %{_datadir}/zsh/site-functions/
-%{_datadir}/zsh/site-functions/_mpv
-%{_mandir}/man1/mpv.*
-%{_metainfodir}/mpv.metainfo.xml
-%dir %{_sysconfdir}/mpv/
-%config(noreplace) %{_sysconfdir}/mpv/encoding-profiles.conf
-
-%files libs
-%license LICENSE.GPL LICENSE.LGPL Copyright
-%{_libdir}/libmpv.so.2{,.*}
-
-%files devel
-%{_includedir}/mpv/
-%{_libdir}/libmpv.so
-%{_libdir}/pkgconfig/mpv.pc
-
-%changelog
-%autochangelog
@@ -1,8 +0,0 @@
-if filters.contains("nightly") {
-	rpm.global("commit", gh_commit("mpv-player/mpv"));
-	if rpm.changed() {
-		rpm.global("ver", gh("mpv-player/mpv"));
-		rpm.global("commit_date", date());
-		rpm.release();
-	}
-}
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "rust-sccache.spec"
-	}
-}
@@ -1,14 +0,0 @@
--- sccache-0.7.6/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sccache-0.7.6/Cargo.toml	2024-02-02T06:05:53.548100+00:00
-@@ -378,11 +378,3 @@
- [target."cfg(unix)".dependencies.daemonize]
- version = "0.5"
- 
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = [
-    "fileapi",
-    "handleapi",
-    "stringapiset",
-    "winnls",
-]
@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "tectonic.spec"
+    }
+}
@@ -0,0 +1,35 @@
+%define debug_package %{nil}
+
+Name:           tectonic
+Version:        0.12.0
+Release:        2%{?dist}
+Summary:        A modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive
+URL:            https://github.com/tectonic-typesetting/tectonic
+License:        MIT
+Source0:        %{url}/archive/refs/tags/tectonic@%{version}.tar.gz
+Requires:       openssl harfbuzz-icu libpng freetype graphite2 zlib fontconfig
+BuildRequires:  cargo gcc gcc-c++ mold openssl-devel libpng-devel freetype graphite2-devel zlib-devel fontconfig-devel pkgconfig(icu-uc)
+
+%description
+Tectonic is a modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive.
+
+%prep
+%autosetup -n tectonic-tectonic-%{version}
+
+
+%build
+# cargo build --features external-harfbuzz
+
+
+%install
+cargo install --path . --features external-harfbuzz
+
+
+%files
+%doc README.md
+%license LICENSE 
+
+
+%changelog
+* Tue Nov 1 2022 windowsboy111 <windowsboy111@fyralabs.com>
+- Repackaged for Terra
@@ -0,0 +1,3 @@
+let v = gh("tectonic-typesetting/tectonic");
+v.crop(9);
+rpm.version(v);
@@ -1 +0,0 @@
-*.tar.gz
@@ -1,5 +0,0 @@
-project "pkg" {
-    rpm {
-        spec = "vencord-desktop.spec"
-    }
-}
@@ -1 +0,0 @@
-rpm.version(gh_tag("Vencord/Vesktop"));
@@ -1,74 +0,0 @@
-%define debug_package %nil
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/vesktop/.*\\.so
-
-Name:		vencord-desktop
-Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.1
-Release:	1%?dist
-License:	GPL-3.0
-Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
-URL:		https://github.com/Vencord/Vesktop
-Group:		Applications/Internet
-#Source1:	launch.sh
-Source0:    https://github.com/Vencord/Vesktop/archive/refs/tags/v%{version}.tar.gz
-Requires:   xdg-utils
-BuildRequires:	nodejs-npm git
-# Conflicts:	vesktop-bin
-
-%description
-vesktop is a custom client designed to enhance your Discord experience
-while keeping everything lightweight.
-
-%prep
-git init
-git remote add origin %url || :
-git reset --hard
-git fetch
-git checkout v%version
-
-cat <<EOF > vesktop.desktop
-[Desktop Entry]
-Name=Vesktop
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=/usr/bin/vencorddesktop
-Icon=vesktop
-Categories=Network;InstantMessaging;
-StartupWMClass=VencordDesktop
-
-Keywords=discord;vesktop;vencord;shelter;armcord;electron;
-EOF
-
-
-%build
-npx pnpm@8 install --no-frozen-lockfile
-npx pnpm@8 package:dir
-
-
-%install
-
-mkdir -p %buildroot/usr/share/vesktop
-cp -r dist/*-unpacked/. %buildroot/usr/share/vesktop/.
-
-install -Dm755 dist/*-unpacked/vencorddesktop %buildroot/usr/bin/vencorddesktop
-ln -sf /usr/share/vesktop/vencorddesktop %buildroot/usr/bin/vencorddesktop
-install -Dm644 vesktop.desktop %buildroot/usr/share/applications/vesktop.desktop
-install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/vesktop.png
-
-%files
-%doc README.md
-%license LICENSE
-/usr/bin/vencorddesktop
-/usr/share/applications/vesktop.desktop
-/usr/share/pixmaps/vesktop.png
-/usr/share/vesktop/*
-
-%changelog
-* Tue Nov 07 2023 Cappy Ishihara <cappy@cappuchino.xyz> - 0.4.3-1
- Initial package
-
-
@@ -1,22 +0,0 @@
-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 +0,0 @@
-project pkg {
-	rpm {
-		spec = "voicevox.spec"
-	}
-}
@@ -1,5 +0,0 @@
-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,66 +0,0 @@
-%global nodev 18.13.0
-%global npmv 8.19.3
-%global ver 0.18.1
-%define debug_package %nil
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
-
-Name:			voicevox
-Version:		%ver
-Release:		4%?dist
-Summary:		Free Japanese text-to-speech editor
-License:		LGPL-3.0
-URL:			https://voicevox.hiroshiba.jp
-Source0:		https://github.com/VOICEVOX/voicevox/archive/refs/tags/%version.tar.gz
-# requires specific node and npm version
-%ifarch x86_64
-%global a x64
-%elifarch aarch64
-%global a arm64
-%endif
-Source1:		https://nodejs.org/download/release/v%nodev/node-v%nodev-linux-%a.tar.xz
-Patch0:			0001-feat-add-repository-entry-in-package.json.patch
-
-%description
-VOICEVOX is a free Japanese text-to-speech software with medium output quality.
-
-%package doc
-Summary: Documentation files for voicevox (Japanese)
-
-%description doc
-%summary.
-
-%prep
-%autosetup -p1
-tar xf %SOURCE1
-PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
-npx npm@%npmv i
-
-%build
-PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
-npx browserslist@latest --update-db
-PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
-npm run electron:build
-
-%install
-rm dist_electron/linux-unpacked/README.txt # dummy
-mkdir -p %buildroot%_datadir/%name %buildroot%_bindir %buildroot%_docdir/%name/res
-mv dist_electron/linux-unpacked/* %buildroot%_datadir/%name/
-ln -s %_datadir/%name/%name %buildroot%_bindir/%name
-install -Dm644 docs/*.md %buildroot%_docdir/%name/
-install -Dm644 docs/res/* %buildroot%_docdir/%name/res/
-
-%files
-%doc README.md
-%license LICENSE LGPL_LICENSE
-%_bindir/%name
-%_datadir/%name/
-
-%files doc
-%doc %_docdir/%name/
-
-%changelog
-%autochangelog
@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "distrho.spec"
+    }
+}
@@ -9,7 +9,7 @@ Version:    0
 Release:    0.1.%{rel_tag}%{?dist}
 Summary:    Linux audio plugins ports
 URL:        https://distrho.sourceforge.io/ports.php
-License:    GPL-2.0 AND GPL-3.0 AND MIT
+License:    GPLv2 and GPLv3 and MIT

 Source0:    https://github.com/DISTRHO/DISTRHO-Ports/archive/refs/tags/2021-03-15.tar.gz

@@ -26,36 +26,37 @@ BuildRequires:  pkgconfig(xcursor)
 %description
 Misc audio production plugins ported to linux lv2 plugins by DISTRHO

+# Dexed

 %package dexed
-Summary:    A multi platform, multi format plugin synth closely modeled on the Yamaha DX7
+Summary:    Dexed is a multi platform, multi format plugin synth that is closely modeled on the Yamaha DX7

 %description dexed
-Dexed is a multi platform, multi format plugin synth that is closely modeled on
-the Yamaha DX7. Dexed is also a midi cartridge librarian/manager for the DX7.
+Dexed is a multi platform, multi format plugin synth that is closely modeled on the Yamaha DX7.
+Dexed is also a midi cartridge librarian/manager for the DX7

+# Vitalium

 %package vitalium
-Summary:    A spectral warping wavetable synthesizer
+Summary:    vitalium is a spectral warping wavetable synthesizer
 Provides:   vitalium-vst = %{version}-%{release}
 Provides:   vitalium-lv2 = %{version}-%{release}
 Provides:   vitalium = %{version}-%{release}
-
 %description vitalium
-vitalium is the Open Source version of the Vital spectral warping wavetable
-synthesizer.
-
+vitalium is the Open Source version of the Vital spectral warping wavetable synthesizer

 %package TAL
-Summary:    Misc Plugins for TAL
+Summary:    Misc Plugins for TAL (tal-filter, tal-filter-2, tal-noisemaker, tal-reverb, tal-reverb-2, tal-reverb-3, tal-vocoder-2)
+
+# TAL

 %description TAL
-Misc Plugins for TAL (tal-filter, tal-filter-2, tal-noisemaker, tal-reverb,
-tal-reverb-2, tal-reverb-3, tal-vocoder-2).
-
+Misc Plugins for TAL (tal-filter, tal-filter-2, tal-noisemaker, tal-reverb, tal-reverb-2, tal-reverb-3, tal-vocoder-2)

 %package dRowAudio
-Summary:    Plugins from dRowAudio
+Summary:    Plugins from dRowAudio (distortion, distortionshaper, flanger, reverb, tremolo)
+
+# dRowAudio

 %description dRowAudio
 Plugins from dRowAudio (distortion, distortionshaper, flanger, reverb, tremolo)
@@ -67,132 +68,132 @@ Summary:    Arctican lv2 plugins
 %description Arctican
 Plugins from Arctican (The Functiom & The Pilgrim)

+# LUFS

 %package LUFS
 Summary:    Klangfreund metering plugins (Multimeter + LUFS Meter)

 %description LUFS
-Klangfreund metering plugins (Multimeter + LUFS Meter).
+Klangfreund metering plugins (Multimeter + LUFS Meter)

+# EasySSP

 %package EasySSP
-Summary:    A small and lightweight audio visualization tool
+Summary:    Easy Sound Space Perception is a small and lightweight audio visualization tool

 %description EasySSP
-Easy Sound Space Perception is a small and lightweight audio visualization tool
-that currently provides spectrometer and goniometer views.
+Easy Sound Space Perception is a small and lightweight audio visualization tool, which currently provides spectrometer and goniometer views.

+# JuceOPL

 %package JuceOPL
 Summary:    Classic game sounds in Plugin form, as heard in late 80s / early 90s sound cards

 %description JuceOPL
-Classic game sounds in Plugin form,
-as heard in late 80s / early 90s sound cards.
+Classic game sounds in Plugin form, as heard in late 80s / early 90s sound cards.

+# KlangFalter

 %package KlangFalter
-Summary:    A convolution audio plugin
+Summary:    KlangFalter is a convolution audio plugin

 %description KlangFalter
 KlangFalter is a convolution audio plugin

+# Luftikus

 %package Luftikus
 Summary:    Luftikus plugin

 %description Luftikus
-Luftikus is a digital adaptation of an analog EQ with fixed half-octave bands
-and additional high frequency boost. As an improvement to the hardware it
-allows deeper cuts and supports a keep-gain mode where overall gain changes are
-avoided.
+Luftikus is a digital adaptation of an analog EQ with fixed half-octave bands and additional high frequency boost.
+As an improvement to the hardware it allows deeper cuts and supports a keep-gain mode where overall gain changes are avoided.

+# Obxd

 %package Obxd
-Summary:    Emulation of famous ob-x, ob-xa and ob8 synths
+Summary:    Obxd is emulation of famous ob-x, ob-xa and ob8 synths

 %description Obxd
 Obxd is emulation of famous ob-x, ob-xa and ob8 synths.

+# Refine

 %package ReFine
 Summary:    ReFine plugin

 %description ReFine
-ReFine is a plugin that allows to add a final polishing to your tracks, busses
-and masters. It extracts psycho-acoustic parameters from the source and thus
-allows to add warmth, space and punch to your mixes.
+ReFine is a plugin that allows to add a final polishing to your tracks, busses and masters.
+It extracts psycho-acoustic parameters from the source and thus allows to add warmth, space and punch to your mixes.

+# Wolpertinger

 %package Wolpertinger
-Summary:    A subtractive, antialiased polyphonic software synthesizer
+Summary:    Wolpertinger is a subtractive, antialiased polyphonic software synthesizer

 %description Wolpertinger
 Wolpertinger is a subtractive, antialiased polyphonic software synthesizer.

+# Vex

 %package Vex
-Summary:    A 3 oscillator subtractive waverom synth
+Summary:    Vex is a 3 oscillator subtractive waverom synth

 %description Vex
 Vex is a 3 oscillator subtractive waverom synth

-
+# Temper
 %package Temper
-Summary:    A modern digital distortion plugin
+Summary:    Temper is a modern digital distortion plugin

 %description Temper
-Temper is a modern digital distortion plugin featuring a rich saturation stage
-and a unique phase distortion. Use the variable saturation curve to add warmth
-and edge to your sound, and let the phase distortion bring character and
-clarity through your mix. Temper also features a simple resonant lowpass filter
-and a feedback path to drive the intensity of the tone.
-
+Temper is a modern digital distortion plugin featuring a rich saturation stage and a unique phase distortion.
+Use the variable saturation curve to add warmth and edge to your sound, and let the phase distortion bring character and clarity through your mix.
+Temper also features a simple resonant lowpass filter and a feedback path to drive the intensity of the tone.

+# SwankyAmp
 %package SwankyAmp
-Summary:    A tube amplifier emulation plug-in
+Summary:    Swanky Amp is a tube amplifier emulation plug-in

 %description SwankyAmp
-Swanky Amp is a tube amplifier emulation plug-in based on detailed simulations
-of tube amplification. Discover new tones effortlessly with intuitive controls,
-harnessing the coveted sounds of dynamic tube amplification.
-
+Swanky Amp is a tube amplifier emulation plug-in which is based on detailed simulations of tube amplification.
+Discover new tones effortlessly with intuitive controls, harnessing the coveted sounds of dynamic tube amplification.

+# PitchedDelay
 %package PitchedDelay
 Summary:    PitchedDelay is a delay that allows the pitching the delayed signal

 %description PitchedDelay
-PitchedDelay is a delay that allows the pitching the delayed signal, within or
-outside the feedback loop.
-
+PitchedDelay is a delay that allows the pitching the delayed signal, within or outside the feedback loop.

+# StereoSourceSeparation
 %package StereoSourceSeparation
 Summary:    Stereo Source Separation plugin

 %description StereoSourceSeparation
-This is a plugin that uses the spatial information hidden in the stereo signal
-to accomplish source separation.
+This is a plugin that uses the spatial information hidden in the stereo signal to accomplish source separation.

+# HiReSam

 %package HiReSam
 Summary:    Klangfreund High Resolution Spectrum Analyse Meter

 %description HiReSam
-%summary.
-
+Klangfreund High Resolution Spectrum Analyse Meter

+# eqinox
 %package eqinox
 Summary:    EQinox equaliser plugin

 %description eqinox
-EQinox equaliser plugin.
-
+EQinox equaliser plugin

+# drumsynth
 %package drumsynth
-Summary:    Plugin for drumsynth
+Summary:    drumsynth plugin

 %description drumsynth
-%summary.
+drumsynth plugin

 %prep
 %autosetup -p1 -n DISTRHO-Ports-%{github_release}
@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "dart.spec"
+    }
+}
@@ -1,8 +1,8 @@
 %define debug_package %{nil}

 Name: dart
-Version: 3.3.3
-Release: 1%?dist
+Version: 2.19.2
+Release: 1%{?dist}
 Summary: The Dart Language
 License: BSD-3-Clause
 URL: https://dart.dev/
@@ -18,11 +18,9 @@ URL: https://dart.dev/
 %endif

 Source0: https://storage.googleapis.com/dart-archive/channels/stable/release/%{version}/sdk/dartsdk-linux-%{arch}-release.zip
-BuildRequires: fdupes

 %description
-Dart is a client-optimized language for fast apps on any platform.
-This package contains the SDK used to develop and compile Dart applications.
+Dart is a client-optimized language for fast apps on any platform. This package contains the SDK used to develop and compile Dart applications.

 %prep
 %setup -q -n dart-sdk
@@ -39,8 +37,6 @@ cp -rv ./* %{buildroot}%{_libdir}/dart
 ln -sf %{_libdir}/dart/bin/dart %{buildroot}%{_bindir}/dart
 ln -sf %{_libdir}/dart/bin/dartaotruntime %{buildroot}%{_bindir}/dartaotruntime

-%fdupes %buildroot%_libdir/dart/bin/
-
 %files
 %{_libdir}/dart/
 %{_bindir}/dart
@@ -1,5 +1,5 @@
 project pkg {
-	rpm {
-		spec = "budgie-extras.spec"
-	}
+    rpm {
+        spec = "budgie-extras.spec"
+    }
 }
@@ -1,15 +1,15 @@
-Name:		budgie-extras
-Version:	1.8.0
-Release:	1%{?dist}

-License:	GPL-3.0
+Name:		budgie-extras
+Version:	1.5.90
+Release:	1%{dist}
+
+License:	GPLv3
 Summary:	Additional Budgie Desktop enhancements for user experience
 URL:		https://ubuntubudgie.org/

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

-BuildRequires:	rpm_macro(fdupes)
 BuildRequires:	cmake
 BuildRequires:	meson
 BuildRequires:	vala
@@ -51,6 +51,7 @@ Requires:	budgie-applet-recentlyused
 Requires:	budgie-applet-rotation-lock
 Requires:	budgie-applet-showtime
 Requires:	budgie-applet-takeabreak
+Requires:	budgie-applet-trash
 Requires:	budgie-applet-visualspace
 Requires:	budgie-applet-wallstreet
 Requires:	budgie-applet-window-shuffler
@@ -68,7 +69,6 @@ The applets can be used individually or as a set.
 %package	common
 Requires:	budgie-desktop
 Summary:	Shared component of budgie-extras applets
-BuildArch:	noarch
 %description	common
 The shared component provides for capabilities that are utilised between
 budgie-extra applets.
@@ -207,6 +207,14 @@ upside down, dim the screen, lock screen or show a countdown message on break
 time. The applet can be accessed quickly from the panel to temporarily switch
 it off.

+%package -n	budgie-applet-trash
+Requires:	budgie-extras-common
+Summary:	Applet allows access to trash capabilities for the Budgie Desktop
+%description -n	budgie-applet-trash
+The trash applet allows the user access the desktop trash capabilities
+from the panel including the ability to delete and restore files stored
+in the trash folder.
+
 %package -n	budgie-applet-visualspace
 Requires:	budgie-extras-common
 Summary:	Shows the current workspace(s), as bullet(s)
@@ -274,8 +282,6 @@ workspaces.
 # Remove absolute symlink and replace with relative symlink
 rm -f %{buildroot}%{_bindir}/quickchar

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

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

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

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

 %files -n budgie-applet-quickchar
-%config %{_sysconfdir}/xdg/autostart/quickchar-autostart.desktop
+%{_sysconfdir}/xdg/autostart/quickchar-autostart.desktop
 %ghost %{_bindir}/quickchar
 %{_libdir}/quickchar
 %{_datadir}/applications/org.ubuntubudgie.quickchar.desktop
@@ -384,14 +390,17 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.takeabreak.gschema.xml
 %{_datadir}/pixmaps/takeabreak*.svg

+%files -n budgie-applet-trash
+%{_libdir}/budgie-desktop/plugins/budgie-trash
+
 %files -n budgie-applet-visualspace
-%config %{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
+%{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
 %{_libdir}/budgie-desktop/plugins/budgie-visualspace
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.budgie-visualspace.gschema.xml
 %{_datadir}/pixmaps/visualspace-symbolic.svg

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

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

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

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

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

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

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

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

 %description -n python3-ccsm
@@ -77,12 +76,12 @@ Compiz Config Manager helps configure Compiz Window Manager, version 0.9 series
 Compiz 9 branch, which is newer then what Fedora packages and required by Unity 7.6 and higher.

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

 %build
 # The driver blacklist hack is obselete
 sed -i 's/(nouveau|Intel).*Mesa 8.0//' plugins/opengl/opengl.xml.in
-%cmake -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DBUILD_GTK=ON -DBUILD_METACITY=ON -DCOMPIZ_BUILD_TESTING=OFF -DBUILD_GLES=OFF -DCOMPIZ_PACKAGING_ENABLED=TRUE -DBUILD_XORG_GTEST=OFF -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_WERROR=OFF
+%cmake -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=OFF -DBUILD_GTK=ON -DBUILD_METACITY=ON -DCOMPIZ_BUILD_TESTING=OFF -DBUILD_GLES=ON -DCOMPIZ_PACKAGING_ENABLED=TRUE -DBUILD_XORG_GTEST=OFF -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_WERROR=OFF
 %cmake_build

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

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

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

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

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

 License:        GPL-3.0-or-later
@@ -1,5 +1,5 @@
 project pkg {
-	rpm {
-		spec = "elementary-calculator.spec"
-	}
+    rpm {
+        spec = "elementary-calculator.spec"
+    }
 }
@@ -3,9 +3,9 @@

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

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

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

 Requires:       hicolor-icon-theme

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

 %find_lang %{appname}

-%fdupes %buildroot/%_datadir/icons/hicolor
-

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

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


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


 %changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 1.7.2-1
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
 - Repackaged for Terra
@@ -1,5 +1,5 @@
 project pkg {
-	rpm {
-		spec = "elementary-calendar.spec"
-	}
+    rpm {
+        spec = "elementary-calendar.spec"
+    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
windowsboy111	005ed20c4a	dunno	2023-02-20 15:15:47 +08:00
windowsboy111	a5312f14e2	fix: bandwhich	2023-02-20 14:10:01 +08:00