bump: osu-lazer

* fix: anki anki-qt5

* Update anki-qt5.spec

Signed-off-by: madomado <madonuko@outlook.com>

* Update anki.spec

Signed-off-by: madomado <madonuko@outlook.com>

* idk

* yeah you too

---------

Signed-off-by: madomado <madonuko@outlook.com>

.backportrc.json

@@ -1,9 +0,0 @@
-{
-  "repoOwner": "terrapkg",
-  "repoName": "packages",
-  "resetAuthor": true,
-  "targetBranchChoices": ["f39", "f40", "frawhide"],
-  "branchLabelMapping": {
-    "^sync-(.+)$": "$1"
-  }
-}

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-ARG VARIANT="rawhide"
+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

.devcontainer/devcontainer.json

@@ -2,17 +2,10 @@
   "name": "Fedora",
   "build": {
     "dockerfile": "Dockerfile",
-    "args": { "VARIANT": "rawhide" }
+    "args": { "VARIANT": "37" }
   },
+  "settings": {},
+  "extensions": [],
   "remoteUser": "vscode",
-  "runArgs": [
+  "runArgs": ["--privileged"]
-    "--privileged"
-  ],
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "rhaiscript.vscode-rhai"
-      ]
-    }
-  }
 }

.github/workflows/autobuild.yml

@@ -6,13 +6,13 @@ on:
     paths:
       - anda/**
     branches:
-      - frawhide
+      - f37
   pull_request:
     branches:
-      - frawhide
+      - f37
   merge_group:
     branches:
-      - frawhide
+      - f37
   workflow_dispatch:
   workflow_call:
 
@@ -23,13 +23,13 @@ jobs:
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f37
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Set workspace as safe
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Generate build matrix
@@ -40,26 +40,36 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["37"]
       fail-fast: false
-    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
+      image: ghcr.io/terrapkg/builder:f37
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up git repository
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
+      - name: Cache buildroot
+        id: br-cache
+        uses: actions/cache@v3
+        with:
+          path: /var/cache
+          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
+          restore-keys: |
+            ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
+            ${{ runner.os }}-br-${{ matrix.version }}
+            ${{ runner.os }}-br
+
       - name: Include custom build template instead of package default
-        run: |
+        run: cp -v anda/mock-configs/anda.tpl /etc/mock/templates/anda.tpl
-          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
 
       - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
 
       - name: Generating artifact name
         id: art
@@ -68,13 +78,10 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
+          path: anda-build/rpm/rpms/*
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
 
       - name: Upload packages to subatomic
         if: github.event_name == 'push'
@@ -84,17 +91,9 @@ jobs:
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
             terra${{ matrix.version }} anda-build/rpm/rpms/*
 
-      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
       - name: Notify Madoguchi (Success)
         if: success() && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
       - name: Notify Madoguchi (Failure)
         if: ( cancelled() || failure() ) && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}

.github/workflows/bootstrap.yml

@@ -7,55 +7,56 @@ jobs:
   bootstrap:
     strategy:
       matrix:
-        version: ["rawhide"]
+        version: ["37"]
         arch: ["x86_64", "aarch64"]
       fail-fast: true
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
+      image: fedora:37
       options: --cap-add=SYS_ADMIN --privileged
     steps:
-      - name: Install repositories
+      - uses: actions/setup-go@v3
-        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@v4
         with:
-          ref: f${{ matrix.version }}
+          go-version: "^1.19"
-          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
+      - name: Install repositories
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/terra/srpm-macros/pkg
+        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
+          set-safe-directory: true
+          fetch-depth: 1
+
+      - 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 terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/subatomic/pkg
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          anda build -c anda-${{ matrix.version }}-${{ matrix.arch }} subatomic -p rpm -D "autogitcommit $(git log -1 --format='%H')"
       - name: Install Subatomic
-        run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+        run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/anda
 
       - name: Build Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg
+        run: anda build -c anda-${{ matrix.version }}-${{ matrix.arch }} anda -p rpm
 
-      - name: Upload packages to subatomic
+      - name: Upload to Subatomic
         run: |
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
             terra${{ matrix.version }} anda-build/rpm/rpms/*
-
-      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*

.github/workflows/build.yml

@@ -5,69 +5,39 @@ on:
       packages:
         description: "Packages to Build"
         required: true
-      custom_builder:
-        description: "Custom Builder"
-        required: false
-        default: ""
-      architecture:
-        description: "Architecture"
-        required: false
-        default: all
-        type: string
 
 jobs:
   parse:
     outputs:
       pkgs: ${{ steps.parsing.outputs.pkgs }}
-      builder: ${{ inputs.custom_builder }}
-      arch: ${{ steps.parsing.outputs.arch }}
     runs-on: "ubuntu-latest"
     steps:
       - name: Parse Input
         id: parsing
-        run: |
+        run: echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
-          echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
-          echo "builder=${{ inputs.custom_builder }}" >> $GITHUB_OUTPUT
-          arch="${{ inputs.architecture }}"
-          # Convert to json array using jq
-          # if arch is not all, convert to array
-          if [ "$arch" != "all" ]; then
-            # jq, array with single element as string
-             arch=$(echo $arch | sed 's/,/\n/g')
-             echo "arch=$(echo $arch | jq -Rs 'split("\n")' | jq 'map(select(length > 0))' | jq -c .)" >> $GITHUB_OUTPUT
-          else
-             echo "arch=$(echo '["aarch64", "x86_64"]' | jq -c .)" >> $GITHUB_OUTPUT
-          fi
 
   build:
     needs: parse
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["37"]
-        arch: ${{ fromJson(needs.parse.outputs.arch) }}
+        arch: ["x86_64", "aarch64"]
       fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f37
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up git repository
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
-      - name: Cache buildroot
+      - name: Build with Anda
-        id: br-cache
+        run: anda build ${{ matrix.pkg }}pkg --package rpm -c anda-${{ matrix.version }}-${{ matrix.arch }}
-        uses: actions/cache@v4
-        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
@@ -76,13 +46,10 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
+          path: anda-build/rpm/rpms/*
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
 
       - name: Upload packages to subatomic
         run: |
@@ -91,16 +58,9 @@ jobs:
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
             terra${{ matrix.version }} anda-build/rpm/rpms/*
 
-      - name: Upload source packages to subatomic
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
       - name: Notify Madoguchi (Success)
         if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
       - name: Notify Madoguchi (Failure)
         if: cancelled() || failure()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}

.github/workflows/json-build.yml

@@ -11,29 +11,22 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["37"]
       fail-fast: false
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f37
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up git repository
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
-      - name: Cache buildroot
+      - name: Build with Anda
-        id: br-cache
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
-        uses: actions/cache@v4
-        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
@@ -42,13 +35,10 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
+          path: anda-build/rpm/rpms/*
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
 
       - name: Upload packages to subatomic
         run: |
@@ -57,17 +47,9 @@ jobs:
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
             terra${{ matrix.version }} anda-build/rpm/rpms/*
 
-      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
       - name: Notify Madoguchi (Success)
         if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
       - name: Notify Madoguchi (Failure)
         if: cancelled() || failure()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}

.github/workflows/lint.yml

@@ -1,22 +1,14 @@
 name: Lint
 
-on:
+on: [push, pull_request]
-  push:
+
-    branches:
-      - frawhide
-  pull_request:
-    branches:
-      - frawhide
-  merge_group:
-    branches:
-      - frawhide
 jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f38
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Lint spec files
         run: rpmlint $(find anda -type f -name "*.spec" -type f)

.github/workflows/mg.sh

@@ -2,7 +2,7 @@ set -x
 
 dirs=$2
 dirs=${dirs/\/pkg/}
-export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\",\"succ\":$1,\"commit\":\"%6\"}"
+export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\",\"succ\":$1}"
 
 if [[ $1 == false ]]; then
 	d=${p/\%v/?}

.github/workflows/sync.yml

@@ -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

.github/workflows/sync.yml.bak

@@ -0,0 +1,38 @@
+name: Sync PR to other branches
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - f38
+
+jobs:
+  sync:
+    strategy:
+      matrix:
+        branch: ["f37"]
+      fail-fast: false
+    if: github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'nosync')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
+          ref: ${{ matrix.branch }}
+      - name: Install SSH key and Setup Git
+        run: |
+          mkdir -p ${{ runner.temp }}
+          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
+          chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config user.name "Raboneko"
+          git config user.email "raboneko@fyralabs.com"
+          git config gpg.format "ssh"
+          git config user.signingkey "${{ runner.temp }}/signing_key"
+      - name: Apply patches and Push
+        run: |
+          curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch
+          git am -S --keep-cr --signoff < pr.patch
+          git push -u origin --all

.github/workflows/update-comps.yml

@@ -3,9 +3,8 @@ name: Push comps updates
 on:
   push:
     branches:
-      - frawhide
+      - f38
-      - f40
+      - f37
-      - f39
     paths:
       - comps.xml
   workflow_dispatch:
@@ -14,12 +13,14 @@ jobs:
   update-comps:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:38
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
+      - id: get-branch
+        uses: grandmasterdev/github-action-get-branch@latest
       - name: Push to subatomic
         run: |
-          branch=${{ github.ref_name }}
+          branch=${{steps.get-branch.outputs.branch-name}}
           ver=${branch/f/}
           subatomic-cli upload-comps \
             --server https://subatomic.fyralabs.com \

.github/workflows/update-nightly.yml

@@ -8,21 +8,20 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
 
-      - name: Install SSH signing key & Set up git repository
+      - name: Install SSH signing key
         run: |
           mkdir -p ${{ runner.temp }}
           echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
           chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run Nightly Update
         run: anda update -vv --filters nightly=1
@@ -31,6 +30,7 @@ jobs:
 
       - name: Save
         run: |
+          git config --global --add safe.directory "*"
           if [[ `git status --porcelain` ]]; then
             git config user.name "Raboneko"
             git config user.email "raboneko@fyralabs.com"
@@ -38,15 +38,13 @@ jobs:
             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 () {
+            f37 () {
               git format-patch HEAD^
-              git checkout $1
+              git checkout f37
               git apply *.patch || true
-              rm *.patch
               git add *
               git commit -S -a -m "$msg"
             }
-            copy_over f39 || true
+            f37 || true
-            copy_over f40 || true
             git push -u origin --all
           fi

.github/workflows/update.yml

@@ -1,37 +1,37 @@
 name: Update
 on:
   schedule:
-    - cron: "*/10 * * * *"
+    - cron: "*/30 * * * *"
   workflow_dispatch:
 
 jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
 
