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>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Report an issue with a package (or Terra itsself)
+about: Report an issue with a package (or Terra itself)
 title: '[BUG] '
 labels: bug
 assignees: ''

.github/workflows/autobuild.yml

@@ -6,10 +6,13 @@ on:
     paths:
       - anda/**
     branches:
-      - main
+      - f37
   pull_request:
     branches:
-      - main
+      - f37
+  merge_group:
+    branches:
+      - f37
   workflow_dispatch:
   workflow_call:
 
@@ -20,7 +23,7 @@ jobs:
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f37
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Set workspace as safe
@@ -31,8 +34,7 @@ jobs:
           fetch-depth: 0
       - name: Generate build matrix
         id: generate_build_matrix
-        run: |
+        run: anda ci >> $GITHUB_OUTPUT
-          anda ci >> $GITHUB_OUTPUT
   build:
     needs: manifest
     strategy:
@@ -42,23 +44,32 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f37
       options: --cap-add=SYS_ADMIN --privileged
     steps:
-      - uses: terrapkg/anda-build@main
+      - name: Checkout
-        if: github.event_name == 'pull_request'
+        uses: actions/checkout@v3
         with:
-          name: "${{ matrix.pkg.pkg }}"
+          fetch-depth: 0
-          mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
+      - name: Set up git repository
-          andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
-      - uses: terrapkg/anda-build@main
+      - name: Cache buildroot
-        if: github.event_name != 'pull_request'
+        id: br-cache
+        uses: actions/cache@v3
         with:
-          name: "${{ matrix.pkg.pkg }}"
+          path: /var/cache
-          mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
+          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
-          extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
+          restore-keys: |
-          andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
+            ${{ 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: cp -v anda/mock-configs/anda.tpl /etc/mock/templates/anda.tpl
+
+      - name: Build with Andaman
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
 
       - name: Generating artifact name
         id: art
@@ -73,13 +84,16 @@ jobs:
           path: anda-build/rpm/rpms/*
 
       - name: Upload packages to subatomic
-        if: github.event_name != 'pull_request'
+        if: github.event_name == 'push'
         run: |
           subatomic-cli upload --prune \
             --server https://subatomic.fyralabs.com \
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
             terra${{ matrix.version }} anda-build/rpm/rpms/*
 
-      - name: Notify Madoguchi
+      - name: Notify Madoguchi (Success)
-        if: always()
+        if: success() && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh ${{success()}} ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+        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/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build Packages
+name: Manual Builds
 on:
   workflow_dispatch:
     inputs:
@@ -15,6 +15,7 @@ jobs:
       - name: Parse Input
         id: parsing
         run: echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
+
   build:
     needs: parse
     strategy:
@@ -25,15 +26,30 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f37
       options: --cap-add=SYS_ADMIN --privileged
     steps:
-      - uses: terrapkg/anda-build@main
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
-          name: "${{ matrix.pkg }}pkg"
+          fetch-depth: 0
-          mockConfig: anda-37-${{ matrix.arch }}
+      - name: Set up git repository
-          extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
+
+      - name: Build with Anda
+        run: anda build ${{ matrix.pkg }}pkg --package rpm -c anda-${{ matrix.version }}-${{ matrix.arch }}
+
+      - name: Generating artifact name
+        id: art
+        run: |
+          NAME=${{ matrix.pkg }}-${{ matrix.arch }}-${{ matrix.version }}
+          x=${NAME//\//@}
+          echo "name=$x" >> $GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.art.outputs.name }}
+          path: anda-build/rpm/rpms/*
 
       - name: Upload packages to subatomic
         run: |
@@ -42,6 +58,9 @@ jobs:
             --token ${{ secrets.SUBATOMIC_TOKEN }} \
             terra${{ matrix.version }} anda-build/rpm/rpms/*
 
-      - name: Notify Madoguchi
+      - name: Notify Madoguchi (Success)
-        if: always()
+        if: success()
-        run: ./.github/workflows/mg.sh ${{success()}} ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+        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/workflows/json-build.yml

@@ -0,0 +1,55 @@
+name: JSON Build
+on:
+  workflow_dispatch:
+    inputs:
+      packages:
+        description: "Packages to Build"
+        required: true
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        pkg: ${{ fromJson(inputs.packages) }}
+        version: ["37"]
+      fail-fast: false
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    container:
+      image: ghcr.io/terrapkg/builder:f37
+      options: --cap-add=SYS_ADMIN --privileged
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set up git repository
+        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+      - name: Build with Anda
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
+
+      - name: Generating artifact name
+        id: art
+        run: |
+          NAME=${{ matrix.pkg.pkg }}-${{ matrix.pkg.arch }}-${{ matrix.version }}
+          x=${NAME//\//@}
+          echo "name=$x" >> $GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.art.outputs.name }}
+          path: anda-build/rpm/rpms/*
+
+      - name: Upload packages to subatomic
+        run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }} anda-build/rpm/rpms/*
+
+      - name: Notify Madoguchi (Success)
+        if: success()
+        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/workflows/lint.yml

@@ -6,7 +6,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

.github/workflows/mg.sh

@@ -1,12 +1,21 @@
-if $1; then
+set -x
-	dirs=${$2/\/pkg/}
+
-	export p="{\"id\":\"$5\",\"verl\":\"%v\",\"arch\":\"$4\",\"dirs\":\"$dirs\"}"
+dirs=$2
-else
+dirs=${dirs/\/pkg/}
-	export p="{\"id\":\"$5\",\"verl\":\"%v\",\"arch\":\"$4\"}"
+export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\",\"succ\":$1}"
+
+if [[ $1 == false ]]; then
+	d=${p/\%v/?}
+	d=${d/\%r/?}
+	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/f -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
+	exit 0
 fi
+
 for f in anda-build/rpm/rpms/*; do
 	n=$(lesspipe.sh $f | grep -E "Name\s*: " | sed "s@Name\s*: @@")
-	v=$(echo ${f/${n}-/} | sed -E "s@\.fc$3.+@@")
+	v=$(lesspipe.sh $f | grep -E "Version\s*: " | sed "s@Version\s*: @@")
-	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d ${p/%v/$v} --fail-with-body &
+	r=$(lesspipe.sh $f | grep -E "Release\s*: " | sed "s@Release\s*: @@")
+	d=${p/\%v/$v}
+	d=${d/\%r/$r}
+	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
 done
-wait

.github/workflows/sync.yml.bak

@@ -4,10 +4,14 @@ on:
     types:
       - closed
     branches:
-      - main
+      - 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:
@@ -16,23 +20,19 @@ jobs:
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
-      - name: Install SSH 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
-      - name: Setup Git
-        run: |
           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: Download patches
+      - name: Apply patches and Push
-        run: curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch
-      - name: Apply patches
         run: |
-          git checkout f38
+          curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch
           git am -S --keep-cr --signoff < pr.patch
-      - name: Push
+          git push -u origin --all
-        run: git push -u origin --all

.github/workflows/update-comps.yml

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

.github/workflows/update-nightly.yml

@@ -1,4 +1,4 @@
-name: Automatic Nightly Update
+name: Nightly Update
 on:
   schedule:
     - cron: "0 0 * * *"
@@ -8,7 +8,7 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
@@ -38,5 +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"
+            f37 () {
+              git format-patch HEAD^
+              git checkout f37
+              git apply *.patch || true
+              git add *
+              git commit -S -a -m "$msg"
+            }
+            f37 || true
             git push -u origin --all
           fi

.github/workflows/update.yml

@@ -1,4 +1,4 @@
-name: Automatically check for updates
+name: Update
 on:
   schedule:
     - cron: "*/30 * * * *"
@@ -8,7 +8,7 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:main
+      image: ghcr.io/terrapkg/builder:f38
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
@@ -39,5 +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"
+            # git format-patch HEAD^
+            # git checkout f37
+            # git apply *.patch || true
+            # git add *
+            # git commit -S -a -m "$msg"
             git push -u origin --all
           fi

.gitignore

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

README.md

@@ -1,6 +1,7 @@
 # Terra Sources
 
-[![Repository status](https://repology.org/badge/repository-big/terra_37.svg)](https://repology.org/repository/terra_37)
+[![Repository status](https://repology.org/badge/repository-big/terra_37.svg?header=Terra+37)](https://repology.org/repository/terra_37)
+[![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38)
 
 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.
@@ -16,6 +17,8 @@ sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/r
 ## Documentation
 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!
 

anda.hcl

@@ -1,6 +1,6 @@
 config {
-    strip_prefix = "anda/"
+	strip_prefix = "anda/"
-    strip_suffix = "/pkg"
+	strip_suffix = "/pkg"
 }
 
-project {}
+project {}

anda/apps/anki-bin/anda.hcl

@@ -1,5 +1,6 @@
 project pkg {
-    rpm {
+	arches = ["x86_64"]
-        spec = "anki-bin.spec"
+	rpm {
-    }
+		spec = "anki-bin.spec"
+	}
 }

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

@@ -1,14 +1,14 @@
 Name:			anki-bin
-Version:		2.1.61
+Version:		23.12.1
 Release:		1%{?dist}
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:			https://apps.ankiweb.net/
-BuildRequires:	python3-installer python3.11
+BuildRequires:	python3-installer python3.11 rpm_macro(fdupes)
 Requires:		hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
 Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
-Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress
+Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine
-BuildArch:		noarch
+ExclusiveArch:	x86_64
 Conflicts:		anki
 Source0:		https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
 Source1:		https://files.pythonhosted.org/packages/py3/a/aqt/aqt-%{version}-py3-none-any.whl
@@ -19,9 +19,9 @@ Source5:		https://raw.githubusercontent.com/ankitects/anki/%{version}/LICENSE
 Source6:		https://raw.githubusercontent.com/ankitects/anki/%{version}/README.md
 
 %description
-Anki is a program designed to help you remember facts (such as words
+Anki is a program designed to help you remember facts (such as words and
-and phrases in a foreign language) as easily, quickly and efficiently
+phrases in a foreign language) as easily, quickly and efficiently as possible.
-as possible. Anki is based on a theory called spaced repetition.
+Anki is based on a theory called spaced repetition.
 
 %prep
 
@@ -36,6 +36,8 @@ 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"
 
+%fdupes %_libdir/python*/site-packages/_aqt/data/
+
 
 %files
 %license LICENSE
@@ -50,5 +52,5 @@ install -Dm644 %{SOURCE6} "%{buildroot}/%{_datadir}/doc/%{name}/README.md"
 /usr/share/pixmaps/anki.png
 
 %changelog
-* Wed Jan 11 2023 windowsboy111 <windowsboy111@fyralabs.com>
+* Wed Jan 11 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.1.60
 - Initial package

anda/apps/anki-qt5/0001-Force-qt5.patch

@@ -1,20 +1,20 @@
-diff -uNr anki-2.1.55.old/qt/aqt/qt/__init__.py anki-2.1.55/qt/aqt/qt/__init__.py
+--- a/qt/aqt/qt/__init__.py
---- anki-2.1.55.old/qt/aqt/qt/__init__.py	2023-01-02 18:34:13.716216913 +0800
++++ b/qt/aqt/qt/__init__.py
-+++ anki-2.1.55/qt/aqt/qt/__init__.py	2023-01-02 18:34:00.410033708 +0800
+@@ -9,16 +9,7 @@ import sys
-@@ -9,16 +9,7 @@
  import traceback
  from typing import Callable, TypeVar, Union
- 
+
 -try:
 -    import PyQt6
 -except:
 -    from .qt5 import *  # type: ignore
 -else:
--    if not os.getenv("DISABLE_QT5_COMPAT"):
+-    if os.getenv("ENABLE_QT5_COMPAT"):
 -        print("Running with temporary Qt5 compatibility shims.")
--        print("Run with DISABLE_QT5_COMPAT=1 to confirm compatibility with Qt6.")
 -        from . import qt5_compat  # needs to be imported first
 -    from .qt6 import *
+-
 +from .qt5 import *  # type: ignore
- 
  from anki.utils import is_mac, is_win
+
+ # fix buggy ubuntu12.04 display of language selector

anda/apps/anki-qt5/0001-No-update.patch

@@ -1,17 +1,13 @@
-diff -uNr anki-2.1.55.old/qt/aqt/profiles.py anki-2.1.55/qt/aqt/profiles.py
+diff --git a/qt/aqt/update.py b/qt/aqt/update.py
---- anki-2.1.55.old/qt/aqt/profiles.py	2023-01-02 18:35:44.574467892 +0800
+index 212ddf93d..6f716cc04 100644
-+++ anki-2.1.55/qt/aqt/profiles.py	2023-01-02 18:34:00.412033736 +0800
+--- a/qt/aqt/update.py
-@@ -77,11 +77,11 @@
++++ b/qt/aqt/update.py
+@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
  
- metaConf = dict(
+ 
-     ver=0,
+ def check_for_update() -> None:
--    updates=True,
++    return
-+    updates=False,
++
-     created=int_time(),
+     from aqt import mw
-     id=random.randrange(0, 2**63),
+ 
-     lastMsg=-1,
+     def do_check(_col: Collection) -> CheckForUpdateResponse:
--    suppressUpdate=False,
-+    suppressUpdate=True,
-     firstRun=True,
-     defaultLang=None,
- )

anda/apps/anki-qt5/anda.hcl

@@ -1,5 +1,6 @@
 project pkg {
-    rpm {
+	arches = ["x86_64"]
-        spec = "anki-qt5.spec"
+	rpm {
-    }
+		spec = "anki-qt5.spec"
+	}
 }

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

@@ -1,28 +1,27 @@
 Name:           anki-qt5
-Version:        2.1.61
+Version:        23.12.1
 Release:        1%{?dist}
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
-BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks 
+BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson python3-pyqt5-sip
 BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
 Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
-Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
+Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt5-sip
-BuildArch:      noarch
+ExclusiveArch:  x86_64
 Conflicts:      anki
 Patch0:         0001-No-update.patch
 Patch1:         0001-Force-qt5.patch
 
 %description
-Anki is a program designed to help you remember facts (such as words
+Anki is a program designed to help you remember facts (such as words and
-and phrases in a foreign language) as easily, quickly and efficiently
+phrases in a foreign language) as easily, quickly and efficiently as possible.
-as possible. Anki is based on a theory called spaced repetition.
+Anki is based on a theory called spaced repetition.
 
 %prep
 git clone https://github.com/ankitects/anki .
-git checkout %{version}
+git checkout %version
-%patch0 -p1
 %patch1 -p1
 
 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
@@ -46,6 +45,8 @@ chmod 755 %{buildroot}%{_bindir}/anki
 find %{buildroot} -iname __pycache__ | xargs -r rm -rf
 find %{buildroot} -iname direct_url.json | xargs -r rm -rf
 
+%fdupes %_libdir/python*/site-packages/_aqt/data/
+
 
 %files
 %license LICENSE*
@@ -60,5 +61,5 @@ find %{buildroot} -iname direct_url.json | xargs -r rm -rf
 /usr/lib64/python*/site-packages/anki-%{version}.dist-info/
 
 %changelog
-* Tue Jan 3 2023 windowsboy111 <windowsboy111@fyralabs.com>
+* Tue Jan 3 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.1.60
 - Initial package

anda/apps/anki/0001-No-update.patch

@@ -1,17 +1,13 @@
-diff -uNr anki-2.1.55.old/qt/aqt/profiles.py anki-2.1.55/qt/aqt/profiles.py
+diff --git a/qt/aqt/update.py b/qt/aqt/update.py
---- anki-2.1.55.old/qt/aqt/profiles.py	2023-01-02 18:35:44.574467892 +0800
+index 212ddf93d..6f716cc04 100644
-+++ anki-2.1.55/qt/aqt/profiles.py	2023-01-02 18:34:00.412033736 +0800
+--- a/qt/aqt/update.py
-@@ -77,11 +77,11 @@
++++ b/qt/aqt/update.py
+@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
  
- metaConf = dict(
+ 
-     ver=0,
+ def check_for_update() -> None:
--    updates=True,
++    return
-+    updates=False,
++
-     created=int_time(),
+     from aqt import mw
-     id=random.randrange(0, 2**63),
+ 
-     lastMsg=-1,
+     def do_check(_col: Collection) -> CheckForUpdateResponse:
--    suppressUpdate=False,
-+    suppressUpdate=True,
-     firstRun=True,
-     defaultLang=None,
- )

anda/apps/anki/anda.hcl

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

anda/apps/anki/anki.spec

@@ -1,32 +1,33 @@
 Name:           anki
-Version:        2.1.61
+Version:        23.12.1
 Release:        1%{?dist}
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
-BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks 
+BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson
-BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
+BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-webengine
 Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
-Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
+Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt6-webengine
+Recommends:     mpv
 Obsoletes:      anki <= 2.1.15
-BuildArch:      noarch
 Conflicts:      anki-qt5
 Patch0:         0001-No-update.patch
 
 %description
-Anki is a program designed to help you remember facts (such as words
+Anki is a program designed to help you remember facts (such as words and
-and phrases in a foreign language) as easily, quickly and efficiently
+phrases in a foreign language) as easily, quickly and efficiently as possible.
-as possible. Anki is based on a theory called spaced repetition.
+Anki is based on a theory called spaced repetition.
 
 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %{version}
-%patch0 -p1
 
 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki
 
 %build
+export RELEASE=1
+export PYTHONPATH=%_libdir/python3/dist-packages
 mold -run ./tools/build
 
 
@@ -47,6 +48,8 @@ find %{buildroot} -iname direct_url.json | xargs -r rm -rf
 
 chmod 755 %{buildroot}%{_bindir}/anki
 
+%fdupes %_libdir/python*/site-packages/_aqt/data/
+
 
 %files
 %license LICENSE*
@@ -54,11 +57,11 @@ chmod 755 %{buildroot}%{_bindir}/anki
 %{_bindir}/anki
 %{_datadir}/applications/anki.desktop
 %{_datadir}/pixmaps/anki.png
-/usr/lib64/python*/site-packages/aqt/
+%_libdir/python*/site-packages/aqt/
-/usr/lib64/python*/site-packages/aqt-%{version}.dist-info/
+%_libdir/python*/site-packages/aqt-%{version}.dist-info/
-/usr/lib64/python*/site-packages/_aqt/
+%_libdir/python*/site-packages/_aqt/
-/usr/lib64/python*/site-packages/anki/
+%_libdir/python*/site-packages/anki/
-/usr/lib64/python*/site-packages/anki-%{version}.dist-info/
+%_libdir/python*/site-packages/anki-%{version}.dist-info/
 
 
 %changelog

anda/apps/armcord-bin/anda.hcl

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

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

@@ -0,0 +1,77 @@
+%define debug_package %nil
+%global _build_id_links none
+
+%ifarch x86_64
+%global src ArmCord-%version
+%elifarch aarch64
+%global src ArmCord-%version-arm64
+%elifarch armv7l
+%global src ArmCord-%version-armv7l
+%endif
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/armcord/.*\\.so
+
+Name:			armcord-bin
+Version:		3.2.6
+Release:		1%{?dist}
+License:		OSL-3.0
+Summary:		Custom lightweight Discord client designed to enhance your experience
+URL:			https://github.com/ArmCord/ArmCord
+Group:			Applications/Internet
+Source0:		%url/releases/download/v%version/%src.tar.gz
+Source1:		armcord.png
+Source2:		https://raw.githubusercontent.com/ArmCord/ArmCord/v%version/README.md
+Requires:		electron xdg-utils
+ExclusiveArch:	x86_64 aarch64 armv7l
+Conflicts:		armcord
+
+%description
+ArmCord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+%autosetup -n %src
+
+cat <<EOF > .armcord.desktop
+[Desktop Entry]
+Name=ArmCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=%_bindir/armcord
+Icon=armcord
+Categories=Network;InstantMessaging;
+StartupWMClass=armcord
+Keywords=discord;armcord;vencord;shelter;electron;
+EOF
+
+%build
+
+%install
+mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/armcord %buildroot%_docdir/%name
+cp -a * %buildroot%_datadir/armcord/
+ln -s %_datadir/armcord/armcord %buildroot%_bindir/armcord
+chmod +x -R %buildroot%_datadir/armcord/*
+chmod 755 %buildroot%_datadir/armcord/armcord
+install -Dm644 .armcord.desktop %buildroot%_datadir/applications/ArmCord.desktop
+install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/armcord.png
+install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
+
+%files
+%doc README.md
+%_datadir/armcord
+%_bindir/armcord
+%_datadir/applications/ArmCord.desktop
+%_datadir/pixmaps/armcord.png
+
+%changelog
+* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
+- Remove libnotify dependency.
+- Fix desktop entry.
+- Set as noarch package because there are not binary files.
+- Use /usr/share/ instead of /opt/
+
+* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
+- Initial package

anda/apps/armcord-bin/update.rhai

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

anda/apps/armcord/anda.hcl

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

anda/apps/armcord/armcord.spec

@@ -0,0 +1,66 @@
+%define debug_package %nil
+
+Name:		armcord
+Version:	3.2.6
+Release:	1%{?dist}
+License:	OSL-3.0
+Summary:	Custom lightweight Discord client designed to enhance your experience
+URL:		https://github.com/ArmCord/ArmCord
+Group:		Applications/Internet
+Source1:	launch.sh
+Requires:	electron xdg-utils
+BuildRequires:	nodejs-npm git
+Conflicts:	armcord-bin
+BuildArch:	noarch
+
+%description
+ArmCord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+git clone %url .
+git checkout v%version
+
+cat <<EOF > armcord.desktop
+[Desktop Entry]
+Name=ArmCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=/usr/bin/armcord
+Icon=armcord
+Categories=Network;InstantMessaging;
+StartupWMClass=armcord
+Keywords=discord;armcord;vencord;shelter;electron;
+EOF
+
+
+%build
+npx pnpm@7 install --no-frozen-lockfile
+npm run packageQuick
+
+
+%install
+install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/armcord/app.asar
+
+install -Dm755 %SOURCE1 %buildroot/usr/bin/armcord
+install -Dm644 armcord.desktop %buildroot/usr/share/applications/ArmCord.desktop
+install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png
+
+%files
+%doc README.md
+%license LICENSE
+/usr/bin/armcord
+/usr/share/applications/ArmCord.desktop
+/usr/share/pixmaps/armcord.png
+/usr/share/armcord/app.asar
+
+%changelog
+* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
+- Remove libnotify dependency.
+- Fix desktop entry.
+- Set as noarch package because there are not binary files.
+
+* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
+- Initial package
+

anda/apps/armcord/launch.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+electron=/usr/bin/electron
+
+CONFIG=${XDG_CONFIG_HOME:-~/.config}
+FLAGS="$CONFIG/armcord-flags.conf"
+
+# Allow users to override command-line options
+if [ -f "$FLAGS" ]; then
+  USER_FLAGS="$(cat "$FLAGS")"
+fi
+
+# shellcheck disable=SC2086 # USER_FLAGS has to be unquoted
+"$electron" /usr/share/armcord/app.asar $USER_FLAGS "$@"

anda/apps/armcord/update.rhai

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

anda/apps/authy/anda.hcl

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

anda/apps/authy/authy.spec

@@ -1,13 +1,20 @@
+%define debug_package %nil
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
+
 Name: authy
-Version: 2.2.3
+Version: 2.5.0
 Release: 1%{?dist}
 Summary: Two factor authentication desktop application
 License: Unlicense
 URL: https://authy.com/
-Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_18.snap
+Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_23.snap
 Requires: gtk3
 Requires: nss
-BuildRequires: squashfs-tools
+BuildRequires: squashfs-tools desktop-file-utils
 
 %description
 %{summary}.
@@ -18,24 +25,30 @@ unsquashfs -q -f -d snap %{SOURCE0}
 %build
 
 %install
-install -d "%{buildroot}/opt/authy"
+install -d %buildroot%_datadir/authy
-cp -r "snap/." "%{buildroot}/opt/authy"
+cp -r snap/. %buildroot%_datadir/authy
 
-sed -i 's|${SNAP}/meta/gui/icon.png|authy|g' "%{buildroot}/opt/authy/meta/gui/authy.desktop"
+sed -i 's|${SNAP}/meta/gui/icon.png|authy|g' %buildroot%_datadir/authy/meta/gui/authy.desktop
-install -Dm644 "%{buildroot}/opt/authy/meta/gui/authy.desktop" -t "%{buildroot}/usr/share/applications"
+install -Dm644 %buildroot%_datadir/authy/meta/gui/authy.desktop -t %buildroot%_datadir/applications
-install -Dm644 "%{buildroot}/opt/authy/meta/gui/icon.png" "%{buildroot}/usr/share/pixmaps/authy.png"
+install -Dm644 %buildroot%_datadir/authy/meta/gui/icon.png %buildroot%_datadir/pixmaps/authy.png
 
-rm -rf "%{buildroot}/opt/authy"/{data-dir,gnome-platform,lib,meta,scripts,usr,*.sh}
+rm -rf %buildroot%_datadir/authy/{data-dir,gnome-platform,lib,meta,scripts,usr,*.sh}
 
-install -d "%{buildroot}/usr/bin"
+install -d %buildroot%_bindir
-ln -s "/opt/authy/authy" "%{buildroot}/usr/bin"
+ln -s %_datadir/authy/authy %buildroot%_bindir
+
+%check
+desktop-file-validate %buildroot%_datadir/applications/authy.desktop
 
 %files
-/opt/authy/
+%_datadir/authy/
-/usr/bin/authy
+%_bindir/authy
-/usr/share/applications/authy.desktop
+%_datadir/applications/authy.desktop
-/usr/share/pixmaps/authy.png
+%_datadir/pixmaps/authy.png
 
 %changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.3.0-2
+- Use /usr/share/ instead of /opt/
+
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 2.2.1-2
 - Initial release

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

@@ -1,5 +1,6 @@
 project pkg {
-    rpm {
+	arches = ["x86_64"]
-        spec = "discord-canary-openasar.spec"
+	rpm {
-    }
+		spec = "discord-canary-openasar.spec"
+	}
 }

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

@@ -1,19 +1,29 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-canary-openasar
-Version:        0.0.150
+Version:        0.0.209
 Release:        1%{?dist}
-Summary:        OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
+Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
 Source0:        https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
 Source1:        %{url}/releases/download/nightly/app.asar
 Group:          Applications/Internet
-Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires:       glibc GConf2
+Requires:       nspr >= 4.13
+Requires:       nss >= 3.27
+Requires:       libX11 >= 1.6
+Requires:       libXtst >= 1.2
 ExclusiveArch:  x86_64
 
 %description
-%{summary}.
+OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and
+include more features like further customization and theming.
 
 %prep
 %autosetup -n DiscordCanary
@@ -28,8 +38,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-canary-openasar
 cp -rv * %{buildroot}%{_datadir}/discord-canary-openasar
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary-openasar.desktop
+ln -s %_datadir/discord-canary-openasar/discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary-openasar.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary-openasar.png
+ln -s %_datadir/discord-canary-openasar/discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary-openasar.png
 cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-canary-openasar/resources/app.asar
 chmod o+w %{buildroot}%{_datadir}/discord-canary-openasar/resources -R
 
@@ -47,4 +57,4 @@ chmod o+w %{buildroot}%{_datadir}/discord-canary-openasar/resources -R
 - Bundle discord-canary
 
 * Thu Oct 20 2022 Cappy Ishihara <cappy@cappuchino.xyz>
-- 
+-

anda/apps/discord-canary/anda.hcl

@@ -1,5 +1,6 @@
 project pkg {
-    rpm {
+	arches = ["x86_64"]
-        spec = "discord-canary.spec"
+	rpm {
-    }
+		spec = "discord-canary.spec"
+	}
 }

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

@@ -1,32 +1,38 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-canary
-Version:        0.0.150
+Version:        0.0.209
 Release:        1%{?dist}
-Summary:        Free Voice and Text Chat for Gamers.
+Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
 Source0:        https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
 License:        https://discord.com/terms
-Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires:       glibc GConf2 nspr >= 4.13 nss >= 3.27 libX11 >= 1.6 libXtst >= 1.2
 Group:          Applications/Internet
 ExclusiveArch:  x86_64
 %description
-Imagine a place where you can belong to a school club, a gaming group, or a worldwide art community. Where just you and a handful of friends can spend time together. A place that makes it easy to talk every day and hang out more often.
+Imagine a place where you can belong to a school club, a gaming group, or a
+worldwide art community. Where just you and a handful of friends can spend time
+together. A place that makes it easy to talk every day and hang out more often.
 
 %prep
 %autosetup -n DiscordCanary
 
 %build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p %{buildroot}%{_datadir}/discord-canary
 cp -rv * %{buildroot}%{_datadir}/discord-canary
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord-canary.desktop %{buildroot}%{_datadir}/applications/discord-canary.desktop
+ln -s %_datadir/discord-canary/discord-canary.desktop %{buildroot}%{_datadir}/applications/
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary.png
+ln -s %_datadir/discord-canary/discord.png %{buildroot}%{_datadir}/pixmaps/discord-canary.png
 
 %files
 %{_datadir}/discord-canary/

anda/apps/discord-openasar/anda.hcl

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

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

@@ -1,19 +1,29 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-openasar
-Version:        0.0.26
+Version:        0.0.34
 Release:        1%{?dist}
-Summary:        OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
+Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
 Source0:        https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
 Source1:        %{url}/releases/download/nightly/app.asar
 Group:          Applications/Internet
-Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires:       glibc GConf2
+Requires:       nspr >= 4.13
+Requires:       nss >= 3.27
+Requires:       libX11 >= 1.6
+Requires:       libXtst >= 1.2
 ExclusiveArch:  x86_64
 
 %description
-%{summary}.
+OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and
+include more features like further customization and theming.
 
 %prep
 %autosetup -n Discord
@@ -28,8 +38,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-openasar
 cp -rv * %{buildroot}%{_datadir}/discord-openasar
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord.desktop %{buildroot}%{_datadir}/applications/discord-openasar.desktop
+ln -s %_datadir/discord-openasar/discord.desktop %{buildroot}%{_datadir}/applications/discord-openasar.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-openasar.png
+ln -s %_datadir/discord-openasar/discord.png %{buildroot}%{_datadir}/pixmaps/discord-openasar.png
 cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-openasar/resources/app.asar
 chmod o+w %{buildroot}%{_datadir}/discord-openasar/resources -R
 

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

@@ -1,6 +1,6 @@
 project pkg {
-    rpm {
+	arches = ["x86_64"]
-        spec = "discord-ptb-openasar.spec"
+	rpm {
-        update = ""
+		spec = "discord-ptb-openasar.spec"
-    }
+	}
 }

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

@@ -1,19 +1,29 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-ptb-openasar
-Version:        0.0.41
+Version:        0.0.58
 Release:        1%{?dist}
-Summary:        OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming
+Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
 Source0:        https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
 Source1:        %{url}/releases/download/nightly/app.asar
 Group:          Applications/Internet
-Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires:       glibc GConf2
+Requires:       nspr >= 4.13
+Requires:       nss >= 3.27
+Requires:       libX11 >= 1.6
+Requires:       libXtst >= 1.2
 ExclusiveArch:  x86_64
 
 %description
-%{summary}.
+OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and
+include more features like further customization and theming.
 
 %prep
 %autosetup -n DiscordPTB
@@ -28,6 +38,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-ptb-openasar
 cp -rv * %{buildroot}%{_datadir}/discord-ptb-openasar
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
+ln -s %_datadir/discord-ptb-openasar/discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb-openasar.desktop
+ln -s %_datadir/discord-ptb-openasar/discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb-openasar.png
 install discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb-openasar.desktop
 install discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb-openasar.png
 cp -v %{SOURCE1} %{buildroot}%{_datadir}/discord-ptb-openasar/resources/app.asar

anda/apps/discord-ptb/anda.hcl

@@ -1,5 +1,6 @@
 project pkg {
-    rpm {
+	arches = ["x86_64"]
-        spec = "discord-ptb.spec"
+	rpm {
-    }
+		spec = "discord-ptb.spec"
+	}
 }

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

@@ -1,17 +1,28 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-ptb
-Version:        0.0.41
+Version:        0.0.58
 Release:        1%{?dist}
 Summary:        Free Voice and Text Chat for Gamers.
-URL:            discord.com
+URL:            https://discord.com
 Source0:        https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
 License:        https://discord.com/terms
-Requires:       libatomic, glibc, alsa-lib, GConf2, libnotify, nspr >= 4.13, nss >= 3.27, libstdc++, libX11 >= 1.6, libXtst >= 1.2, libappindicator, libcxx, libXScrnSaver
+Requires:       glibc GConf2
+Requires:       nspr >= 4.13
+Requires:       nss >= 3.27
+Requires:       libX11 >= 1.6
+Requires:       libXtst >= 1.2
 Group:          Applications/Internet
 ExclusiveArch:  x86_64
 %description
-Imagine a place where you can belong to a school club, a gaming group, or a worldwide art community. Where just you and a handful of friends can spend time together. A place that makes it easy to talk every day and hang out more often.
+Imagine a place where you can belong to a school club, a gaming group, or a
+worldwide art community. Where just you and a handful of friends can spend time
+together. A place that makes it easy to talk every day and hang out more often.
 
 %prep
 %autosetup -n DiscordPTB
@@ -24,8 +35,8 @@ mkdir -p %{buildroot}%{_datadir}/discord-ptb
 cp -rv * %{buildroot}%{_datadir}/discord-ptb
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord-ptb.desktop %{buildroot}%{_datadir}/applications/discord-ptb.desktop
+ln -s %_datadir/discord-ptb/discord-ptb.desktop %{buildroot}%{_datadir}/applications/
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb.png
+ln -s %_datadir/discord-ptb/discord.png %{buildroot}%{_datadir}/pixmaps/discord-ptb.png
 
 %files
 %{_datadir}/discord-ptb/

anda/apps/discord/anda.hcl

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

anda/apps/discord/discord.spec

@@ -1,13 +1,18 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:			discord
-Version:		0.0.26
+Version:		0.0.34
 Release:		1%{?dist}
-Summary:		Free Voice and Text Chat for Gamers.
+Summary:		Free Voice and Text Chat for Gamers
-URL:			discord.com
+URL:			https://discord.com
 Source0:		https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
 License:		https://discord.com/terms
-Requires:		libatomic glibc alsa-lib GConf2 libnotify libstdc++ libappindicator libcxx libXScrnSaver
+Requires:		glibc GConf2
 Requires:		nspr >= 4.13
 Requires:		nss >= 3.27
 Requires:		libX11 >= 1.6
@@ -15,10 +20,9 @@ Requires:		libXtst >= 1.2
 Group:			Applications/Internet
 ExclusiveArch:	x86_64
 %description
-Imagine a place where you can belong to a school club, a gaming group,
+Imagine a place where you can belong to a school club, a gaming group, or a
-or a worldwide art community. Where just you and a handful of friends
+worldwide art community. Where just you and a handful of friends can spend time
-can spend time together. A place that makes it easy to talk every day
+together. A place that makes it easy to talk every day and hang out more often.
-and hang out more often.
 
 %prep
 %autosetup -n Discord
@@ -31,8 +35,8 @@ mkdir -p %{buildroot}%{_datadir}/discord
 cp -rv * %{buildroot}%{_datadir}/discord
 mkdir -p %{buildroot}%{_datadir}/applications/
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-install discord.desktop %{buildroot}%{_datadir}/applications/discord.desktop
+ln -s %_datadir/discord/discord.desktop %{buildroot}%{_datadir}/applications/discord.desktop
-install discord.png %{buildroot}%{_datadir}/pixmaps/discord.png
+ln -s %_datadir/discord/discord.png %{buildroot}%{_datadir}/pixmaps/discord.png
 
 %files
 %{_datadir}/discord/

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

@@ -1,5 +1,5 @@
-project "pkg" {
+project pkg {
-    rpm {
+	rpm {
-        spec = "lomiri-system-settings.spec"
+		spec = "lomiri-system-settings.spec"
-    }
+	}
 }

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

@@ -1,17 +1,16 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 595b25b5f6ab0fee51e084bb6b0d31ccfb719e73
+%global commit 87ffe4bf29b3b220f66e34611f381e0d15054a89
 %forgemeta
 
 Name:       lomiri-system-settings
-Version:    1.0.1
+Version:    1.0.2
-Release:    %autorelease
+Release:    1%{?dist}
 Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
 Source0:    %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
 Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch
 Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch
-Patch2:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2002_use-Noto-font-instead-of-Ubuntu-font.patch
 
 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -21,6 +20,7 @@ BuildRequires: pkgconfig(geonames)
 BuildRequires: pkgconfig(icu-i18n)
 #BuildRequires: pkgconfig(libandroid-properties)
 BuildRequires: pkgconfig(click-0.4)
+BuildRequires: pkgconfig(deviceinfo)
 BuildRequires: pkgconfig(gsettings-qt)
 BuildRequires: pkgconfig(QtGui)
 BuildRequires: pkgconfig(gnome-desktop-3.0)
@@ -58,6 +58,7 @@ developing applications that use %{name}.
 %find_lang %{name}
 
 %files -f %{name}.lang
+%doc README.md
 %license COPYING
 %{_bindir}/lomiri-system-settings
 %{_libdir}/libLomiriSystemSettings.so.*

anda/apps/lomiri-system-settings/update.rhai

@@ -0,0 +1,3 @@
+let o = get("https://gitlab.com/api/v4/projects/25770177/repository/tags").json_arr()[0];
+rpm.version(o.name);
+rpm.global("commit", get("https://gitlab.com/api/v4/projects/25770177/repository/commits").json_arr()[0].id);

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/vala-panel-appmenu/anda.hcl

@@ -1,5 +1,5 @@
-project "pkg" {
+project pkg {
-    rpm {
+	rpm {
-        spec = "vala-panel-appmenu.spec"
+		spec = "vala-panel-appmenu.spec"
-    }
+	}
 }

anda/apps/vala-panel-appmenu/update.rhai

@@ -0,0 +1,3 @@
+let o = get("https://gitlab.com/api/v4/projects/6865053/repository/tags").json_arr()[0];
+rpm.version(o.name);
+rpm.global("commit", get("https://gitlab.com/api/v4/projects/6865053/repository/commits").json_arr()[0].id);

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

@@ -1,15 +1,16 @@
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu
-%global commit 99cd56c1644fe4193854902c450e67f9a6685112
+%global commit 76442be6195385193cb5931d0004122310d40c95
 %forgemeta
 
 Name:    vala-panel-appmenu
 Version: 0.7.6
-Release: %autorelease
+Release: 2%?dist
 License: LGPL-3.0-or-later
-Summary: This package provides Application Menu plugin for vala-panel
+Summary: Application Menu plugin for vala-panel
 URL:     %{forgeurl}
 Source:  %{forgesource}
 
+BuildRequires: fdupes
 BuildRequires: bamf-daemon
 BuildRequires: meson
 BuildRequires: ninja-build
@@ -32,39 +33,35 @@ BuildRequires: pkgconfig(dbusmenu-glib-0.4)
 BuildRequires: pkgconfig(vala-panel)
 BuildRequires: pkgconfig(libmatepanelapplet-4.0)
 Provides:      vala-panel-appmenu-plugin = %{version}
-Requires:      unity-gtk3-module
-Requires:      unity-gtk2-module
 Requires:      bamf-daemon
-Requires:      libdbusmenu
-Requires:      libdbusmenu-gtk2
-Requires:      libdbusmenu-gtk3
 
 %description
-Vala Panel Application Menu is a Global Menu applet for use with Vala Panel, xfce4-panel and mate-panel (Budgie 10.x is also planned).
+Vala Panel Application Menu is a Global Menu applet for use with Vala Panel,
+xfce4-panel and mate-panel (Budgie 10.x is also planned).
 Unity-gtk-module is used as a backend
 
 %package -n xfce4-vala-panel-appmenu-plugin
-Summary:    This package provides Application Menu plugin for xfce4-panel
+Summary:      Application Menu plugin for xfce4-panel
-Requires:    xfce4-panel
+Requires:     xfce4-panel
-Requires:    vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
+Requires:     vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
 
 %description -n xfce4-vala-panel-appmenu-plugin
 XFCE4 desktop plugin for %{name}.
 
 
 %package -n mate-vala-panel-appmenu-plugin
-Summary:    This package provides Application Menu plugin for xfce4-panel
+Summary:      Application Menu plugin for xfce4-panel
-Requires:    mate-panel
+Requires:     mate-panel
-Requires:    vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
+Requires:     vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
 
 %description -n mate-vala-panel-appmenu-plugin
 Mate desktop plugin for %{name}.
 
 
 %package -n budgie-vala-panel-appmenu-plugin
-Summary:    This package provides Application Menu plugin for xfce4-panel
+Summary:      Application Menu plugin for xfce4-panel
-Requires:   budgie-desktop
+Requires:     budgie-desktop
-Requires:   vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
+Requires:     vala-panel-appmenu-gtk-module%{?_isa} == %{version}-%{release}
 
 %description -n budgie-vala-panel-appmenu-plugin
 Budgie desktop plugin for %{name}.
@@ -80,7 +77,6 @@ Header files, libraries, and other files for developing %{name}.
 
 %package -n vala-panel-appmenu-gtk-module
 Summary:    Gtk3MenuShell D-Bus exporter
-Requires:   %{name}%{?_isa} = %{version}-%{release}
 
 %description -n vala-panel-appmenu-gtk-module
 GTK (2, 3) module that exports GtkMenuShells over D-Bus.
@@ -95,6 +91,7 @@ GTK (2, 3) module that exports GtkMenuShells over D-Bus.
 
 %install
 %meson_install
+%fdupes %buildroot%_datadir/locale/
 %find_lang vala-panel-appmenu
 
 %files -f vala-panel-appmenu.lang

anda/apps/vala-panel/anda.hcl

@@ -1,5 +1,5 @@
-project "pkg" {
+project pkg {
-    rpm {
+	rpm {
-        spec = "vala-panel.spec"
+		spec = "vala-panel.spec"
-    }
+	}
 }

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

@@ -5,12 +5,13 @@
 
 Name:    vala-panel
 Version: 0.5.0
-Release: %autorelease
+Release: 2%?dist
 License: LGPL-3.0-or-later
 Summary: This package provides Application Menu plugin for vala-panel
 URL:     %{forgeurl}
 Source:  %{forgesource}
 
+BuildRequires: fdupes
 BuildRequires: meson
 BuildRequires: vala
 BuildRequires: desktop-file-utils
@@ -42,18 +43,20 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %install
 %meson_install
+%fdupes %buildroot%_datadir/locale/
 %find_lang %{name}
 # Already packaged
 rm -rf %{buildroot}%{_datadir}/vala-panel/doc
 
+%check
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.application.desktop
 # Seems to succeed with other appstream checkers and works but fails
 #appstream-util validate-relax --nonet {buildroot}{_datadir}/appdata/org.valapanel.application.appdata.xml
 
 %files -f %{name}.lang
-%doc README.md LICENSE
+%doc README.md
 %license LICENSE
-%{_sysconfdir}/xdg/vala-panel/
+%config %{_sysconfdir}/xdg/vala-panel/
 %{_bindir}/vala-*
 %{_libdir}/libvalapanel.so.*
 %dir %{_libdir}/vala-panel
@@ -72,6 +75,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
 %{_datadir}/vala-panel/images/background.png
 
 %files devel
+%doc README.md
+%license LICENSE
 %dir %{_includedir}/vala-panel
 %{_includedir}/vala-panel/*.h
 %{_libdir}/libvalapanel.so

anda/audio/distrho/anda.hcl

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

anda/audio/distrho/distrho.spec

@@ -26,37 +26,36 @@ BuildRequires:  pkgconfig(xcursor)
 %description
 Misc audio production plugins ported to linux lv2 plugins by DISTRHO
 
-# Dexed
 
 %package dexed
-Summary:    Dexed is a multi platform, multi format plugin synth that is closely modeled on the Yamaha DX7
+Summary:    A multi platform, multi format plugin synth closely modeled on the Yamaha DX7
 
 %description dexed
-Dexed is a multi platform, multi format plugin synth that is closely modeled on the Yamaha DX7.
+Dexed is a multi platform, multi format plugin synth that is closely modeled on
-Dexed is also a midi cartridge librarian/manager for the DX7
+the Yamaha DX7. Dexed is also a midi cartridge librarian/manager for the DX7.
 
-# Vitalium
 
 %package vitalium
-Summary:    vitalium is a spectral warping wavetable synthesizer
+Summary:    A spectral warping wavetable synthesizer
 Provides:   vitalium-vst = %{version}-%{release}
 Provides:   vitalium-lv2 = %{version}-%{release}
 Provides:   vitalium = %{version}-%{release}
+
 %description vitalium
-vitalium is the Open Source version of the Vital spectral warping wavetable synthesizer
+vitalium is the Open Source version of the Vital spectral warping wavetable
+synthesizer.
+
 
 %package TAL
-Summary:    Misc Plugins for TAL (tal-filter, tal-filter-2, tal-noisemaker, tal-reverb, tal-reverb-2, tal-reverb-3, tal-vocoder-2)
+Summary:    Misc Plugins for TAL
-
-# TAL
 
 %description TAL
-Misc Plugins for TAL (tal-filter, tal-filter-2, tal-noisemaker, tal-reverb, tal-reverb-2, tal-reverb-3, tal-vocoder-2)
+Misc Plugins for TAL (tal-filter, tal-filter-2, tal-noisemaker, tal-reverb,
+tal-reverb-2, tal-reverb-3, tal-vocoder-2).
+
 
 %package dRowAudio
-Summary:    Plugins from dRowAudio (distortion, distortionshaper, flanger, reverb, tremolo)
+Summary:    Plugins from dRowAudio
-
-# dRowAudio
 
 %description dRowAudio
 Plugins from dRowAudio (distortion, distortionshaper, flanger, reverb, tremolo)
@@ -68,132 +67,132 @@ Summary:    Arctican lv2 plugins
 %description Arctican
 Plugins from Arctican (The Functiom & The Pilgrim)
 
-# LUFS
 
 %package LUFS
 Summary:    Klangfreund metering plugins (Multimeter + LUFS Meter)
 
 %description LUFS
-Klangfreund metering plugins (Multimeter + LUFS Meter)
+Klangfreund metering plugins (Multimeter + LUFS Meter).
 
-# EasySSP
 
 %package EasySSP
-Summary:    Easy Sound Space Perception is a small and lightweight audio visualization tool
+Summary:    A small and lightweight audio visualization tool
 
 %description EasySSP
-Easy Sound Space Perception is a small and lightweight audio visualization tool, which currently provides spectrometer and goniometer views.
+Easy Sound Space Perception is a small and lightweight audio visualization tool
+that currently provides spectrometer and goniometer views.
 
-# JuceOPL
 
 %package JuceOPL
 Summary:    Classic game sounds in Plugin form, as heard in late 80s / early 90s sound cards
 
 %description JuceOPL
-Classic game sounds in Plugin form, as heard in late 80s / early 90s sound cards.
+Classic game sounds in Plugin form,
+as heard in late 80s / early 90s sound cards.
 
-# KlangFalter
 
 %package KlangFalter
-Summary:    KlangFalter is a convolution audio plugin
+Summary:    A convolution audio plugin
 
 %description KlangFalter
 KlangFalter is a convolution audio plugin
 
-# Luftikus
 
 %package Luftikus
 Summary:    Luftikus plugin
 
 %description Luftikus
-Luftikus is a digital adaptation of an analog EQ with fixed half-octave bands and additional high frequency boost.
+Luftikus is a digital adaptation of an analog EQ with fixed half-octave bands
-As an improvement to the hardware it allows deeper cuts and supports a keep-gain mode where overall gain changes are avoided.
+and additional high frequency boost. As an improvement to the hardware it
+allows deeper cuts and supports a keep-gain mode where overall gain changes are
+avoided.
 
-# Obxd
 
 %package Obxd
-Summary:    Obxd is emulation of famous ob-x, ob-xa and ob8 synths
+Summary:    Emulation of famous ob-x, ob-xa and ob8 synths
 
 %description Obxd
 Obxd is emulation of famous ob-x, ob-xa and ob8 synths.
 
-# Refine
 
 %package ReFine
 Summary:    ReFine plugin
 
 %description ReFine
-ReFine is a plugin that allows to add a final polishing to your tracks, busses and masters.
+ReFine is a plugin that allows to add a final polishing to your tracks, busses
-It extracts psycho-acoustic parameters from the source and thus allows to add warmth, space and punch to your mixes.
+and masters. It extracts psycho-acoustic parameters from the source and thus
+allows to add warmth, space and punch to your mixes.
 
-# Wolpertinger
 
 %package Wolpertinger
-Summary:    Wolpertinger is a subtractive, antialiased polyphonic software synthesizer
+Summary:    A subtractive, antialiased polyphonic software synthesizer
 
 %description Wolpertinger
 Wolpertinger is a subtractive, antialiased polyphonic software synthesizer.
 
-# Vex
 
 %package Vex
-Summary:    Vex is a 3 oscillator subtractive waverom synth
+Summary:    A 3 oscillator subtractive waverom synth
 
 %description Vex
 Vex is a 3 oscillator subtractive waverom synth
 
-# Temper
+
 %package Temper
-Summary:    Temper is a modern digital distortion plugin
+Summary:    A modern digital distortion plugin
 
 %description Temper
-Temper is a modern digital distortion plugin featuring a rich saturation stage and a unique phase distortion.
+Temper is a modern digital distortion plugin featuring a rich saturation stage
-Use the variable saturation curve to add warmth and edge to your sound, and let the phase distortion bring character and clarity through your mix.
+and a unique phase distortion. Use the variable saturation curve to add warmth
-Temper also features a simple resonant lowpass filter and a feedback path to drive the intensity of the tone.
+and edge to your sound, and let the phase distortion bring character and
+clarity through your mix. Temper also features a simple resonant lowpass filter
+and a feedback path to drive the intensity of the tone.
+
 
-# SwankyAmp
 %package SwankyAmp
-Summary:    Swanky Amp is a tube amplifier emulation plug-in
+Summary:    A tube amplifier emulation plug-in
 
 %description SwankyAmp
-Swanky Amp is a tube amplifier emulation plug-in which is based on detailed simulations of tube amplification.
+Swanky Amp is a tube amplifier emulation plug-in based on detailed simulations
-Discover new tones effortlessly with intuitive controls, harnessing the coveted sounds of dynamic tube amplification.
+of tube amplification. Discover new tones effortlessly with intuitive controls,
+harnessing the coveted sounds of dynamic tube amplification.
+
 
-# PitchedDelay
 %package PitchedDelay
 Summary:    PitchedDelay is a delay that allows the pitching the delayed signal
 
 %description PitchedDelay
-PitchedDelay is a delay that allows the pitching the delayed signal, within or outside the feedback loop.
+PitchedDelay is a delay that allows the pitching the delayed signal, within or
+outside the feedback loop.
+
 
-# StereoSourceSeparation
 %package StereoSourceSeparation
 Summary:    Stereo Source Separation plugin
 
 %description StereoSourceSeparation
-This is a plugin that uses the spatial information hidden in the stereo signal to accomplish source separation.
+This is a plugin that uses the spatial information hidden in the stereo signal
+to accomplish source separation.
 
-# HiReSam
 
 %package HiReSam
 Summary:    Klangfreund High Resolution Spectrum Analyse Meter
 
 %description HiReSam
-Klangfreund High Resolution Spectrum Analyse Meter
+%summary.
+
 
-# eqinox
 %package eqinox
 Summary:    EQinox equaliser plugin
 
 %description eqinox
-EQinox equaliser plugin
+EQinox equaliser plugin.
+
 
-# drumsynth
 %package drumsynth
-Summary:    drumsynth plugin
+Summary:    Plugin for drumsynth
 
 %description drumsynth
-drumsynth plugin
+%summary.
 
 %prep
 %autosetup -p1 -n DISTRHO-Ports-%{github_release}

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

@@ -0,0 +1,5 @@
+project pkg {
+	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/anda.hcl

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

anda/crystal/blahaj/blahaj.spec

@@ -0,0 +1,39 @@
+%define debug_package %nil
+
+Name:			blahaj
+Version:		2.1.0
+Release:		1%{?dist}
+Summary:		Gay sharks at your local terminal - lolcat-like CLI tool
+License:		BSD-2-Clause
+URL:			https://blahaj.queer.software
+Source0:		https://github.com/GeopJr/BLAHAJ/archive/refs/tags/v%version.tar.gz
+BuildRequires:	crystal gcc libyaml-devel pcre-devel libgc-devel libevent-devel
+ExclusiveArch:	x86_64
+
+%description
+Apart from a cute cuddly shark plushie from IKEA, BLÅHAJ is a lolcat-like CLI
+tool that colorizes your input, shows flags and prints colorful sharks!
+It has a wide variety of flags/colors to choose from and many options from flag
+size to whether to colorize by line, word or character.
+
+%prep
+%autosetup -n BLAHAJ-%{version}
+
+%build
+shards build --production --release -D "-fPIE" --link-flags "-pie"
+
+%install
+mkdir -p %buildroot%_bindir
+install -Dm755 bin/blahaj %buildroot%_bindir/
+
+%check
+crystal spec --order random -Dpreview_mt
+
+%files
+%doc README.md
+%license LICENSE
+%_bindir/blahaj
+
+%changelog
+* Sat Apr 15 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.0.1-1
+- Initial package.

anda/crystal/blahaj/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("GeopJr/BLAHAJ"));

anda/crystal/crystal/anda.hcl

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

anda/crystal/crystal/crystal.spec

@@ -0,0 +1,60 @@
+%define debug_package %nil
+
+Name:			crystal
+Version:		1.10.1
+Release:		1%{?dist}
+Summary:		The Crystal Programming Language
+License:		Apache-2.0
+URL:			https://crystal-lang.org/
+Source0:		https://github.com/crystal-lang/crystal/releases/download/%version/crystal-%version-1-linux-x86_64-bundled.tar.gz
+ExclusiveArch:	x86_64
+BuildRequires:	rpm_macro(fdupes)
+
+%description
+%summary.
+
+%package devel
+Summary:	Development files for the crystal package
+
+%description devel
+%summary.
+
+%prep
+%autosetup -n crystal-%version-1
+
+%build
+
+%install
+mkdir -p %buildroot/usr/bin
+mkdir -p %buildroot/usr/share
+mkdir -p %buildroot/usr/lib/crystal
+install -Dm755 bin/* %buildroot/usr/bin/
+cp -r share/* %buildroot/usr/share/
+cp -r lib/crystal/* %buildroot/usr/lib/crystal/
+
+%fdupes %buildroot%_datadir/crystal/src/lib_c/
+
+
+%files
+%license /usr/share/licenses/crystal/LICENSE
+/usr/bin/crystal
+/usr/share/zsh/site-functions/_crystal
+/usr/share/man/man1/crystal.1.gz
+/usr/share/crystal/
+/usr/share/fish/vendor_completions.d/crystal.fish
+/usr/share/bash-completion/completions/crystal
+
+/usr/bin/shards
+/usr/share/man/man1/shards.1.gz
+/usr/share/man/man5/shard.yml.5.gz
+
+%files devel
+/usr/lib/crystal/
+
+%changelog
+* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.8.2-2
+- Add devel package.
+
+* Sat Apr 15 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.8.0-1
+- Initial package.
+

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/anda.hcl

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

anda/dart/dart.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name: dart
-Version: 2.19.6
+Version: 3.2.3
 Release: 1%{?dist}
 Summary: The Dart Language
 License: BSD-3-Clause
@@ -18,9 +18,11 @@ URL: https://dart.dev/
 %endif
 
 Source0: https://storage.googleapis.com/dart-archive/channels/stable/release/%{version}/sdk/dartsdk-linux-%{arch}-release.zip
+BuildRequires: fdupes
 
 %description
-Dart is a client-optimized language for fast apps on any platform. This package contains the SDK used to develop and compile Dart applications.
+Dart is a client-optimized language for fast apps on any platform.
+This package contains the SDK used to develop and compile Dart applications.
 
 %prep
 %setup -q -n dart-sdk
@@ -37,6 +39,8 @@ cp -rv ./* %{buildroot}%{_libdir}/dart
 ln -sf %{_libdir}/dart/bin/dart %{buildroot}%{_bindir}/dart
 ln -sf %{_libdir}/dart/bin/dartaotruntime %{buildroot}%{_bindir}/dartaotruntime
 
+%fdupes %buildroot%_libdir/dart/bin/
+
 %files
 %{_libdir}/dart/
 %{_bindir}/dart

anda/desktops/budgie/budgie-extras/anda.hcl

@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
+	rpm {
-        spec = "budgie-extras.spec"
+		spec = "budgie-extras.spec"
-    }
+	}
 }

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

@@ -1,6 +1,5 @@
-
 Name:		budgie-extras
-Version:	1.6.0
+Version:	1.8.0
 Release:	1%{?dist}
 
 License:	GPL-3.0
@@ -10,6 +9,7 @@ URL:		https://ubuntubudgie.org/
 Source0:	https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz
 Patch0: 0001-fix-weathershow-desktop-widget-icon-path.patch
 
+BuildRequires:	rpm_macro(fdupes)
 BuildRequires:	cmake
 BuildRequires:	meson
 BuildRequires:	vala
@@ -69,6 +69,7 @@ The applets can be used individually or as a set.
 %package	common
 Requires:	budgie-desktop
 Summary:	Shared component of budgie-extras applets
+BuildArch:	noarch
 %description	common
 The shared component provides for capabilities that are utilised between
 budgie-extra applets.
@@ -282,6 +283,8 @@ workspaces.
 # Remove absolute symlink and replace with relative symlink
 rm -f %{buildroot}%{_bindir}/quickchar
 
+%fdupes %_libdir/budgie-desktop/plugins/budgie-weathershow/weather_icons
+
 %post
 
 %{__ln_s} -fv %{_bindir}/quickchar %{_libdir}/quickchar/quickchar
@@ -294,7 +297,7 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/glib-2.0/schemas/20_budgie-extras.gschema.override
 
 %files daemon
-%{_sysconfdir}/xdg/autostart/budgie-extras-daemon.desktop
+%config %{_sysconfdir}/xdg/autostart/budgie-extras-daemon.desktop
 %{_bindir}/budgie-extras-daemon
 %{_libdir}/budgie-extras-daemon/invoke.py
 %{_datadir}/budgie-desktop/layouts/*.layout
@@ -335,7 +338,7 @@ rm -f %{buildroot}%{_bindir}/quickchar
 
 %files -n budgie-applet-hotcorners
 %{_libdir}/budgie-desktop/plugins/budgie-hotcorners
-%{_sysconfdir}/xdg/autostart/org.ubuntubudgie.budgie-extras.HotCorners-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/org.ubuntubudgie.budgie-extras.HotCorners-autostart.desktop
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.budgie-extras.HotCorners.gschema.xml
 %{_datadir}/applications/org.ubuntubudgie.budgie-extras.HotCorners.desktop
 %{_datadir}/budgie-hotcorners
@@ -357,7 +360,7 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_libdir}/budgie-desktop/plugins/budgie-network-manager
 
 %files -n budgie-applet-quickchar
-%{_sysconfdir}/xdg/autostart/quickchar-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/quickchar-autostart.desktop
 %ghost %{_bindir}/quickchar
 %{_libdir}/quickchar
 %{_datadir}/applications/org.ubuntubudgie.quickchar.desktop
@@ -394,13 +397,13 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_libdir}/budgie-desktop/plugins/budgie-trash
 
 %files -n budgie-applet-visualspace
-%{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
 %{_libdir}/budgie-desktop/plugins/budgie-visualspace
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.budgie-visualspace.gschema.xml
 %{_datadir}/pixmaps/visualspace-symbolic.svg
 
 %files -n budgie-applet-wallstreet
-%{_sysconfdir}/xdg/autostart/wallstreet-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/wallstreet-autostart.desktop
 %{_libdir}/budgie-wallstreet/wallstreet*
 %{_datadir}/applications/org.ubuntubudgie.wallstreetcontrol.desktop
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.budgie-wallstreet.gschema.xml
@@ -413,9 +416,9 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/pixmaps/budgie-wticon-symbolic.svg
 
 %files -n budgie-applet-window-shuffler
-%{_sysconfdir}/xdg/autostart/layoutspopup-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/layoutspopup-autostart.desktop
-%{_sysconfdir}/xdg/autostart/dragsnap-autostart.desktop
+%config %{_sysconfdir}/xdg/autostart/dragsnap-autostart.desktop
-%{_sysconfdir}/xdg/autostart/shuffler*.desktop
+%config %{_sysconfdir}/xdg/autostart/shuffler*.desktop
 %{_libdir}/budgie-window-shuffler
 %{_datadir}/applications/org.ubuntubudgie.shufflercontrol.desktop
 %{_datadir}/icons/hicolor/scalable/apps/org.ubuntubudgie.shuffler-control.svg
@@ -433,7 +436,7 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/pixmaps/budgie-wstopwatch-symbolic.svg
 
 %files -n budgie-applet-wpreviews
-%{_sysconfdir}/xdg/autostart/previews-*.desktop
+%config %{_sysconfdir}/xdg/autostart/previews-*.desktop
 %{_libdir}/budgie-previews
 %{_datadir}/applications/org.ubuntubudgie.previewscontrols.desktop
 %{_datadir}/metainfo/org.ubuntubudgie.previewscontrols.metainfo.xml

anda/desktops/compiz9/anda.hcl

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

anda/desktops/compiz9/compiz9.spec

@@ -1,9 +1,9 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu1
+%define _ubuntu_rel 22.10.20220822-0ubuntu6
 %global _hardened_build 0
 
 Name:           compiz9
 Version:        0.9.14.2
-Release:        %autorelease
+Release:        3%?dist
 Summary:        OpenGL window and compositing manager 0.9.X.X series
 
 License:        GPL-2.0-or-later AND LGPL-2.0-or-later AND MIT
@@ -14,6 +14,7 @@ Patch1:         gtk-extents.patch
 Patch2:         focus-prevention-disable.patch
 
 Conflicts:     compiz
+BuildRequires: rpm_macro(fdupes)
 BuildRequires: libX11-devel
 BuildRequires: libdrm-devel
 BuildRequires: libXcursor-devel
@@ -66,6 +67,7 @@ This package contains the development files for %{name}.
 %package -n python3-ccsm
 Summary: Compiz Config Manager
 Conflicts: ccsm
+BuildArch: noarch
 Requires: %{name}%{?_isa}
 
 %description -n python3-ccsm
@@ -75,7 +77,7 @@ Compiz Config Manager helps configure Compiz Window Manager, version 0.9 series
 Compiz 9 branch, which is newer then what Fedora packages and required by Unity 7.6 and higher.
 
 %prep
-%autosetup -p1 -n compiz
+%autosetup -p1 -n compiz-%version+%(echo %_ubuntu_rel | sed 's@-0ubuntu.@@')
 
 %build
 # The driver blacklist hack is obselete
@@ -102,10 +104,14 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 mkdir -p %{buildroot}%{_datadir}/compiz/icons/hicolor/{scalable/{apps,\
 categories},22x22/{categories,devices,mimetypes}}
 
+%fdupes %buildroot%_datadir/glib-2.0/schemas/
+%fdupes %buildroot%_datadir/ccsm/icons/hicolor/scalable/apps/
+
+
 %files -f compiz.lang
-%doc AUTHORS README INSTALL NEWS
+%doc AUTHORS README NEWS
 %license COPYING COPYING.GPL COPYING.LGPL COPYING.MIT
-%config %{_sysconfdir}/compizconfig/config.conf
+%config(noreplace) %{_sysconfdir}/compizconfig/config.conf
 %{_bindir}/compiz
 %{_bindir}/compiz-decorator
 %{_bindir}/gtk-window-decorator

anda/desktops/compiz9/update.rhai

@@ -0,0 +1,5 @@
+let html = get("http://archive.ubuntu.com/ubuntu/pool/universe/c/compiz/?C=N;O=D");
+let v = find("compiz_([\\d.]+)\\+(.+?).tar.xz", html, 1);
+let r = find("compiz_([\\d.]+)\\+(.+?).tar.xz", html, 2);
+rpm.version(v);
+rpm.define("_ubuntu_rel", r);

anda/desktops/elementary/appcenter/0001-hard-code-Fedora-instead-of-ubuntu-repository-names.patch

@@ -0,0 +1,99 @@
+diff --git a/src/Core/Package.vala b/src/Core/Package.vala
+index 62d206fa..cbf05983 100644
+--- a/src/Core/Package.vala
++++ b/src/Core/Package.vala
+@@ -42,8 +42,29 @@ public enum RuntimeStatus {
+ }
+
+ public class AppCenterCore.Package : Object {
++    // locally installed packages
+     public const string APPCENTER_PACKAGE_ORIGIN = "appcenter";
+-    private const string ELEMENTARY_STABLE_PACKAGE_ORIGIN = "elementary-stable-jammy-main";
++
++    // Fedora repositories
++    private const string FEDORA_STABLE_PACKAGE_ORIGIN = "fedora";
++    private const string FEDORA_UPDATES_PACKAGE_ORIGIN = "updates";
++    private const string FEDORA_TESTING_PACKAGE_ORIGIN = "updates-testing";
++
++    // RPMFusion repositories
++    private const string RPMFUSION_FREE_STABLE_PACKAGE_ORIGIN = "rpmfusion-free";
++    private const string RPMFUSION_FREE_UPDATES_PACKAGE_ORIGIN = "rpmfusion-free-updates";
++    private const string RPMFUSION_FREE_TESTING_PACKAGE_ORIGIN = "rpmfusion-free-updates-testing";
++    private const string RPMFUSION_NONFREE_STABLE_PACKAGE_ORIGIN = "rpmfusion-nonfree";
++    private const string RPMFUSION_NONFREE_UPDATES_PACKAGE_ORIGIN = "rpmfusion-nonfree-updates";
++    private const string RPMFUSION_NONFREE_TESTING_PACKAGE_ORIGIN = "rpmfusion-nonfree-updates-testing";
++
++    // Ultramarine repositories
++    private const string ULTRAMARINE_PACKAGE_ORIGIN = "ultramarine";
++    private const string AKMODS_SECUREBOOT_PACKAGE_ORIGIN = "copr::egeretto:akmods-secureboot";
++    private const string KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN = "copr::egeretto:kmodtool-secureboot";
++
++    // Terra repositories
++    private const string TERRA_PACKAGE_ORIGIN = "terra";
+
+     public RuntimeStatus runtime_status { get; set; default = RuntimeStatus.UP_TO_DATE; }
+
+@@ -216,8 +237,12 @@ public class AppCenterCore.Package : Object {
+     public bool is_native {
+         get {
+             switch (component.get_origin ()) {
+-                case APPCENTER_PACKAGE_ORIGIN:
+-                case ELEMENTARY_STABLE_PACKAGE_ORIGIN:
++                case FEDORA_STABLE_PACKAGE_ORIGIN:
++                case FEDORA_UPDATES_PACKAGE_ORIGIN:
++                case FEDORA_TESTING_PACKAGE_ORIGIN:
++                case ULTRAMARINE_PACKAGE_ORIGIN:
++                case AKMODS_SECUREBOOT_PACKAGE_ORIGIN:
++                case KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN:
+                     return true;
+                 default:
+                     return false;
+@@ -328,12 +353,33 @@ public class AppCenterCore.Package : Object {
+         owned get {
+             unowned string origin = component.get_origin ();
+             if (backend is PackageKitBackend) {
+-                if (origin == APPCENTER_PACKAGE_ORIGIN) {
+-                    return _("AppCenter");
+-                } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) {
+-                    return _("elementary Updates");
+-                } else if (origin.has_prefix ("ubuntu-")) {
+-                    return _("Ubuntu (non-curated)");
++                switch (origin) {
++                    case FEDORA_STABLE_PACKAGE_ORIGIN:
++                        return "Fedora";
++                    case FEDORA_UPDATES_PACKAGE_ORIGIN:
++                        return "Fedora Updates";
++                    case FEDORA_TESTING_PACKAGE_ORIGIN:
++                        return "Fedora Updates (Testing)";
++                    case RPMFUSION_FREE_STABLE_PACKAGE_ORIGIN:
++                        return "RPMFusion";
++                    case RPMFUSION_FREE_UPDATES_PACKAGE_ORIGIN:
++                        return "RPMFusion Updates";
++                    case RPMFUSION_FREE_TESTING_PACKAGE_ORIGIN:
++                        return "RPMFusion Updates (Testing)";
++                    case RPMFUSION_NONFREE_STABLE_PACKAGE_ORIGIN:
++                        return "RPMFusion (Non-free Software)";
++                    case RPMFUSION_NONFREE_UPDATES_PACKAGE_ORIGIN:
++                        return "RPMFusion (Non-free Software) Updates";
++                    case RPMFUSION_NONFREE_TESTING_PACKAGE_ORIGIN:
++                        return "RPMFusion (Non-free Software) Updates (Testing)";
++                    case ULTRAMARINE_PACKAGE_ORIGIN:
++                        return "Ultramarine";
++                    case AKMODS_SECUREBOOT_PACKAGE_ORIGIN:
++                        return "Secureboot support for akmods";
++                    case KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN:
++                        return "Secureboot support for kmodtool";
++                    case TERRA_PACKAGE_ORIGIN:
++                        return "Terra";
+                 }
+             } else if (backend is FlatpakBackend) {
+                 var fp_package = this as FlatpakPackage;
+@@ -342,8 +388,6 @@ public class AppCenterCore.Package : Object {
+                 }
+
+                 return fp_package.remote_title;
+-            } else if (backend is UbuntuDriversBackend) {
+-                return _("Ubuntu Drivers");
+             }
+
+             return _("Unknown Origin (non-curated)");

anda/desktops/elementary/appcenter/anda.hcl

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

anda/desktops/elementary/appcenter/appcenter.rpmlintrc

@@ -0,0 +1,10 @@
+# false positives
+addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*")
+addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*")
+
+# don't care about manpages
+addFilter("W: no-manual-page-for-binary io.elementary.appcenter*")
+
+# don't care about no documentation for sub-packages
+addFilter("W: no-documentation*")
+

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

@@ -0,0 +1,313 @@
+%global appname io.elementary.appcenter
+
+Name:           elementary-appcenter
+Summary:        Software Center from elementary
+Version:        7.4.0
+Release:        1%{?dist}
+License:        GPL-3.0
+
+Provides:       appcenter = %{version}-%{release}
+Obsoletes:      appcenter < 7.2.1-2
+
+URL:            https://github.com/elementary/appcenter
+Source0:        %url/archive/%{version}/appcenter-%{version}.tar.gz
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  libappstream-glib
+BuildRequires:  meson
+BuildRequires:  vala
+
+BuildRequires:  appstream-vala
+
+BuildRequires:  pkgconfig(appstream) >= 0.10.0
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(flatpak)
+BuildRequires:  pkgconfig(gee-0.8)
+BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(packagekit-glib2)
+BuildRequires:  pkgconfig(polkit-gobject-1)
+
+Requires:       PackageKit
+Requires:       hicolor-icon-theme
+
+%description
+AppCenter is a native Gtk+ app store built on AppStream and Packagekit.
+
+
+%package        gnome-shell-search-provider
+Summary:        Software Center from elementary (gnome-shell search provider)
+
+Provides:       appcenter-gnome-shell-search-provider = %{version}-%{release}
+Obsoletes:      appcenter-gnome-shell-search-provider < 7.2.1-2
+
+BuildArch:      noarch
+
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnome-shell
+
+Supplements:    (%{name} and gnome-shell)
+
+%description    gnome-shell-search-provider
+AppCenter is a native Gtk+ app store built on AppStream and Packagekit.
+
+This package contains the gnome-shell search provider.
+
+
+%prep
+%autosetup -p1 -n appcenter-%version
+
+
+%build
+%meson -Dpayments=false -Dcurated=false -Dhide_upstream_distro_apps=false
+%meson_build
+
+
+%install
+%meson_install
+
+%find_lang %{appname}
+
+# remove empty hidden apps file
+rm -r %{buildroot}/%{_sysconfdir}/%{appname}/appcenter.hiddenapps
+
+# create autostart entry symlink
+mkdir -p %{buildroot}/%{_sysconfdir}/xdg/autostart/
+
+ln -s %{_datadir}/applications/%{appname}-daemon.desktop \
+    %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+
+
+%check
+desktop-file-validate \
+    %{buildroot}/%{_datadir}/applications/%{appname}*.desktop
+
+appstream-util validate-relax --nonet \
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+
+
+%files -f %{appname}.lang
+%doc README.md
+%license COPYING
+
+%dir %{_sysconfdir}/%{appname}
+%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+
+%{_bindir}/%{appname}
+
+%{_datadir}/applications/%{appname}*.desktop
+%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
+%{_datadir}/icons/hicolor/*/apps/%{appname}{,-symbolic}.svg
+%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/polkit-1/actions/%{appname}.policy
+
+
+%files gnome-shell-search-provider
+%{_datadir}/gnome-shell/search-providers/%{appname}.search-provider.ini
+
+
+%changelog
+* Tue Jun 07 2022 Fabio Valentini <decathorpe@gmail.com> - 3.10.0-1
+- Update to version 3.10.0.
+
+* Tue Dec 14 2021 Fabio Valentini <decathorpe@gmail.com> - 3.9.1-1
+- Update to version 3.9.1.
+
+* Wed Nov 24 2021 Fabio Valentini <decathorpe@gmail.com> - 3.9.0-1
+- Update to version 3.9.0.
+
+* Sat Oct 30 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.2-1
+- Update to version 3.8.2.
+
+* Wed Oct 27 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.1-1
+- Update to version 3.8.1.
+
+* Tue Sep 28 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.0-1
+- Update to version 3.8.0.
+
+* Fri Sep 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-3
+- Mark flatpak sources in the UI.
+
+* Fri Sep 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-2
+- Hard-code Fedora instead of ubuntu repository names.
+
+* Tue Aug 31 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-1
+- Update to version 3.7.1.
+
+* Fri Aug 27 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.0-1
+- Update to version 3.7.0.
+
+* Tue Aug 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.3-1
+- Update to version 3.6.3.
+
+* Wed Aug 11 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.2-1
+- Update to version 3.6.2.
+
+* Thu Aug 05 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.1-1
+- Update to version 3.6.1.
+
+* Fri Jul 16 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.0-1
+- Update to version 3.6.0.
+
+* Fri Oct 09 2020 Fabio Valentini <decathorpe@gmail.com> - 3.5.1-1
+- Update to version 3.5.1.
+
+* Wed Oct 07 2020 Fabio Valentini <decathorpe@gmail.com> - 3.5.0-1
+- Update to version 3.5.0.
+
+* Fri Aug 07 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.2-1
+- Update to version 3.4.2.
+
+* Thu Jul 02 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.1-1
+- Update to version 3.4.1.
+
+* Thu May 28 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.0-1
+- Update to version 3.4.0.
+
+* Thu Apr 30 2020 Fabio Valentini <decathorpe@gmail.com> - 3.3.0-1
+- Update to version 3.3.0.
+
+* Thu Apr 09 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.4-1
+- Update to version 3.2.4.
+
+* Thu Apr 02 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.3-1
+- Update to version 3.2.3.
+
+* Mon Mar 23 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-1
+- Update to version 3.2.2.
+
+* Fri Feb 28 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.1-1
+- Update to version 3.2.1.
+
+* Fri Feb 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.1-1
+- Update to version 3.1.1.
+
+* Wed Jan 02 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.0-1
+- Update to version 3.1.0.
+- Remove empty blacklist file.
+
+* Fri Nov 30 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0.1-2
+- Drop elementaryOS blacklist in favor of the version shipped with appcenter.
+
+* Thu Oct 25 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0.1-1
+- Update to version 3.0.1.
+
+* Tue Oct 16 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0-2
+- Add missing autostart entry symlink for the daemon.
+
+* Tue Oct 16 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0-1
+- Update to version 3.0.
+- Add gnome-shell search provider sub-package.
+- Explicitly disable payment system and curated applications.
+- Update blacklist file to current version from elementaryOS.
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jun 13 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.9-2
+- Rebuild for granite5 soname bump.
+
+* Thu Mar 08 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.9-1
+- Update to version 0.2.9.
+- Add patch to fix build with the newer vala and PackageKit on f28+.
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 26 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.8-1
+- Update to version 0.2.8.
+
+* Tue Nov 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.7-1
+- Update to version 0.2.7.
+
+* Fri Nov 03 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.6-2
+- Rebuild for granite soname bump.
+
+* Mon Sep 18 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.6-1
+- Update to version 0.2.6.
+
+* Sat Aug 05 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.5-1
+- Update to version 0.2.5.
+- Include fedora-specific blacklist adapted from elementaryOS.
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jul 04 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.4-1
+- Update to version 0.2.4.
+
+* Thu Jun 01 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.3-1
+- Update to version 0.2.3.
+
+* Mon May 22 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.2-1
+- Update to version 0.2.2.
+
+* Sat May 20 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.1-1
+- Update to version 0.2.1.
+
+* Wed May 17 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2-1
+- Update to version 0.2.
+
+* Thu Mar 16 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.4-1
+- Update to version 0.1.4.
+- Depend on generic icon again, since it _should_ work.
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jan 27 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-7
+- Add patch to rename generic icon to something branded.
+
+* Wed Jan 25 2017 Fabio Valentini <decathorpe@gmail.com>
+- Remove explicit BR: /usr/bin/pkgconfig.
+
+* Mon Jan 23 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-6
+- Explicitly depend on /usr/bin/pkg-config.
+
+* Mon Jan 23 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-5
+- Add missing scriptlets.
+
+* Sat Jan 21 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-4
+- Include icon to fix appdata metadata generation.
+
+* Tue Jan 10 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-3
+- Clean up spec file.
+
+* Sat Dec 24 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-2
+- Enable libunity support.
+
+* Mon Dec 05 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-1
+- Update to version 0.1.3.
+
+* Sun Nov 20 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.2-2
+- Build out of tree.
+
+* Sat Oct 29 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.2-1
+- Update to version 0.1.2.
+
+* Fri Oct 07 2016 Neal Gompa <ngompa13@gmail.com> - 0.1.1-4
+- Add patch to support AppStream 0.10.0 in F25 (LP#1626398)
+
+* Thu Sep 29 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-3
+- Mass rebuild.
+
+* Wed Sep 28 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-2
+- Spec file cleanups.
+
+* Tue Sep 27 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-1
+- Update to version 0.1.1.
+
+* Sat Sep 17 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1-2
+- Require PackageKit.
+
+* Thu Aug 18 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1-1
+- Update to version 0.1.
+

anda/desktops/elementary/appcenter/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("elementary/appcenter"));

anda/desktops/elementary/contractor/anda.hcl

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

anda/desktops/elementary/contractor/contractor.spec

@@ -1,6 +1,6 @@
 Name:           contractor
 Version:        0.3.5
-Release:        %autorelease
+Release:        1%{?dist}
 Summary:        Desktop-wide extension service
 
 License:        GPL-3.0-or-later

anda/desktops/elementary/elementary-calculator/anda.hcl

@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
+	rpm {
-        spec = "elementary-calculator.spec"
+		spec = "elementary-calculator.spec"
-    }
+	}
 }

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

@@ -3,8 +3,8 @@
 
 Name:           elementary-calculator
 Summary:        Calculator app designed for elementary
-Version:        2.0.1
+Version:        2.0.3
-Release:        %autorelease
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/%{srcname}
@@ -18,6 +18,7 @@ BuildRequires:  vala
 
 BuildRequires:  pkgconfig(granite-7) >= 7.0.0
 BuildRequires:  pkgconfig(gtk4)
+BuildRequires:  fdupes
 
 Requires:       hicolor-icon-theme
 
@@ -45,13 +46,15 @@ functions (sin, cos, and tan).
 
 %find_lang %{appname}
 
+%fdupes %buildroot/%_datadir/icons/hicolor
+
 
 %check
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
 
 
 %files -f %{appname}.lang
@@ -63,9 +66,9 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
 
 
 %changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 1.7.2-1
 - Repackaged for Terra

anda/desktops/elementary/elementary-calendar/anda.hcl

@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
+	rpm {
-        spec = "elementary-calendar.spec"
+		spec = "elementary-calendar.spec"
-    }
+	}
 }

anda/desktops/elementary/elementary-calendar/elementary-calendar.spec

@@ -5,15 +5,13 @@
 
 Name:           elementary-calendar
 Summary:        Desktop calendar app designed for elementary
-Version:        6.1.2
+Version:        7.0.0
 Release:        1%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/calendar
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/elementary/calendar/pull/758.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -21,6 +19,8 @@ BuildRequires:  pkgconfig(champlain-0.12)
 BuildRequires:  pkgconfig(libecal-2.0)
 BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(libhandy-1)
+# BuildRequires:  pkgconfig(libportal)
+BuildRequires:  pkgconfig(libportal-gtk3)
 BuildRequires:  folks-devel
 BuildRequires:  libgee-devel
 BuildRequires:  pkgconfig(geocode-glib-2.0)
@@ -32,6 +32,7 @@ BuildRequires:  libhandy >= 0.90.0
 BuildRequires:  meson
 BuildRequires:  vala
 BuildRequires:  evolution-data-server-devel
+BuildRequires:  fdupes
 
 Requires:       hicolor-icon-theme
 
@@ -64,22 +65,21 @@ This package contains the development files.
 
 %find_lang %{appname}
 
+%fdupes %buildroot/%_datadir/icons/hicolor
+
 
 %check
-desktop-file-validate \
+%dnl desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
-    %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{appname}.desktop
-desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
-appstream-util validate-relax --nonet \
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %files -f %{appname}.lang
 %doc README.md
 %license COPYING
 
-%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
 
 %{_bindir}/%{appname}
 
@@ -89,7 +89,7 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
 
 %files devel
 %{_includedir}/%{name}/

anda/desktops/elementary/elementary-camera/anda.hcl

@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
+	rpm {
-        spec = "elementary-camera.spec"
+		spec = "elementary-camera.spec"
-    }
+	}
 }