-      - name: Install SSH signing key & Set up git repository
+      - name: Install SSH signing key
         run: |
           mkdir -p ${{ runner.temp }}
           echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
           chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run Update
         run: anda update -vv
         env:
-          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RUST_BACKTRACE: full
 
       - name: Save
         run: |
+          git config --global --add safe.directory "*"
           if [[ `git status --porcelain` ]]; then
             git config user.name "Raboneko"
             git config user.email "raboneko@fyralabs.com"
@@ -39,15 +39,10 @@ jobs:
             git config user.signingkey "${{ runner.temp }}/signing_key"
             msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
             git commit -S -a -m "$msg"
-            copy_over () {
+            # git format-patch HEAD^
-              git format-patch HEAD^
+            # git checkout f37
-              git checkout $1
+            # git apply *.patch || true
-              git apply *.patch || true
+            # git add *
-              rm *.patch
+            # git commit -S -a -m "$msg"
-              git add *
-              git commit -S -a -m "$msg"
-            }
-            copy_over f39 || true
-            copy_over f40 || true
             git push -u origin --all
           fi

.gitignore

@@ -1 +1,2 @@
 anda-build/
+*.patch

.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-  "recommendations": [
-    "rhaiscript.vscode-rhai"
-  ]
-}

CODEOWNERS

@@ -0,0 +1,30 @@
+# Repository
+/.github @lleyton 
+/.devcontainer @lleyton 
+/.gitignore @windowsboy111 
+/CODE_OF_CONDUCT.md @lleyton 
+/CONTRIBUTING.md @lleyton 
+/LICENSE @lleyton 
+/README.md @windowsboy111 
+/SECURITY.md @lleyton 
+/anda.hcl @lleyton 
+/comps.xml @lleyton 
+
+# Package maintainers
+/anda/lib/libbismuth @lainsce
+/anda/lib/libhelium @lainsce
+/anda/others/tau-helium @lainsce
+/anda/others/tau-hydrogen @lainsce
+
+/anda/tools/melody @lleyton
+/anda/go/curlie @lleyton
+
+/anda/games/prismlauncher @getchoo
+/anda/games/prismlauncher-nightly @getchoo
+/anda/games/prismlauncher-qt5-nightly @getchoo
+/anda/games/prismlauncher-qt5 @getchoo
+
+/anda/srpm-macros @korewaChino
+/anda/rust/starship @korewaChino
+/anda/rust/zellij @korewaChino
+/anda/audio/distrho @korewaChino

CONTRIBUTING.md

@@ -1,9 +1,7 @@
 # Contributing
 