anda/desktops/elementary/elementary-camera/elementary-camera.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-camera
 Summary:        Camera app designed for elementary
-Version:        6.2.1
+Version:        6.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0
 
 URL:            https://github.com/elementary/camera
@@ -15,6 +15,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46
 BuildRequires:  vala
+BuildRequires:  fdupes
 
 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -46,13 +47,16 @@ Camera is a simple app to take photos with a webcam.
 
 %find_lang %{appname}
 
+%fdupes %buildroot/%_datadir/icons/hicolor
+
+
 
 %check
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
 
 
 %files -f %{appname}.lang
@@ -64,7 +68,7 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
 
 
 %changelog

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

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

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

@@ -3,7 +3,7 @@
 
 Name:           elementary-capnet-assist
 Summary:        Captive Portal Assistant for elementary
-Version:        2.4.3
+Version:        2.4.4
 Release:        2%{?dist}
 License:        GPL-3.0-or-later
 
@@ -25,6 +25,7 @@ BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1) >= 1.0.0
 BuildRequires:  pkgconfig(webkit2gtk-4.1)
+BuildRequires:  fdupes
 
 Requires:       NetworkManager
 Requires:       hicolor-icon-theme
@@ -54,13 +55,15 @@ Written in Vala and using WebkitGtk+.
 
 %find_lang %{appname}
 
+%fdupes %buildroot%_datadir/icons/hicolor/
+
 
 %check
 desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
 
 
 %files -f %{appname}.lang
@@ -72,9 +75,9 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
 
 
 %changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 2.4.2-1
 - Repackaged for Terra

anda/desktops/elementary/elementary-code/anda.hcl

@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
+	rpm {
-        spec = "elementary-code.spec"
+		spec = "elementary-code.spec"
-    }
+	}
 }

anda/desktops/elementary/elementary-code/elementary-code.spec

@@ -5,8 +5,8 @@
 
 Name:           elementary-code
 Summary:        Code editor from elementary
-Version:        7.0.0
+Version:        7.2.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0
 
 URL:            https://github.com/elementary/%{srcname}
@@ -38,6 +38,7 @@ BuildRequires:  pkgconfig(libpeas-gtk-1.0)
 BuildRequires:  pkgconfig(libsoup-2.4)
 BuildRequires:  pkgconfig(pangoft2)
 BuildRequires:  pkgconfig(vte-2.91)
+BuildRequires:  fdupes
 
 Requires:       hicolor-icon-theme
 
@@ -68,6 +69,8 @@ This package contains the development headers.
 
 %find_lang %{appname}
 
+%fdupes %buildroot%_datadir/icons/hicolor/
+
 
 %files -f %{appname}.lang
 %doc README.md