-First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q).
+First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q). Since we use a GitHub Wiki for [documention](https://github.com/terrapkg/packages/wiki), our guidelines may be found there. See the links below:
 
-## Documentations
+* [Contribution Guide](https://github.com/terrapkg/packages/wiki/Contribute)
-
+* [FAQ](https://github.com/terrapkg/packages/wiki/FAQ)
-* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
+* [Policy](https://github.com/terrapkg/packages/wiki/Policy)
-* [FAQ](https://developer.fyralabs.com/terra/faq)
-* [Policy](https://developer.fyralabs.com/terra/policy)

README.md

@@ -1,22 +1,24 @@
 # Terra Sources
 
-[![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_37.svg?header=Terra+37)](https://repology.org/repository/terra_37)
-[![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_38.svg?header=Terra+38)](https://repology.org/repository/terra_38)
-[![Repository status](https://repology.org/badge/repository-big/terra_rawhide.svg?header=Terra+Rawhide)](https://repology.org/repository/terra_rawhide)
 
 Terra is a rolling-release Fedora repository for all the software you need.
 With Terra, you can install the latest packages knowing that quality and security are assured.
+[Contributions](https://github.com/terrapkg/packages/wiki/Contribute) are always welcome, but please read our [documentation](https://github.com/terrapkg/packages/wiki) first.
 
 This monorepo contains the package manifests for all packages in Terra.
 
 ## Installation
 ```bash
-sudo dnf install --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' --setopt='terra.gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc' terra-release
+sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 ```
-You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is.
 
 ## 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).
+
+> Note: you can also take a look at our [devdocs](https://developer.fyralabs.com/terra/).
 
 ## Questions?
 Feel free to reach out on [Discord](https://discord.gg/5fdPuxTg5Q). We're always happy to help!
+

SECURITY.md

@@ -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
 

anda/apps/anki-bin/anki-bin.spec

@@ -1,26 +1,17 @@
-%global xurl https://files.pythonhosted.org/packages/51/5f/6f52b958fe38a36a0799c01fbd56a742ebdfcf41f89438dbee998b8ce692/anki-24.06.3-cp39-abi3-manylinux_2_28_x86_64.whl
-%global aurl https://files.pythonhosted.org/packages/df/bb/b0bfbc6a06a598b0b614d18dd8c4f40827828649f9742f1f44a4e44d6a2c/anki-24.06.3-cp39-abi3-manylinux_2_31_aarch64.whl
-%global qurl https://files.pythonhosted.org/packages/21/2a/d8e22a9521be04ef29a30d21a2c3008783ab03b6f07cc14696a040f747a4/aqt-24.06.3-py3-none-any.whl
-
 Name:			anki-bin
-Version:		24.06.3
+Version:		23.12.1
-Release:		1%?dist
+Release:		1%{?dist}
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:			https://apps.ankiweb.net/
-BuildRequires:	python3-pip rpm_macro(fdupes) cargo
+BuildRequires:	python3-installer python3.11 rpm_macro(fdupes)
-Requires:		python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
+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
+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 python3-pyqt6-webengine python3-send2trash
+Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine
-Requires:       libxcrypt-compat hicolor-icon-theme sox mpv 
 ExclusiveArch:	x86_64
 Conflicts:		anki
-%ifarch x86_64
+Source0:		https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
-Source0:		%xurl
+Source1:		https://files.pythonhosted.org/packages/py3/a/aqt/aqt-%{version}-py3-none-any.whl
-%elifarch aarch64
-Source0:        %aurl
-%endif
-Source1:		%qurl
 Source2:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/runanki.py
 Source3:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.desktop
 Source4:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.png
@@ -37,37 +28,29 @@ Anki is based on a theory called spaced repetition.
 %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*} .
+%fdupes %_libdir/python*/site-packages/_aqt/data/
-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/bin/anki
-/usr/lib/python*/site-packages/_aqt/
+/usr/lib64/python*/site-packages/_aqt/
-/usr/lib/python*/site-packages/anki-%{version}.dist-info/
+/usr/lib64/python*/site-packages/anki-%{version}.dist-info/
-/usr/lib/python*/site-packages/anki/
+/usr/lib64/python*/site-packages/anki/
-/usr/lib/python*/site-packages/aqt-%{version}.dist-info/
+/usr/lib64/python*/site-packages/aqt-%{version}.dist-info/
-/usr/lib/python*/site-packages/aqt/
+/usr/lib64/python*/site-packages/aqt/
-%_datadir/applications/anki.desktop
+/usr/share/applications/anki.desktop
-%_datadir/pixmaps/anki.png
+/usr/share/pixmaps/anki.png
 
 %changelog
-* Fri Nov 10 2023 hazel-bunny <dabiswas112@gmail.com> - 23.10-2
-- Add python3-orjson and mpv as dependencies
-
 * Wed Jan 11 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.1.60
 - Initial package

anda/apps/anki-bin/update.rhai

@@ -1,15 +1 @@
-let aarch64_regex = `<a href="https://files\.pythonhosted\.org/packages/(..)/(..)/(.{60})/anki-([\d.]+)-cp(\d+)-abi3-manylinux_.+?_aarch64.whl">`;
+rpm.version(gh("ankitects/anki"));
-let html = get("https://pypi.org/project/anki/");
-let relevant = find(aarch64_regex, html, 0);
-let ver = find(aarch64_regex, relevant, 4);
-rpm.version(ver);
-if rpm.changed() {
-    rpm.release();
-    rpm.global("aurl", find(`"(.+)"`, relevant, 1));
-    let cp = find(aarch64_regex, relevant, 5);
-    let x86_64_regex = `<a href="https://files\.pythonhosted\.org/packages/(..)/(..)/(.{60})/anki-${ver}-cp${cp}-abi3-manylinux_.+?_x86_64.whl">`;
-    let relevant1 = find(x86_64_regex, html, 0);
-    rpm.global("xurl", find(`"(.+)"`, relevant1, 1));
-    let qhtml = get("https://pypi.org/project/aqt/");
-    rpm.global("qurl", find(`<a href="(https://files\.pythonhosted\.org/packages/../../.{60}/aqt-${ver}-py3-none.any.whl)">`, qhtml, 1));
-}

anda/apps/anki-qt5/anki-qt5.spec

@@ -1,13 +1,13 @@
 Name:           anki-qt5
-Version:        24.06.3
+Version:        23.12.1
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
 BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson 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:       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-pyqt5-sip
 ExclusiveArch:  x86_64
 Conflicts:      anki
@@ -20,10 +20,9 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
 Anki is based on a theory called spaced repetition.
 
 %prep
-rm -rf ./*
 git clone https://github.com/ankitects/anki .
 git checkout %version
-%patch 1 -p1
+%patch1 -p1
 
 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
 

anda/apps/anki/anki.spec

@@ -1,6 +1,6 @@
 Name:           anki
-Version:        24.06.3
+Version:        23.12.1
-Release:        1%?dist
+Release:        1%{?dist}
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
@@ -20,10 +20,8 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
 Anki is based on a theory called spaced repetition.
 
 %prep
-rm -rf *
 git clone https://github.com/ankitects/anki .
 git checkout %{version}
-%patch 0 -p1
 
 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki
 

anda/apps/armcord-bin/armcord-bin.spec

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

anda/apps/armcord/armcord.spec

@@ -1,15 +1,15 @@
 %define debug_package %nil
 
 Name:		armcord
-Version:	3.2.7
+Version:	3.2.6
-Release:	1%?dist
+Release:	1%{?dist}
 License:	OSL-3.0
 Summary:	Custom lightweight Discord client designed to enhance your experience
 URL:		https://github.com/ArmCord/ArmCord
 Group:		Applications/Internet
 Source1:	launch.sh
 Requires:	electron xdg-utils
-BuildRequires:	nodejs-npm git add-determinism
+BuildRequires:	nodejs-npm git
 Conflicts:	armcord-bin
 BuildArch:	noarch
 
@@ -18,7 +18,6 @@ ArmCord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.
 
 %prep
-rm -rf *
 git clone %url .
 git checkout v%version
 

anda/apps/discord-canary-openasar/discord-canary-openasar.spec

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

anda/apps/discord-canary/discord-canary.spec

@@ -6,8 +6,8 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-canary
-Version:        0.0.454
+Version:        0.0.209
-Release:        1%?dist
+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

anda/apps/discord-openasar/discord-openasar.spec

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

anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec

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

anda/apps/discord-ptb/discord-ptb.spec

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

anda/apps/discord/discord.spec

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

anda/apps/envision/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "envision.spec"
-    }
-}

anda/apps/envision/envision.spec

@@ -1,46 +0,0 @@
-%global commit 6cf5e40b96d1cbd99a3cfcef1f03899356e79448
-%global commit_date 20240703
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name:           envision
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
-License:        AGPL-3.0-or-later
-URL:            https://gitlab.com/gabmus/envision/
-Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo 
-BuildRequires:  pkgconfig(glib-2.0) >= 2.66
-BuildRequires:  pkgconfig(gio-2.0) >= 2.66
-BuildRequires:  pkgconfig(gtk4) >= 4.10.0
-BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  openssl-devel-engine
-BuildRequires:  libappstream-glib
-BuildRequires:  desktop-file-utils
-BuildRequires:  glib2-devel
-Recommends:     android-tools
-
-%description
-%summary.
-
-%prep
-%autosetup -n envision-%commit
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/envision
-%_datadir/applications/org.gabmus.envision.desktop
-%_datadir/envision/
-%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.svg
-%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg
-%_metainfodir/org.gabmus.envision.appdata.xml

anda/apps/envision/update.rhai

@@ -1,5 +0,0 @@
-rpm.global("commit", gitlab_commit("gitlab.com", "46446166", "main"));
-if rpm.changed() {
-	rpm.global("commit_date", date());
-	rpm.release();
-}

anda/apps/feishin/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "feishin.spec"
-  }
-}

anda/apps/feishin/feishin.spec

@@ -1,69 +0,0 @@
-%define debug_package %nil
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
-
-Name:			feishin
-Version:		0.7.1
-Release:		1%?dist
-Summary:		A modern self-hosted music player
-License:		GPL-3.0
-URL:			https://github.com/jeffvli/feishin
-Source0:		%url/archive/refs/tags/v%version.tar.gz
-Requires:		fuse mpv
-BuildRequires:	nodejs-npm jq libxcrypt-compat
-
-%description
-%summary.
-
-%prep
-%autosetup
-
-cat package.json | jq '.author += { "email": "jeffvictorli@gmail.com" }' | jq '.build.linux += { "maintainer": "mado@fyralabs.com", "vendor": "Fyra Labs Terra" }' > a
-mv a package.json
-cat package.json
-
-cat<<EOF > feishin.desktop
-[Desktop Entry]
-Type=Application
-Name=Feishin
-Comment=Rewrite of Sonixd
-Exec=/usr/bin/feishin
-Icon=feishin
-Terminal=false
-Categories=Network;Audio;Music
-Keywords=Music;Jellyfin;Audio;Stream;Sonixd
-EOF
-
-%build
-npm install --legacy-peer-deps
-npm run postinstall
-npm run build
-%ifarch x86_64
-
-%define a linux
-%elifarch aarch64
-%define a arm64
-%endif
-
-npx electron-builder --linux dir --%a
-
-%install
-mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir
-mv release/build/*-unpacked %buildroot%_datadir/feishin
-install -Dm644 assets/icons/icon.png %buildroot%_datadir/pixmaps/feishin.png
-ln -s %_datadir/feishin/feishin %buildroot%_bindir/feishin
-install -Dm644 feishin.desktop %buildroot%_datadir/applications/
-
-%files
-%doc README.md CHANGELOG.md
-%license LICENSE
-%_bindir/feishin
-%_datadir/feishin/
-%_datadir/applications/feishin.desktop
-%_datadir/pixmaps/feishin.png
-
-%changelog
-%autochangelog

anda/apps/feishin/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("jeffvli/feishin"));

anda/apps/komikku/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-	  spec = "komikku.spec"
-  }
-}

anda/apps/komikku/komikku.spec

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

anda/apps/komikku/update.rhai

@@ -1,3 +0,0 @@
-let latest_tag = get("https://codeberg.org/api/v1/repos/valos/Komikku/tags").json_arr()[0].name;
-let new_version = find("([\\.\\d]+)", latest_tag, 1);
-rpm.version(new_version);

anda/apps/lomiri-system-settings/lomiri-system-settings.spec

@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 1530c1fcfd8b8b7eec3a30e2db20cfc9946fa34a
+%global commit 87ffe4bf29b3b220f66e34611f381e0d15054a89
 %forgemeta
 
 Name:       lomiri-system-settings
-Version:    1.2.0
+Version:    1.0.2
-Release:    1%?dist
+Release:    1%{?dist}
 Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings

anda/apps/mpv/anda.hcl

@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-	  spec = "mpv-nightly.spec"
-  }
-  labels {
-    nightly = "1"
-  }
-}

anda/apps/mpv/mpv-nightly.spec

@@ -1,230 +0,0 @@
-%global commit e509ec0aaffce74e520702e16e3e21ea0f168940
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240720
-%global ver v0.38.0
-
-Name:           mpv-nightly
-Version:        %ver^%commit_date.%shortcommit
-Release:        1%?dist
-
-License:        GPL-2.0-or-later AND LGPL-2.1-or-later
-Summary:        Movie player playing most video formats and DVDs
-URL:            https://mpv.io/
-Source0:        https://github.com/mpv-player/mpv/archive/%commit/mpv-%commit.tar.gz
-Conflicts:		mpv
-
-BuildRequires:  desktop-file-utils
-BuildRequires:  gcc
-BuildRequires:  libappstream-glib
-BuildRequires:  libatomic
-BuildRequires:  meson
-BuildRequires:  python3-docutils
-
-BuildRequires:  perl(Encode)
-BuildRequires:  perl(Math::BigInt)
-BuildRequires:  perl(Math::BigRat)
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(caca)
-BuildRequires:  pkgconfig(dvdnav)
-BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(ffnvcodec)
-BuildRequires:  pkgconfig(gbm)
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libarchive) >= 3.4.0
-BuildRequires:  pkgconfig(libass)
-BuildRequires:  pkgconfig(libavcodec) >= 59.27.100
-BuildRequires:  pkgconfig(libavdevice) >= 58.13.100
-BuildRequires:  pkgconfig(libavfilter) >= 7.110.100
-BuildRequires:  pkgconfig(libavformat) >= 59.24.100
-BuildRequires:  pkgconfig(libavutil) >= 57.24.100
-BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio)
-BuildRequires:  pkgconfig(libcdio_paranoia)
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(libjpeg)
-BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.19
-BuildRequires:  pkgconfig(libplacebo) >= 6.338.0
-BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libswresample) >= 3.9.100
-BuildRequires:  pkgconfig(libswscale) >= 5.9.100
-BuildRequires:  pkgconfig(libva)
-BuildRequires:  pkgconfig(lua-5.1)
-BuildRequires:  pkgconfig(mujs)
-BuildRequires:  pkgconfig(openal)
-BuildRequires:  pkgconfig(rubberband)
-BuildRequires:  pkgconfig(sdl2)
-BuildRequires:  pkgconfig(shaderc)
-BuildRequires:  pkgconfig(uchardet) >= 0.0.5
-BuildRequires:  pkgconfig(vapoursynth)
-BuildRequires:  pkgconfig(vdpau)
-BuildRequires:  pkgconfig(vulkan)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-cursor)
-BuildRequires:  pkgconfig(wayland-egl)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xdamage)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xinerama)
-BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(xpresent)
-BuildRequires:  pkgconfig(xrandr)
-BuildRequires:  pkgconfig(xscrnsaver)
-BuildRequires:  pkgconfig(xv)
-BuildRequires:  pkgconfig(zimg) >= 2.9
-BuildRequires:  pkgconfig(zlib)
-
-Requires:       hicolor-icon-theme
-Provides:       mplayer-backend
-Recommends:     (yt-dlp or youtube-dl)
-Suggests:       yt-dlp
-
-%description
-Mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
-of video file formats, audio and video codecs, and subtitle types. Special
-input URL types are available to read input from a variety of sources other
-than disk files. Depending on platform, a variety of different video and audio
-output methods are supported.
-
-Mpv has an OpenGL, Vulkan, and D3D11 based video output that is capable of many
-features loved by videophiles, such as video scaling with popular high quality
-algorithms, color management, frame timing, interpolation, HDR, and more.
-
-While mpv strives for minimalism and provides no real GUI, it has a small
-controller on top of the video for basic control.
-
-Mpv can leverage most hardware decoding APIs on all platforms. Hardware
-decoding can be enabled at runtime on demand.
-
-Powerful scripting capabilities can make the player do almost anything. There
-is a large selection of user scripts on the wiki.
-
-A straightforward C API was designed from the ground up to make mpv usable as
-a library and facilitate easy integration into other applications.
-
-%package libs
-Summary: Dynamic library for Mpv frontends
-
-%description libs
-This package contains the dynamic library libmpv, which provides access to Mpv.
-
-%package devel
-Summary: Development package for libmpv
-Provides: mpv-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides: mpv-nightly-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: mpv-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: mpv-nightly-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: mpv-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: mpv-nightly-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description devel
-This package contains development header files and libraries for Mpv.
-
-%prep
-%autosetup -p1 -n mpv-%commit
-sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf
-
-%build
-%meson --auto-features=auto \
-    -Dalsa=enabled \
-    -Dbuild-date=false \
-    -Dcaca=enabled \
-    -Dcdda=enabled \
-    -Dcplayer=true \
-    -Dcplugins=enabled \
-    -Dcuda-hwaccel=enabled \
-    -Dcuda-interop=enabled \
-    -Ddmabuf-wayland=enabled \
-    -Ddrm=enabled \
-    -Ddvbin=enabled \
-    -Ddvdnav=enabled \
-    -Degl-drm=enabled \
-    -Degl-wayland=enabled \
-    -Degl-x11=enabled \
-    -Degl=enabled \
-    -Dgbm=enabled \
-    -Dgl-x11=enabled \
-    -Dgl=enabled \
-    -Dhtml-build=enabled \
-    -Diconv=enabled \
-    -Djack=enabled \
-    -Djavascript=enabled \
-    -Djpeg=enabled \
-    -Dlcms2=enabled \
-    -Dlibarchive=enabled \
-    -Dlibavdevice=enabled \
-    -Dlibbluray=enabled \
-    -Dlibmpv=true \
-    -Dlua=enabled \
-    -Dmanpage-build=enabled \
-    -Dopenal=enabled \
-    -Dopensles=disabled \
-    -Doss-audio=disabled \
-    -Dpipewire=enabled \
-    -Dplain-gl=enabled \
-    -Dpulse=enabled \
-    -Drubberband=enabled \
-    -Dsdl2-audio=enabled \
-    -Dsdl2-gamepad=enabled \
-    -Dsdl2-video=enabled \
-    -Dsdl2=enabled \
-    -Dsndio=disabled \
-    -Dspirv-cross=disabled \
-    -Duchardet=enabled \
-    -Dvaapi-drm=enabled \
-    -Dvaapi-wayland=enabled \
-    -Dvaapi-x11=enabled \
-    -Dvaapi=enabled \
-    -Dvapoursynth=enabled \
-    -Dvdpau-gl-x11=enabled \
-    -Dvdpau=enabled \
-    -Dvector=enabled \
-    -Dvulkan-interop=disabled \
-    -Dvulkan=enabled \
-    -Dwayland=enabled \
-    -Dwerror=false \
-    -Dx11=enabled \
-    -Dxv=enabled \
-    -Dzimg=enabled \
-    -Dzlib=enabled
-%meson_build
-
-%install
-%meson_install
-
-%check
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/mpv.metainfo.xml
-desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop
-
-%files
-%docdir %{_docdir}/mpv/
-%license LICENSE.GPL LICENSE.LGPL Copyright
-%{_docdir}/mpv/
-%{_bindir}/mpv
-%{_datadir}/applications/mpv.desktop
-%dir %{_datadir}/bash-completion/
-%dir %{_datadir}/bash-completion/completions/
-%{_datadir}/bash-completion/completions/mpv
-%{_datadir}/icons/hicolor/*/apps/mpv*.*
-%dir %{_datadir}/zsh/
-%dir %{_datadir}/zsh/site-functions/
-%{_datadir}/zsh/site-functions/_mpv
-%{_mandir}/man1/mpv.*
-%{_metainfodir}/mpv.metainfo.xml
-%dir %{_sysconfdir}/mpv/
-%config(noreplace) %{_sysconfdir}/mpv/encoding-profiles.conf
-
-%files libs
-%license LICENSE.GPL LICENSE.LGPL Copyright
-%{_libdir}/libmpv.so.2{,.*}
-
-%files devel
-%{_includedir}/mpv/
-%{_libdir}/libmpv.so
-%{_libdir}/pkgconfig/mpv.pc
-
-%changelog
-%autochangelog

anda/apps/mpv/update.rhai

@@ -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();
-	}
-}

anda/apps/mugshot/anda.hcl

@@ -1,6 +0,0 @@
-project pkg {
-    arches = ["x86_64"]
-    rpm {
-        spec = "mugshot.spec"
-    }
-}

anda/apps/mugshot/mugshot.spec

@@ -1,62 +0,0 @@
-%global app org.bluesabre.Mugshot
-%global _description %{expand:
-Mugshot is a lightweight user configuration utility for Linux designed for simplicity and ease of
-use. Quickly update your personal profile and sync your updates across applications.}
-
-
-Name:           python-mugshot
-Version:        0.4.3
-Release:        1%?dist
-Summary:        User Management Utility for Linux
-License:        GPL-3.0
-URL:            https://github.com/bluesabre/mugshot
-Source0:        %url/archive/refs/tags/mugshot-%version.tar.gz
-BuildArch:      noarch
-BuildRequires:  python3-devel
-BuildRequires:  python3-pip
-BuildRequires:  python3-distutils-extra
-BuildRequires:  python3-wheel
-BuildRequires:  python3-setuptools
-BuildRequires:  glib2
-BuildRequires:  desktop-file-utils
-BuildRequires:  libappstream-glib
-
-%description %_description
-
-%package -n mugshot
-Requires:       util-linux-user
-Requires:       python3-cairo
-Requires:       python3-pexpect
-Requires:       python3-gobject
-Summary:        User Management Utility for Linux
-
-%description -n mugshot %_description
-
-%prep
-%autosetup -n mugshot-mugshot-%version
-
-%build
-%pyproject_wheel
-
-%install
-%pyproject_install
-%pyproject_save_files -L 'mugshot*'
-install -Dm644 data/glib-2.0/schemas/%{lower:%app}.gschema.xml %buildroot%_datadir/glib-2.0/schemas/
-
-%find_lang mugshot
-
-%check
-#pyproject_check_import
-desktop-file-validate %buildroot%_datadir/applications/%app.desktop
-appstream-util validate-relax --nonet %buildroot%_metainfodir/mugshot.appdata.xml
-
-%files -n mugshot -f %{pyproject_files} -f mugshot.lang
-%doc README.md NEWS
-%license COPYING
-%_bindir/mugshot
-%_datadir/glib-2.0/schemas/%{lower:%app}.gschema.xml
-%_datadir/applications/%app.desktop
-%_datadir/mugshot/
-%_metainfodir/mugshot.appdata.xml
-%_mandir/man1/mugshot.1.gz
-%_iconsdir/hicolor/*/apps/mugshot.svg

anda/apps/mugshot/update.rhai

@@ -1,3 +0,0 @@
-let v = gh("bluesabre/mugshot");
-v.crop(8);
-rpm.version(v);

anda/apps/paper-plane/0001-remove-libadwaita-dependency.patch

@@ -0,0 +1,24 @@
+From f26efc2b94f630213cb78d378cd7ba5adbc58260 Mon Sep 17 00:00:00 2001
+From: windowsboy111 <wboy111@outlook.com>
+Date: Tue, 13 Jun 2023 23:00:14 +0800
+Subject: [PATCH] remove libadwaita dependency
+
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5766bcf..5d769be 100644
+--- a/meson.build
++++ b/meson.build
+@@ -13,7 +13,6 @@ base_id = 'app.drey.PaperPlane'
+ dependency('glib-2.0', version: '>= 2.72')
+ dependency('gio-2.0', version: '>= 2.72')
+ dependency('gtk4', version: '>= 4.10')
+-dependency('libadwaita-1', version: '>= 1.4')
+ dependency('tdjson', version: '== 1.8.14')
+ 
+ glib_compile_resources = find_program('glib-compile-resources', required: true)
+-- 
+2.40.1
+

anda/apps/paper-plane/anda.hcl

@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "paper-plane.spec"
+	}
+}

anda/apps/paper-plane/paper-plane.spec

@@ -0,0 +1,49 @@
+%define debug_package %nil
+%global ver 0.1.0
+%global commit 4a9945429cdc446b323e390e8c1163944582051e
+
+Name:			paper-plane
+Version:		0.1.0.beta.3
+Release:		1%{?dist}
+Summary:		Alternative Telegram client in GTK4 and Rust
+License:		GPL-3.0
+URL:			https://github.com/paper-plane-developers/paper-plane
+Source0:		%url/archive/%commit.tar.gz
+BuildRequires:	meson cargo terra-gtk4-devel tdlib-paper-plane-devel libappstream-glib desktop-file-utils terra-blueprint-compiler sassc pkgconfig(appstream) vala libadwaita-nightly-devel rlottie-devel clang-devel desktop-file-utils libappstream-glib
+Requires:		terra-gtk4 >= 4.10 gstreamer1-plugin-libav gstreamer1-plugins-good libadwaita-nightly tdlib-paper-plane
+
+%description
+Paper Plane is an alternative Telegram client. It uses libadwaita for its user
+interface and strives to meet the design principles of the GNOME desktop.
+
+%prep
+%autosetup -n %name-%commit
+cp /%_libdir/pkgconfig/libadwaita-nightly.pc /%_libdir/pkgconfig/libadwaita-1.pc
+
+%build
+# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=paper-plane
+%meson -Dtg_api_id=22303002 -Dtg_api_hash=3cc0969992690f032197e6609b296599
+%meson_build
+
+%install
+%meson_install
+
+%check
+appstream-util validate-relax --nonet %buildroot%_datadir/metainfo/app.drey.PaperPlane.metainfo.xml
+desktop-file-validate %buildroot%_datadir/applications/app.drey.PaperPlane.desktop
+
+%files
+%doc README.md
+%license COPYING
+%_bindir/paper-plane
+%_datadir/applications/app.drey.PaperPlane.desktop
+%_datadir/glib-2.0/schemas/app.drey.PaperPlane.gschema.xml
+%_datadir/icons/hicolor/scalable/apps/app.drey.PaperPlane.svg
+%_datadir/icons/hicolor/symbolic/apps/app.drey.PaperPlane-symbolic.svg
+%_datadir/locale/*/LC_MESSAGES/paper-plane.mo
+%_datadir/metainfo/app.drey.PaperPlane.metainfo.xml
+%_datadir/paper-plane/resources.gresource
+
+%changelog
+* Tue May 23 2023 windowsboy111 <windowsboy111@fyralabs.com> - 0.1.0-beta.1
+- Initial package.

anda/apps/paper-plane/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("paper-plane-developers/paper-plane"));

anda/apps/tuxclocker/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "tuxclocker.spec"
-  }
-}

anda/apps/tuxclocker/tuxclocker.spec

@@ -1,42 +0,0 @@
-Name:           tuxclocker
-Version:        1.5.1
-Release:        1%?dist
-Summary:        Qt overclocking tool for GNU/Linux 
-License:        GPL-3.0
-URL:            https://github.com/Lurkki14/tuxclocker
-# boost qt5-qtbase qt5-qtcharts
-Requires:       hicolor-icon-theme
-BuildRequires:  git-core meson hwdata qt5-qttools gettext anda-srpm-macros
-BuildRequires:  boost-devel qt5-qtbase-devel qt5-qtcharts-devel libdrm-devel libXNVCtrl-devel openssl-devel
-Recommends:     xorg-x11-drv-nvidia libdrm libXNVCtrl hwdata
-
-%description
-TuxClocker is a hardware controlling and monitoring program.
-TuxClocker consists of a DBus daemon and a Qt GUI that uses the daemon.
-
-%prep
-git clone --recursive %url .
-git checkout %version
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/tuxclocker-qt
-%_bindir/tuxclockerd
-%_libdir/libtuxclocker.so
-%_libdir/tuxclocker/
-%_datadir/applications/tuxclocker.desktop
-%_datadir/dbus-1/system-services/org.tuxclocker.service
-%_datadir/dbus-1/system.d/org.tuxclocker.conf
-%_datadir/locale/*/LC_MESSAGES/tuxclocker.mo
-%_iconsdir/hicolor/scalable/apps/tuxclocker-logo.svg
-
-%changelog
-%autochangelog

anda/apps/tuxclocker/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("Lurkki14/tuxclocker"));

anda/apps/vala-panel-appmenu/vala-panel-appmenu.spec

@@ -1,13 +1,12 @@
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu
-%global commit 7631683adb35cd4fae387abf7ff1552aab4d2249
+%global commit 76442be6195385193cb5931d0004122310d40c95
 %forgemeta
 
 Name:    vala-panel-appmenu
-Version: 24.05
+Version: 0.7.6
-Release: 1%?dist
+Release: 2%?dist
 License: LGPL-3.0-or-later
 Summary: Application Menu plugin for vala-panel
-Group:   System/GUI/Other
 URL:     %{forgeurl}
 Source:  %{forgesource}
 
@@ -21,7 +20,6 @@ BuildRequires: vala
 BuildRequires: systemd-rpm-macros
 BuildRequires: pkgconfig(libxfce4panel-2.0)
 BuildRequires: pkgconfig(gtk+-2.0)
-BuildRequires: java-devel
 BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(libxfconf-0)
 BuildRequires: pkgconfig(budgie-1.0)
@@ -83,13 +81,6 @@ Summary:    Gtk3MenuShell D-Bus exporter
 %description -n vala-panel-appmenu-gtk-module
 GTK (2, 3) module that exports GtkMenuShells over D-Bus.
 
-
-%package -n vala-panel-appmenu-jayatana-module
-Summary:    Vala appmenu support for Java Swing applications
-
-%description -n vala-panel-appmenu-jayatana-module
-Vala appmenu support for Java Swing applications.
-
 %prep
 %forgeautosetup
 
@@ -117,11 +108,6 @@ Vala appmenu support for Java Swing applications.
 %{_datadir}/dbus-1/services/com.canonical.AppMenu.Registrar.service
 %{_datadir}/glib-2.0/schemas/org.valapanel.appmenu.gschema.xml
 %{_datadir}/vala-panel/applets/org.valapanel.appmenu.plugin
-%{_datadir}/vala/vapi/appmenu-glib-translator.*
-%{_datadir}/gir-1.0/AppmenuGLibTranslator-*.gir
-%{_includedir}/appmenu-glib-translator/importer.h
-%{_libdir}/girepository-1.0/AppmenuGLibTranslator-*.typelib
-%{_libdir}/libappmenu-glib-translator.*
 
 %files -n vala-panel-appmenu-gtk-module
 %{_userunitdir}/appmenu-gtk-module.service
@@ -131,11 +117,6 @@ Vala appmenu support for Java Swing applications.
 %{_libdir}/gtk-3.0/modules/libappmenu-gtk-module.so
 %{_datadir}/glib-2.0/schemas/org.appmenu.gtk-module.gschema.xml
 
-%files -n vala-panel-appmenu-jayatana-module
-%{_datadir}/java/*.jar
-%dir %{_libdir}/jayatana
-%{_libdir}/jayatana/*.so
-
 %files -n xfce4-vala-panel-appmenu-plugin
 %{_libdir}/xfce4/panel/plugins/libappmenu-xfce.so
 %{_datadir}/xfce4/panel/plugins/appmenu.desktop

anda/apps/vala-panel/vala-panel.spec

@@ -1,12 +1,13 @@
-Name:    vala-panel
-Version: 24.05
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel
+%global commit ead4e7a36b0e4b0a2ac43c5d9ca17eb753461afe
+
 %forgemeta
 
-Release: 1%?dist
+Name:    vala-panel
+Version: 0.5.0
+Release: 2%?dist
 License: LGPL-3.0-or-later
 Summary: This package provides Application Menu plugin for vala-panel
-Group:   System/GUI/Other
 URL:     %{forgeurl}
 Source:  %{forgesource}
 
@@ -37,7 +38,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %forgeautosetup
 
 %build
-%meson -Dwnck=enabled -Dplatforms='wayland,x11'
+%meson -Dwnck=enabled -Dplatforms='layer-shell,x11'
 %meson_build
 
 %install
@@ -72,7 +73,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
 %{_datadir}/vala-panel/applets/*.plugin
 %dir %{_datadir}/vala-panel/images
 %{_datadir}/vala-panel/images/background.png
-%{_libdir}/girepository-1.0/ValaPanel-*.typelib
 
 %files devel
 %doc README.md
@@ -82,7 +82,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
 %{_libdir}/libvalapanel.so
 %{_libdir}/pkgconfig/vala-panel.pc
 %{_datadir}/vala/vapi/vala-panel.*
-%{_datadir}/gir-1.0/ValaPanel-*.gir
 
 %changelog
 %autochangelog

anda/apps/vencord-desktop/.gitignore

@@ -1 +0,0 @@
-*.tar.gz

anda/apps/vencord-desktop/anda.hcl

@@ -1,5 +0,0 @@
-project "pkg" {
-    rpm {
-        spec = "vencord-desktop.spec"
-    }
-}

anda/apps/vencord-desktop/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh_tag("Vencord/Vesktop"));

anda/apps/vencord-desktop/vencord-desktop.spec

@@ -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.3
-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
-
-

anda/apps/voicevox/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("VOICEVOX/voicevox"));

anda/apps/voicevox/voicevox.spec

@@ -1,54 +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:			voicevox
-Version:		0.19.2
-Release:		4%?dist
-Summary:		Free Japanese text-to-speech editor
-License:		LGPL-3.0
-URL:			https://voicevox.hiroshiba.jp
-Source0:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.001
-Source1:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.002
-Source2:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.003
-BuildRequires:  p7zip-plugins
-ExclusiveArch:  x86_64
-
-%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
-cat<<EOF > voicevox.sh
-#!/bin/sh
-/usr/share/voicevox/VOICEVOX.AppImage
-EOF
-7z x %SOURCE0
-chmod a+x VOICEVOX.AppImage
-
-./VOICEVOX.AppImage --appimage-extract '*.desktop'
-./VOICEVOX.AppImage --appimage-extract 'usr/share/icons/**'
-
-sed -i "s|Exec=.*|Exec=/usr/share/voicevox/VOICEVOX.AppImage|" squashfs-root/voicevox.desktop
-
-%build
-
-%install
-install -Dm755 VOICEVOX.AppImage %buildroot%_datadir/voicevox/VOICEVOX.AppImage
-install -Dm755 voicevox.sh %buildroot%_bindir/voicevox
-install -Dm644 squashfs-root%_iconsdir/hicolor/0x0/apps/voicevox.png %buildroot%_iconsdir/hicolor/256x256/apps/voicevox.png
-install -Dm644 squashfs-root/voicevox.desktop %buildroot%_datadir/applications/voicevox.desktop
-
-%files
-%_bindir/voicevox
-%_datadir/applications/voicevox.desktop
-%_datadir/voicevox/VOICEVOX.AppImage
-%_iconsdir/hicolor/256x256/apps/voicevox.png

anda/audio/voicevox/0001-feat-add-repository-entry-in-package.json.patch

@@ -0,0 +1,22 @@
+From 6b8c81d1d4ac0ac562b69e7f8164c8a92dafe13a Mon Sep 17 00:00:00 2001
+From: windowsboy111 <wboy111@outlook.com>
+Date: Mon, 19 Jun 2023 10:33:20 +0800
+Subject: [PATCH] feat: add repository entry in package.json
+
+---
+ package.json | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/package.json b/package.json
+index 622756a..b3d3dfa 100644
+--- a/package.json
++++ b/package.json
+@@ -1,4 +1,5 @@
+ {
++  "repository": "github:VOICEVOX/voicevox",
+   "name": "voicevox",
+   "version": "999.999.999",
+   "author": "Hiroshiba Kazuyuki",
+-- 
+2.40.1
+

anda/audio/voicevox/anda.hcl

@@ -1,5 +1,4 @@
 project pkg {
-	arches = ["x86_64"]
 	rpm {
 		spec = "voicevox.spec"
 	}

anda/audio/voicevox/update.rhai

@@ -0,0 +1,5 @@
+let v = gh("VOICEVOX/voicevox");
+rpm.global("ver", v);
+let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines;
+rpm.global("nodev", find(">=([\\d.]+)", engines.node, 1));
+rpm.global("npmv", find(">=([\\d.]+)", engines.npm, 1));

anda/audio/voicevox/voicevox.spec

@@ -0,0 +1,66 @@
+%global nodev 16.17.0
+%global npmv 8.11.0
+%global ver 0.14.10
+%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

anda/crystal/blahaj/blahaj.spec

@@ -1,7 +1,7 @@
 %define debug_package %nil
 
 Name:			blahaj
-Version:		2.2.0
+Version:		2.1.0
 Release:		1%{?dist}
 Summary:		Gay sharks at your local terminal - lolcat-like CLI tool
 License:		BSD-2-Clause

anda/crystal/crystal/crystal.spec

@@ -1,8 +1,8 @@
 %define debug_package %nil
 
 Name:			crystal
-Version:		1.13.1
+Version:		1.10.1
-Release:		1%?dist
+Release:		1%{?dist}
 Summary:		The Crystal Programming Language
 License:		Apache-2.0
 URL:			https://crystal-lang.org/

anda/crystal/crystal/update.rhai

@@ -0,0 +1,2 @@
+let html = get("https://crystal-lang.org/");
+rpm.version(find("Latest release <.+>(.+)</a>", html, 1))

anda/dart/dart.spec

@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name: dart
-Version: 3.4.4
+Version: 3.2.3
-Release: 1%?dist
+Release: 1%{?dist}
 Summary: The Dart Language
 License: BSD-3-Clause
 URL: https://dart.dev/

anda/desktops/budgie/budgie-extras/budgie-extras.spec

@@ -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
@@ -207,6 +208,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)
@@ -384,6 +393,9 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.takeabreak.gschema.xml
 %{_datadir}/pixmaps/takeabreak*.svg
 
+%files -n budgie-applet-trash
+%{_libdir}/budgie-desktop/plugins/budgie-trash
+
 %files -n budgie-applet-visualspace
 %config %{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
 %{_libdir}/budgie-desktop/plugins/budgie-visualspace

anda/desktops/compiz9/compiz9.spec

@@ -1,4 +1,4 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu12
+%define _ubuntu_rel 22.10.20220822-0ubuntu6
 %global _hardened_build 0
 
 Name:           compiz9

anda/desktops/elementary/appcenter/elementary-appcenter.spec

@@ -3,7 +3,7 @@
 Name:           elementary-appcenter
 Summary:        Software Center from elementary
 Version:        7.4.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0
 
 Provides:       appcenter = %{version}-%{release}
@@ -12,8 +12,6 @@ Obsoletes:      appcenter < 7.2.1-2
 URL:            https://github.com/elementary/appcenter
 Source0:        %url/archive/%{version}/appcenter-%{version}.tar.gz
 
-Patch0:         pr2099.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib

anda/desktops/elementary/appcenter/pr2099.patch

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

anda/desktops/elementary/elementary-calculator/elementary-calculator.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-calculator
 Summary:        Calculator app designed for elementary
-Version:        8.0.0
+Version:        2.0.3
-Release:        1%?dist
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/%{srcname}

anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-capnet-assist
 Summary:        Captive Portal Assistant for elementary
-Version:        8.0.0
+Version:        2.4.4
-Release:        1%?dist
+Release:        2%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/capnet-assist
@@ -21,13 +21,10 @@ BuildRequires:  pkgconfig(gcr-ui-3)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1) >= 1.0.0
 BuildRequires:  pkgconfig(webkit2gtk-4.1)
-BuildRequires:  pkgconfig(gcr-4)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(webkitgtk-6.0)
 BuildRequires:  fdupes
 
 Requires:       NetworkManager

anda/desktops/elementary/elementary-files/elementary-files.spec

@@ -5,7 +5,7 @@
 
 Name:           elementary-files
 Summary:        File manager from elementary
-Version:        6.5.3
+Version:        6.5.2
 Release:        1%{?dist}
 License:        GPL-3.0
 

anda/desktops/elementary/elementary-greeter/elementary-greeter.spec

@@ -11,8 +11,6 @@ URL:            https://github.com/elementary/greeter
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source1:        40-%{appname}.conf
 
-Patch0:         https://github.com/elementary/greeter/compare/7.0.0..42320c266395606b0c20782603e7407124c3f7a4.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -36,9 +34,9 @@ BuildRequires:  pkgconfig(granite) >= 5.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(liblightdm-gobject-1)
-BuildRequires:  pkgconfig(mutter-clutter-14)
+BuildRequires:  pkgconfig(mutter-clutter-12)
-BuildRequires:  pkgconfig(mutter-cogl-14)
+BuildRequires:  pkgconfig(mutter-cogl-12)
-BuildRequires:  pkgconfig(mutter-cogl-pango-14)
+BuildRequires:  pkgconfig(mutter-cogl-pango-12)
 BuildRequires:  pkgconfig(x11)
 
 Provides:       pantheon-greeter = %{version}-%{release}
@@ -70,7 +68,7 @@ The elementary Greeter is a styled Login Screen for LightDM.
 
 
 %prep
-%autosetup -p1 -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version}
 
 
 %build

anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-icon-theme
 Summary:        Icons from the Elementary Project
-Version:        8.0.0
+Version:        7.3.1
-Release:        1%?dist
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/icons
@@ -89,7 +89,9 @@ gtk-update-icon-cache --force %{_datadir}/icons/elementary &>/dev/null || :
 %dir %{_datadir}/icons/elementary
 %ghost %{_datadir}/icons/elementary/icon-theme.cache
 
-%{_datadir}/icons/elementary/*
+%{_datadir}/icons/elementary/*/
+%{_datadir}/icons/elementary/*@2x
+%{_datadir}/icons/elementary/*@3x
 
 %{_datadir}/icons/elementary/cursor.theme
 %{_datadir}/icons/elementary/index.theme

anda/desktops/elementary/elementary-onboarding/elementary-onboarding.spec

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

anda/desktops/elementary/elementary-photos/elementary-photos.spec

@@ -5,8 +5,8 @@
 
 Name:           elementary-photos
 Summary:        Photo manager and viewer from elementary
-Version:        8.0.0
+Version:        2.8.0
-Release:        1%?dist
+Release:        2%?dist
 License:        LGPL-2.0-or-later
 
 URL:            https://github.com/elementary/photos
@@ -18,11 +18,9 @@ BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
 BuildRequires:  fdupes
-BuildRequires:  git-core
-BuildRequires:  cmake
 
 BuildRequires:  pkgconfig(gee-0.8) >= 0.8.5
-BuildRequires:  pkgconfig(geocode-glib-2.0)
+BuildRequires:  pkgconfig(geocode-glib-1.0)
 BuildRequires:  pkgconfig(gexiv2) >= 0.4.90
 BuildRequires:  pkgconfig(gio-2.0) >= 2.20
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.20
@@ -35,14 +33,17 @@ BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0) >= 1.0.0
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0) >= 1.0.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.6.0
 BuildRequires:  pkgconfig(gudev-1.0) >= 145
+BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(libexif) >= 0.6.16
 BuildRequires:  pkgconfig(libgphoto2) >= 2.4.2
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libraw) >= 0.13.2
+BuildRequires:  pkgconfig(libsoup-2.4) >= 2.26.0
 BuildRequires:  pkgconfig(libwebp) >= 0.4.4
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.6.32
+BuildRequires:  pkgconfig(rest-0.7) >= 0.7
 BuildRequires:  pkgconfig(sqlite3) >= 3.5.9
-BuildRequires:  pkgconfig(libportal)
+BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.0.0
-BuildRequires:  pkgconfig(libportal-gtk3)
 
 Requires:       hicolor-icon-theme
 
@@ -52,7 +53,7 @@ Foundation.
 
 
 %prep
-%autosetup -n %{srcname}-%{version} -N
+%autosetup -n %{srcname}-%{version} -p1
 
 
 %build
@@ -74,10 +75,10 @@ desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{appname}.viewer.desktop
+    %{buildroot}/%{_datadir}/applications/%{appname}-viewer.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %files -f %{appname}.lang
@@ -91,11 +92,12 @@ appstream-util validate-relax --nonet \
 %{_libexecdir}/%{appname}/
 
 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/applications/%{appname}.viewer.desktop
+%{_datadir}/applications/%{appname}-viewer.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
+%{_datadir}/glib-2.0/schemas/%{appname}-extras.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/icons/hicolor/*/apps/%{appname}.viewer.svg
+%{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %changelog

anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-shortcut-overlay
 Summary:        Native, OS-wide shortcut overlay
-Version:        8.0.0
+Version:        2.0.1
-Release:        1%?dist
+Release:        %autorelease
 License:        GPL-3.0
 
 URL:            https://github.com/elementary/shortcut-overlay
@@ -49,7 +49,7 @@ desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %files -f %{appname}.lang
@@ -59,7 +59,7 @@ appstream-util validate-relax --nonet \
 %{_bindir}/%{appname}
 
 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %changelog

anda/desktops/elementary/elementary-sideload/elementary-sideload.spec

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

anda/desktops/elementary/elementary-terminal/elementary-terminal.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-terminal
 Summary:        The terminal of the 21st century
-Version:        6.2.0
+Version:        6.1.2
-Release:        1%?dist
+Release:        2%{?dist}
 License:        LGPL-3.0
 
 URL:            https://github.com/elementary/%{srcname}
@@ -90,9 +90,16 @@ appstream-util validate-relax --nonet \
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/%{appname}/
 %{_datadir}/metainfo/%{appname}.appdata.xml
-%{_mandir}/man1/%{appname}.1.gz
 
 %files fish
 %doc README.md
 %license COPYING
 %{_datadir}/fish/vendor_conf.d/pantheon_terminal_process_completion_notifications.fish
+
+
+%changelog
+* Thu Nov 17 2022 windowsboy111 <wboy111@outlook.com> - 6.1.1-1
+- new version
+
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+- Repackaged for Terra

anda/desktops/elementary/elementary-theme/elementary-theme.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-theme
 Summary:        Elementary GTK+ Stylesheet
-Version:        8.0.0
+Version:        7.3.0
-Release:        1%?dist
+Release:        1%{?dist}
 License:        GPL-3.0
 
 URL:            https://github.com/elementary/stylesheet

anda/desktops/elementary/gala/gala.spec

@@ -3,16 +3,14 @@
 Name:           gala
 Summary:        Gala window manager
 Version:        7.1.3
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
-Epoch:          1
 
 URL:            https://github.com/elementary/gala
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 # patch some default settings to better match Fedora
 Patch0:         0000-Modify-default-settings-for-Fedora.patch
-Patch:          https://github.com/elementary/gala/compare/7.1.3..43d1e6a01b56a84a4e752e1970a35c19402941eb.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -33,13 +31,11 @@ BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libbamf3)
 BuildRequires:  pkgconfig(libcanberra)
-BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(mutter-clutter-12)
-BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(mutter-cogl-12)
-BuildRequires:  pkgconfig(mutter-clutter-14)
+BuildRequires:  pkgconfig(mutter-cogl-pango-12)
-BuildRequires:  pkgconfig(mutter-cogl-14)
-BuildRequires:  pkgconfig(mutter-cogl-pango-14)
 
-Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 # gala provides a generic icon (apps/multitasking-view)
 Requires:       hicolor-icon-theme
@@ -65,7 +61,7 @@ This package contains the shared libraries.
 
 %package        devel
 Summary:        Gala window manager development files
-Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description    devel
 Gala is Pantheon's Window Manager, part of the elementary project.
@@ -89,8 +85,8 @@ This package contains the development headers.
 
 
 %check
-%dnl desktop-file-validate \
+desktop-file-validate \
-%dnl    %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop
+    %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop
 
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/gala*.desktop
@@ -102,7 +98,7 @@ desktop-file-validate \
 %files -f gala.lang
 %doc README.md
 %license COPYING
-%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
+%config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
 
 %{_bindir}/gala
 %{_bindir}/gala-daemon