@@ -87,6 +90,7 @@ This package contains the development headers.
 %{_datadir}/gtksourceview-4/styles/elementary-light.xml
 %{_datadir}/metainfo/io.elementary.code.metainfo.xml
 %{_datadir}/polkit-1/actions/%{appname}.policy
+%{_mandir}/man1/%{appname}.1.gz
 
 %files devel
 %{_includedir}/codecore.h
@@ -99,5 +103,5 @@ This package contains the development headers.
 
 
 %changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.2.0-1
 - Repackaged for Terra

anda/desktops/elementary/elementary-files/anda.hcl

@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
+	rpm {
-        spec = "elementary-files.spec"
+		spec = "elementary-files.spec"
-    }
+	}
 }

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

@@ -5,7 +5,7 @@
 
 Name:           elementary-files
 Summary:        File manager from elementary
-Version:        6.3.1
+Version:        6.5.2
 Release:        1%{?dist}
 License:        GPL-3.0
 
@@ -21,6 +21,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.50.0
 BuildRequires:  vala >= 0.48.2
+BuildRequires:  fdupes
 
 BuildRequires:  pkgconfig(cloudproviders) >= 0.3.0
 BuildRequires:  pkgconfig(gdk-x11-3.0)
@@ -84,6 +85,8 @@ This package contains the development headers.
 
 %find_lang %{appname}
 
+%fdupes %buildroot%_datadir/icons/hicolor/
+
 # remove unused pixmaps
 rm -r %{buildroot}/%{_datadir}/pixmaps
 
@@ -98,7 +101,7 @@ desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
 
 
 %post portal
@@ -124,7 +127,7 @@ appstream-util validate-relax --nonet \
 %{_datadir}/dbus-1/services/%{appname}.service
 %{_datadir}/dbus-1/services/%{appname}.Filemanager1.service
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
 %{_datadir}/polkit-1/actions/%{appname}.policy
 
 %files portal

anda/desktops/elementary/elementary-greeter/anda.hcl

@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
+	rpm {
-        spec = "elementary-greeter.spec"
+		spec = "elementary-greeter.spec"
-    }
+	}
 }

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

@@ -3,8 +3,8 @@
 
 Name:           elementary-greeter
 Summary:        LightDM Login Screen for the elementary desktop
-Version:        6.1.1
+Version:        7.0.0
-Release:        %autorelease
+Release:        1%{?dist}
 License:        GPL-3.0
 
 URL:            https://github.com/elementary/greeter
@@ -16,6 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
+BuildRequires:  fdupes
 
 BuildRequires:  mesa-libEGL-devel
 
@@ -33,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-11)
+BuildRequires:  pkgconfig(mutter-clutter-12)
-BuildRequires:  pkgconfig(mutter-cogl-11)
+BuildRequires:  pkgconfig(mutter-cogl-12)
-BuildRequires:  pkgconfig(mutter-cogl-pango-11)
+BuildRequires:  pkgconfig(mutter-cogl-pango-12)
 BuildRequires:  pkgconfig(x11)
 
 Provides:       pantheon-greeter = %{version}-%{release}
@@ -67,7 +68,7 @@ The elementary Greeter is a styled Login Screen for LightDM.
 
 
 %prep
-%autosetup -n %{srcname}-%{version} -p1
+%autosetup -n %{srcname}-%{version}
 
 
 %build
@@ -80,14 +81,15 @@ The elementary Greeter is a styled Login Screen for LightDM.
 
 %find_lang %{appname}
 
+%fdupes %buildroot%_datadir/icons/hicolor/
+
 # install LightDM configuration file
 mkdir -p %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d
 install -pm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/
 
 
 %check
-appstream-util validate-relax --nonet \
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %files -f %{appname}.lang
@@ -101,9 +103,10 @@ appstream-util validate-relax --nonet \
 %{_sbindir}/%{appname}
 
 %{_datadir}/xgreeters/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/lightdm/lightdm.conf.d/40-%appname.conf
 
 
 %changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.1.0-1
 - Repackaged for Terra

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

@@ -1,5 +1,6 @@
 project pkg {
-    rpm {
+	arches = ["x86_64"]
-        spec = "elementary-icon-theme.spec"
+	rpm {
-    }
+		spec = "elementary-icon-theme.spec"
+	}
 }

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

@@ -3,7 +3,7 @@
 
 Name:           elementary-icon-theme
 Summary:        Icons from the Elementary Project
-Version:        7.2.0
+Version:        7.3.1
 Release:        1%{?dist}
 License:        GPL-3.0-or-later
 
@@ -18,6 +18,7 @@ BuildRequires:  libappstream-glib
 BuildRequires:  librsvg2-tools
 BuildRequires:  meson
 BuildRequires:  xcursorgen
+BuildRequires:  fdupes
 
 %description
 This is an icon theme designed to be smooth, sexy, clear, and efficient.
@@ -65,11 +66,13 @@ done
 # Create icon cache file
 touch %{buildroot}/%{_datadir}/icons/elementary/icon-theme.cache
 
+%fdupes %buildroot%_datadir/icons/elementary/
+
 
 %check
 # ignore validation until appstream-glib knows the "icon-theme" component type
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml || :
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml || :
 
 
 %transfiletriggerin -- %{_datadir}/icons/elementary
@@ -93,7 +96,7 @@ gtk-update-icon-cache --force %{_datadir}/icons/elementary &>/dev/null || :
 %{_datadir}/icons/elementary/cursor.theme
 %{_datadir}/icons/elementary/index.theme
 
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
 
 %files gimp-palette
 %{_datadir}/gimp/2.0/palettes/elementary.gpl

anda/desktops/elementary/elementary-music/anda.hcl

@@ -1,5 +1,5 @@
 project pkg {
-    rpm {
+	rpm {
-        spec = "elementary-music.spec"
+		spec = "elementary-music.spec"
-    }
+	}
 }

anda/desktops/elementary/elementary-music/elementary-music.spec

@@ -10,7 +10,7 @@ utilizes Granite for a consistent and slick UI.}
 
 Name:           elementary-music
 Summary:        Music player and library from elementary
-Version:        7.0.1
+Version:        7.1.0
 Release:        2%{?dist}
 License:        LGPL-2.0-or-later
 
@@ -23,6 +23,7 @@ BuildRequires:  gettext
 BuildRequires:  meson
 BuildRequires:  libappstream-glib
 BuildRequires:  vala >= 0.26
+BuildRequires:  fdupes
 
 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -77,6 +78,8 @@ This package contains files needed for developing with Music.
 %meson_install
 %find_lang %{appname}
 
+%fdupes %buildroot%_datadir/icons/hicolor/
+
 
 %check
 desktop-file-validate \