fix(voicevox): try to use large runners (#1865 )

(cherry picked from commit 9224889290)
fix(ci/bootstrap): don't remove golang-bin system package
2026-06-19 01:50:38 +00:00 · 2024-08-08 14:46:49 +00:00 · 2024-08-08 21:59:03 +08:00 · 2024-08-08 21:51:56 +08:00 · 2024-08-08 21:45:47 +08:00 · 2024-08-08 21:36:55 +08:00
235 changed files with 1427 additions and 2918 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - frawhide
+      - el9
  pull_request:
    branches:
-      - frawhide
+      - el9
  merge_group:
    branches:
-      - frawhide
+      - el9
  workflow_dispatch:
  workflow_call:

@@ -23,7 +23,7 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:el9
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,11 +40,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["9"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
+      image: ghcr.io/terrapkg/builder:el${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -63,15 +63,16 @@ jobs:

      - name: Include custom build template instead of package default
        run: |
-          cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+          cp -v mock-configs/el9.tpl /etc/mock/templates/
+          cp -v mock-configs/epel9.tpl /etc/mock/templates/

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-el${{ matrix.version }}+epel-${{ matrix.pkg.arch }}.cfg

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

      - name: Generating artifact name
        id: art
@@ -94,7 +95,7 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }} anda-build/rpm/rpms/*
+            terra-el${{ matrix.version }} anda-build/rpm/rpms/*

      - name: Upload source packages to subatomic
        if: github.event_name == 'push'
@@ -102,7 +103,7 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
+            terra-el${{ matrix.version }}-source anda-build/rpm/srpm/*

      - name: Notify Madoguchi (Success)
        if: success() && github.event_name == 'push'
@@ -7,50 +7,65 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["rawhide"]
+        version: ["9"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
+      image: docker.io/library/almalinux:${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: el${{ matrix.version }}
+          fetch-depth: 1
+
      - name: Install repositories
-        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel cargo podman fuse-overlayfs
+        run: |
+          dnf install -y 'dnf-command(config-manager)'
+          dnf config-manager --set-enabled crb
+          dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${{ matrix.version }}.noarch.rpm
+          dnf install -y mock wget git-core openssl-devel cargo podman fuse-overlayfs rpm-build mock
+          dnf builddep -y anda/{terra/{mock-configs,srpm-macros},tools/buildsys/subatomic}/*.spec
+
+      - name: Vendor Go
+        run: |
+          rm /usr/bin/go
+          curl -L https://go.dev/dl/go1.22.6.linux-${{ matrix.arch == 'aarch64' && 'arm64' || 'amd64' }}.tar.gz -o go.tar.gz
+          tar xf go.tar.gz go/bin/go
+          cp go/bin/go /usr/local/bin/

      - name: Install Anda
        run: cargo install anda

-      - uses: actions/checkout@v4
-        with:
-          ref: f${{ matrix.version }}
-          fetch-depth: 1
      - name: Build terra-mock-configs
        run: |
          echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV
          export PATH=$PATH:/github/home/.cargo/bin
          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/terra/mock-configs/pkg -p rpm
+          anda build -c almalinux-${{ matrix.version }}-${{ matrix.arch }} anda/terra/mock-configs/pkg --rpm-builder=rpmbuild
      - name: Install terra-mock-configs
-        run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
+        run: dnf install -y anda-build/rpm/rpms/terra-mock-configs*.rpm

      - name: Build anda-srpm-macros
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/terra/srpm-macros/pkg
+        run: anda build -c terra-el${{ matrix.version }}+epel-${{ matrix.arch }}.cfg anda/terra/srpm-macros/pkg --rpm-builder=rpmbuild

      - name: Build Subatomic
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/subatomic/pkg
+        run: anda build -c terra-el${{ matrix.version }}+epel-${{ matrix.arch }}.cfg anda/tools/buildsys/subatomic/pkg --rpm-builder=rpmbuild
      - name: Install Subatomic
-        run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+        run: dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm

+      - name: Install Build Dependencies for Andaman
+        run: dnf builddep -y anda/tools/buildsys/anda/*.spec
      - name: Build Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg
+        run: anda build -c terra-el${{ matrix.version }}+epel-${{ matrix.arch }} anda/tools/buildsys/anda/pkg --rpm-builder=rpmbuild

      - 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/*
+            terra-el${{ matrix.version }} anda-build/rpm/rpms/*

      - name: Upload source packages to subatomic
        if: github.event_name == 'push'
@@ -58,4 +73,4 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
+            terra-el${{ matrix.version }}-source anda-build/rpm/srpm/*
@@ -44,12 +44,12 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["9"]
        arch: ${{ fromJson(needs.parse.outputs.arch) }}
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:el${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -68,10 +68,11 @@ jobs:

      - name: Include custom build template instead of package default
        run: |
-          cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+          cp -v mock-configs/el9.tpl /etc/mock/templates/
+          cp -v mock-configs/epel9.tpl /etc/mock/templates/

      - name: Build with Andaman
-        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg
+        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c mock-configs/terra-el${{ matrix.version }}+epel-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -93,14 +94,14 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }} anda-build/rpm/rpms/*
+            terra-el${{ matrix.version }} anda-build/rpm/rpms/*

      - name: Upload source packages to subatomic
        run: |
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
+            terra-el${{ matrix.version }}-source anda-build/rpm/srpm/*

      - name: Notify Madoguchi (Success)
        if: success()
@@ -11,11 +11,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["9"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:el${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -34,10 +34,11 @@ jobs:

      - name: Include custom build template instead of package default
        run: |
-          cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+          cp -v mock-configs/el9.tpl /etc/mock/templates/
+          cp -v mock-configs/epel9.tpl /etc/mock/templates/

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-el${{ matrix.version }}+epel-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -59,7 +60,7 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }} anda-build/rpm/rpms/*
+            terra-el${{ matrix.version }} anda-build/rpm/rpms/*

      - name: Upload source packages to subatomic
        if: github.event_name == 'push'
@@ -67,7 +68,7 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
+            terra-el${{ matrix.version }}-source anda-build/rpm/srpm/*

      - name: Notify Madoguchi (Success)
        if: success()
@@ -7,7 +7,7 @@ export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":
 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
+	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra-el$3/builds/f -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
 	exit 0
 fi

@@ -17,5 +17,5 @@ for f in anda-build/rpm/rpms/*; do
 	r=$(lesspipe.sh $f | grep -E "Release\s*: " | sed "s@Release\s*: @@")
 	d=${p/\%v/$v}
 	d=${d/\%r/$r}
-	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
+	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terra-el$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
 done
@@ -1,52 +0,0 @@
-name: Update per branch
-on:
-  schedule:
-    - cron: "*/30 * * * *"
-  workflow_dispatch:
-
-jobs:
-  autoupdate:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        branch:
-          - frawhide
-          - f39
-          - f40
-          - f41
-          - el9
-    container:
-      image: ghcr.io/terrapkg/builder:frawhide
-      options: --cap-add=SYS_ADMIN --privileged
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ matrix.branch }}
-          fetch-depth: 0
-          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
-
-      - name: Install SSH signing key & Set up git repository
-        run: |
-          mkdir -p ${{ runner.temp }}
-          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
-          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-
-      - name: Run Update
-        run: anda update -vv --filters updbranch=1 --labels branch=${{ matrix.branch }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RUST_BACKTRACE: full
-
-      - name: Save
-        run: |
-          if [[ `git status --porcelain` ]]; then
-            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"
-            msg="bump(branch): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
-            git commit -S -a -m "$msg"
-            git push -u origin --all
-          fi
@@ -3,9 +3,7 @@ name: Push comps updates
 on:
  push:
    branches:
-      - frawhide
-      - f40
-      - f39
+      - el9
    paths:
      - comps.xml
  workflow_dispatch:
@@ -20,8 +18,7 @@ jobs:
      - name: Push to subatomic
        run: |
          branch=${{ github.ref_name }}
-          ver=${branch/f/}
          subatomic-cli upload-comps \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            "terra${ver}" comps.xml
+            "terra-${branch}" comps.xml
@@ -25,7 +25,7 @@ jobs:
          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
-        run: anda update -vv --excludes nightly=1 --excludes updbranch=1
+        run: anda update -vv --filters nightly=0
        env:
          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full
@@ -1,7 +1,9 @@
 # Contributing

-First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please [join our chats](https://wiki.ultramarine-linux.org/en/community/community/).
+First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q).

- [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
- [FAQ](https://developer.fyralabs.com/terra/faq)
- [Policy](https://developer.fyralabs.com/terra/policy)
+## Documentations
+
+* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
+* [FAQ](https://developer.fyralabs.com/terra/faq)
+* [Policy](https://developer.fyralabs.com/terra/policy)
@@ -7,31 +7,16 @@
 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.

-See the introduction at [our website](https://terra.fyralabs.com).
-
 This monorepo contains the package manifests for all packages in Terra.

 ## Installation
-
 ```bash
 sudo dnf install --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' --setopt='terra.gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc' terra-release
 ```
-
-If you are using immutable/atomic editions of Fedora, run the following commands instead:
-
-```bash
-curl -fsSL https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo | pkexec tee /etc/yum.repos.d/terra.repo
-sudo rpm-ostree install terra-release
-```
+You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is.

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

 ## Questions?
-
-Feel free to reach out by [joining our community](https://wiki.ultramarine-linux.org/en/community/community/). We're always happy to help!
-
- [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
- [FAQ](https://developer.fyralabs.com/terra/faq)
- [Policy](https://developer.fyralabs.com/terra/policy)
+Feel free to reach out on [Discord](https://discord.gg/5fdPuxTg5Q). We're always happy to help!
@@ -8,7 +8,7 @@ Release:		1%?dist
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:			https://apps.ankiweb.net/
-BuildRequires:	python3-pip rpm_macro(fdupes) cargo
+BuildRequires:	python3-pip cargo
 Requires:		python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
 Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
 Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
@@ -50,8 +50,6 @@ cp -r ./{_aqt,anki*,aqt*} %buildroot/usr/lib/python3*/site-packages/

 rm -rf %buildroot%_bindir/{distro,flask,jsonschema,markdown_py,normalizer,send2trash,waitress-serve}

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

 %files
 %license LICENSE
@@ -4,7 +4,7 @@ Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
-BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
+BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson python3-pyqt5-sip
 BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
 Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash python3-orjson mpv python3-qt5-webengine
@@ -46,8 +46,6 @@ chmod 755 %{buildroot}%{_bindir}/anki
 find %{buildroot} -iname __pycache__ | xargs -r rm -rf
 find %{buildroot} -iname direct_url.json | xargs -r rm -rf

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

 %files
 %license LICENSE*
@@ -4,7 +4,7 @@ Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
-BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
+BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson
 BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-webengine
 Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
@@ -50,9 +50,6 @@ find %{buildroot} -iname direct_url.json | xargs -r rm -rf

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

-%fdupes %_libdir/python*/site-packages/_aqt/data/
-
-
 %files
 %license LICENSE*
 %doc README*
@@ -2,11 +2,11 @@
 %global _build_id_links none

 %ifarch x86_64
-%global src ArmCord-%version-linux-x64
+%global src ArmCord-%version
 %elifarch aarch64
-%global src ArmCord-%version-linux-arm64
+%global src ArmCord-%version-arm64
 %elifarch armv7l
-%global src ArmCord-%version-linux-armv7l
+%global src ArmCord-%version-armv7l
 %endif

 # Exclude private libraries
@@ -14,7 +14,7 @@
 %global __provides_exclude_from %{_datadir}/armcord/.*\\.so

 Name:			armcord-bin
-Version:		3.3.0
+Version:		3.2.7
 Release:		1%?dist
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
@@ -1,16 +1,15 @@
 %define debug_package %nil

 Name:		armcord
-Version:	3.3.0
+Version:	3.2.7
 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
-Packager:	madonuko <mado@fyralabs.com>
 Requires:	electron xdg-utils
-BuildRequires:	git-core add-determinism pnpm
+BuildRequires:	nodejs-npm git add-determinism
 Conflicts:	armcord-bin
 BuildArch:	noarch

@@ -38,8 +37,8 @@ EOF


 %build
-pnpm install --no-frozen-lockfile
-pnpm run packageQuick
+npx pnpm@7 install --no-frozen-lockfile
+npm run packageQuick


 %install
@@ -51,16 +50,13 @@ install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png

 %files
 %doc README.md
-%license license.txt
+%license LICENSE
 /usr/bin/armcord
 /usr/share/applications/ArmCord.desktop
 /usr/share/pixmaps/armcord.png
 /usr/share/armcord/app.asar

 %changelog
-* Mon Aug 26 2024 madonuko <mado@fyralabs.com> - 3.3.0-1
- Update to license.txt
-
 * Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
 - Remove libnotify dependency.
 - Fix desktop entry.
@@ -68,3 +64,4 @@ install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png

 * Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
 - Initial package
+
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

 Name:           discord-canary
-Version:        0.0.479
+Version:        0.0.462
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

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

 Name:           discord-ptb
-Version:        0.0.101
+Version:        0.0.96
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.66
+Version:		0.0.61
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,5 +1,5 @@
-%global commit 943fc151f7c1927cb450456de9bb838311d9cc24
-%global commit_date 20240831
+%global commit 5d0131a00c52b791cad3543e33017c28e021cb92
+%global commit_date 20240727
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision
@@ -9,14 +9,14 @@ Summary:        UI for building, configuring and running Monado, the open source
 License:        AGPL-3.0-or-later
 URL:            https://gitlab.com/gabmus/envision/
 Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo 
+BuildRequires:  meson ninja-build cargo
 BuildRequires:  pkgconfig(glib-2.0) >= 2.66
 BuildRequires:  pkgconfig(gio-2.0) >= 2.66
 BuildRequires:  pkgconfig(gtk4) >= 4.10.0
 BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
 BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  openssl-devel-engine
+BuildRequires:  openssl-devel
 BuildRequires:  openxr-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			feishin
-Version:		0.7.3
+Version:		0.7.1
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
@@ -5,9 +5,9 @@
 %global pure_protobuf_version 2.0.0

 Name:           komikku
-Version:        1.56.0
+Version:        1.51.1
 %forgemeta
-Release:        1%?dist
+Release:        %autorelease
 Summary:        A manga reader for GNOME

 BuildArch:      noarch
@@ -1,6 +1,6 @@
-%global commit 7c672e33a5eab0564383127c8837b1034a84357b
+%global commit 3c7b6db205c027d3c4f12285719367792e471b57
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240831
+%global commit_date 20240725
 %global ver 0.38.0

 Name:           mpv-nightly
@@ -1,4 +1,4 @@
-%global ver 2024-08-31
+%global ver 2024-07-29
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -13,8 +13,8 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			voicevox
-Version:		0.20.0
-Release:		1%?dist
+Version:		0.19.2
+Release:		4%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
 URL:			https://voicevox.hiroshiba.jp
@@ -9,7 +9,6 @@ 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
@@ -274,8 +273,6 @@ workspaces.
 # Remove absolute symlink and replace with relative symlink
 rm -f %{buildroot}%{_bindir}/quickchar

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

 %{__ln_s} -fv %{_bindir}/quickchar %{_libdir}/quickchar/quickchar
@@ -14,7 +14,6 @@ Patch1:         gtk-extents.patch
 Patch2:         focus-prevention-disable.patch

 Conflicts:     compiz
-BuildRequires: rpm_macro(fdupes)
 BuildRequires: libX11-devel
 BuildRequires: libdrm-devel
 BuildRequires: libXcursor-devel
@@ -104,9 +103,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 mkdir -p %{buildroot}%{_datadir}/compiz/icons/hicolor/{scalable/{apps,\
 categories},22x22/{categories,devices,mimetypes}}

-%fdupes %buildroot%_datadir/glib-2.0/schemas/
-%fdupes %buildroot%_datadir/ccsm/icons/hicolor/scalable/apps/
-

 %files -f compiz.lang
 %doc AUTHORS README NEWS
@@ -2,8 +2,8 @@

 Name:           elementary-appcenter
 Summary:        Software Center from elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.4.0
+Release:        2%{?dist}
 License:        GPL-3.0

 Provides:       appcenter = %{version}-%{release}
@@ -18,7 +18,6 @@ BuildRequires:  vala

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

 Requires:       hicolor-icon-theme

@@ -46,8 +45,6 @@ functions (sin, cos, and tan).

 %find_lang %{appname}

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

 %check
 desktop-file-validate \
@@ -32,7 +32,6 @@ BuildRequires:  libhandy >= 0.90.0
 BuildRequires:  meson
 BuildRequires:  vala
 BuildRequires:  evolution-data-server-devel
-BuildRequires:  fdupes

 Requires:       hicolor-icon-theme

@@ -65,8 +64,6 @@ This package contains the development files.

 %find_lang %{appname}

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

 %check
 %dnl desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
@@ -3,8 +3,8 @@

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

 URL:            https://github.com/elementary/camera
@@ -15,12 +15,11 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46
 BuildRequires:  vala
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(granite) >= 6.0.0
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
@@ -47,7 +46,7 @@ Camera is a simple app to take photos with a webcam.

 %find_lang %{appname}

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



@@ -28,7 +28,6 @@ BuildRequires:  pkgconfig(webkit2gtk-4.1)
 BuildRequires:  pkgconfig(gcr-4)
 BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(webkitgtk-6.0)
-BuildRequires:  fdupes

 Requires:       NetworkManager
 Requires:       hicolor-icon-theme
@@ -58,8 +57,6 @@ Written in Vala and using WebkitGtk+.

 %find_lang %{appname}

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

 %check
 desktop-file-validate \
@@ -38,7 +38,6 @@ 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

@@ -69,8 +68,6 @@ This package contains the development headers.

 %find_lang %{appname}

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

 %files -f %{appname}.lang
 %doc README.md
@@ -5,8 +5,8 @@

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

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

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


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

@@ -88,6 +84,9 @@ CFLAGS="$CFLAGS -Wno-implicit-function-declaration"

 %find_lang %{appname}

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

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

 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/contractor/*.contract
@@ -18,7 +18,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
-BuildRequires:  fdupes

 BuildRequires:  mesa-libEGL-devel

@@ -83,8 +82,6 @@ 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/
@@ -18,7 +18,6 @@ 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.
@@ -66,8 +65,6 @@ 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
@@ -23,7 +23,6 @@ BuildRequires:  gettext
 BuildRequires:  meson
 BuildRequires:  libappstream-glib
 BuildRequires:  vala >= 0.26
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -79,8 +78,6 @@ This package contains files needed for developing with Music.
 %meson_install
 %find_lang %{appname}

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

 %check
 desktop-file-validate \
@@ -3,8 +3,8 @@

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

 URL:            https://github.com/elementary/onboarding
@@ -17,7 +17,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
-BuildRequires:  fdupes
 BuildRequires:  git-core
 BuildRequires:  cmake

@@ -65,10 +64,6 @@ Foundation.

 %find_lang %{appname}

-%fdupes %buildroot%_datadir/icons/hicolor/
-%fdupes %buildroot%_datadir/locale/
-
-
 %check
 desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop
@@ -18,7 +18,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46
 BuildRequires:  vala >= 0.24
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -44,8 +43,6 @@ Screenshot tool designed for elementary.
 %install
 %meson_install

-%fdupes %buildroot%_datadir/icons/hicolor/
-%fdupes %buildroot%_datadir/locale
 %find_lang %{appname}


@@ -3,7 +3,7 @@
 %global iface   io.elementary.SettingsDaemon.AccountsService

 Name:           elementary-settings-daemon
-Version:        8.1.0
+Version:        8.0.0
 Release:        1%?dist
 Summary:        Settings Daemon and Portal for Pantheon
 License:        GPL-3.0-or-later
@@ -3,7 +3,7 @@

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

@@ -15,7 +15,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
-BuildRequires:  fdupes
 
 BuildRequires:  pkgconfig(flatpak)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -42,7 +41,6 @@ Pantheon without needing to use a command line application.
 %install
 %meson_install

-%fdupes %buildroot%_datadir/icons/hicolor/
 %find_lang %{appname}


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

 BuildRequires:  meson
-BuildRequires:  fdupes

 BuildArch:      noarch

@@ -39,7 +38,6 @@ physical, and pleasant.
 %install
 %meson_install

-%fdupes %buildroot%_datadir/sounds/elementary/stereo/


 %files
@@ -15,7 +15,6 @@ BuildRequires:  gettext xorg-x11-server-Xvfb
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.40.0
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.39
@@ -64,7 +63,6 @@ notifications when using the fish shell.
 %install
 %meson_install

-%fdupes %buildroot%_datadir/locale/
 %find_lang %{appname}


@@ -3,7 +3,7 @@

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

@@ -16,7 +16,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  sassc
-BuildRequires:  fdupes

 # gtk-version-specific subpackages were dropped in Fedora 34
 Obsoletes:      %{name}-gtk2 < 5.4.2-4.20210216.gitf0c3b7f
@@ -55,8 +54,6 @@ This package contains the plank theme.
 %install
 %meson_install

-%fdupes %buildroot%_datadir/themes/
-

 %check
 appstream-util validate-relax --nonet \
@@ -3,7 +3,7 @@

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

@@ -15,7 +15,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(clutter-gst-3.0)
 BuildRequires:  pkgconfig(clutter-gtk-1.0)
@@ -50,8 +49,6 @@ to the desktop.
 %install
 %meson_install

-%fdupes %buildroot%_datadir/icons/hicolor/
-%fdupes %buildroot%_datadir/locale/
 %find_lang %{appname}


@@ -2,8 +2,8 @@

 Name:           gala
 Summary:        Gala window manager
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.1.3
+Release:        2%{?dist}
 License:        GPL-3.0-or-later
 Epoch:          1

@@ -17,7 +17,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.48.2
 BuildRequires:  vala >= 0.48
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.50
@@ -59,8 +58,6 @@ This package contains the development headers.
 %install
 %meson_install

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

 %find_lang granite-7

@@ -15,7 +15,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.34.1
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
@@ -40,7 +39,6 @@ requests access to location services.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang %{name}


@@ -15,7 +15,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.34.1
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
 BuildRequires:  pkgconfig(polkit-agent-1)
@@ -40,7 +39,6 @@ An agent for Polkit authorization designed for Pantheon.

 %install
 %meson_install
-%fdupes %buildroot/%_datadir/locale/
 %find_lang %{appname}


@@ -19,7 +19,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite)
@@ -49,7 +48,6 @@ that allows the user to manage accessibility settings.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang %{plug_name}-plug


@@ -3,8 +3,8 @@
 %global srcname switchboard-plug-about

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

 Name:           switchboard-plug-about
 Summary:        Switchboard System Information plug
@@ -15,19 +15,25 @@ License:        GPL-3.0-or-later
 URL:            https://github.com/elementary/switchboard-plug-about
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

+Patch0:         https://github.com/elementary/switchboard-plug-about/compare/6.2.0..72d7da13da2824812908276751fd3024db2dd0f8.patch
+
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
-BuildRequires:  fdupes
+BuildRequires:  vala >= 0.22.0

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

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -49,26 +55,24 @@ This switchboard plug shows system information.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug

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


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


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

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

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


 %changelog
@@ -4,7 +4,7 @@

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

 Name:           switchboard-plug-applications
 Summary:        Switchboard Applications plug
@@ -18,11 +18,15 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
-BuildRequires:  fdupes
+BuildRequires:  vala >= 0.22.0

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

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -43,11 +47,10 @@ that allows the user to manage application settings.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
-mv %buildroot%_datadir/metainfo/%plug_rdnn.metainfo.xml %buildroot%_datadir/metainfo/%plug_rdnn.metainfo.xml || true
-%find_lang %{plug_rdnn}
+mv %buildroot%_datadir/metainfo/%plug_rdnn.appdata.xml %buildroot%_datadir/metainfo/%plug_rdnn.metainfo.xml || true
+%find_lang %{plug_name}-plug

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


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


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

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

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

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

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

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

 Name:           switchboard-plug-datetime
 Summary:        Switchboard Date & Time Plug
@@ -18,8 +18,10 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
-BuildRequires:  fdupes
+BuildRequires:  vala

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

 Requires:       switchboard%{?_isa}
@@ -40,25 +42,24 @@ Supplements:    switchboard%{?_isa}

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug

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


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


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

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

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


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

 Name:           switchboard-plug-display
 Summary:        Switchboard Display plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-display
@@ -19,7 +19,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(granite)
@@ -46,7 +45,6 @@ them.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang %{plug_name}-plug


@@ -4,11 +4,11 @@

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

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

@@ -19,10 +19,15 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes

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

 Requires:       gala
@@ -47,8 +52,7 @@ same time. Keyboard shortcuts are also part of this plug.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug


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


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

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


@@ -4,7 +4,7 @@

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

 Name:           switchboard-plug-locale
 Summary:        Switchboard Locale Plug
@@ -19,11 +19,12 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.1
 BuildRequires:  vala
-BuildRequires:  fdupes

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

 Requires:       switchboard%?_isa
@@ -43,8 +44,7 @@ Supplements:    switchboard%?_isa

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
-%find_lang %plug_rdnn
+%find_lang %plug_name-plug


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


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

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

@@ -4,11 +4,11 @@

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

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

@@ -18,9 +18,13 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
+BuildRequires:  vala >= 0.22.0

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

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

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


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


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

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

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


 %changelog
@@ -4,7 +4,7 @@

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

 Name:           switchboard-plug-networking
 Summary:        Switchboard Networking plug
@@ -19,12 +19,15 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes

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

 Requires:       network-manager-applet%{?_isa}
 Requires:       switchboard%{?_isa}
@@ -47,22 +50,21 @@ A switchboard plug for configuring available networks.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug


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


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

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

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


 %changelog
@@ -4,7 +4,7 @@

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

 Name:           switchboard-plug-notifications
 Summary:        Switchboard Notifications plug
@@ -18,10 +18,12 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
-BuildRequires:  fdupes
+BuildRequires:  vala >= 0.22.0

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

 Requires:       gala%{?_isa}
 Requires:       switchboard%{?_isa}
@@ -46,22 +48,21 @@ related to the Notifications plugin for Gala.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug


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


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

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

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


 %changelog
@@ -17,7 +17,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(camel-1.2)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -49,7 +48,6 @@ Manage online accounts and connected applications.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang %{plug_name}-plug

 # remove the specified stock icon from appdata (invalid in libappstream-glib)
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-pantheon-shell
 Summary:        Switchboard Pantheon Shell plug
-Version:        8.0.1
-Release:        1%?dist
+Version:        6.5.0
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/switchboard-plug-pantheon-shell
@@ -20,7 +20,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(gexiv2)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -59,7 +58,6 @@ desktop settings such as the panel, app launcher, and window manager.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang %{plug_name}-plug


@@ -3,8 +3,8 @@
 %global srcname switchboard-plug-parental-controls

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

 Name:           switchboard-plug-parental-controls
 Summary:        Switchboard Screen Time & Limits Plug
@@ -19,14 +19,17 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.1
 BuildRequires:  vala
-BuildRequires:  fdupes

 BuildRequires:  pkgconfig(accountsservice)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(flatpak)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(libhandy-1) >= 0.90.0
+BuildRequires:  pkgconfig(malcontent-0)
+BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  polkit-devel
 BuildRequires:  switchboard-devel
-BuildRequires:  rpm_macro(_unitdir)

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -46,26 +49,24 @@ Supplements:    switchboard%{?_isa}

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug

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


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


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

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

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

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

 %changelog
 * Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - 6.0.1-1
@@ -4,7 +4,7 @@

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

 Name:           switchboard-plug-power
 Summary:        Switchboard Power Plug
@@ -18,10 +18,12 @@ Source0:        %url/archive/%version/%srcname-%version.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
-BuildRequires:  fdupes
+BuildRequires:  vala

 BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  polkit-devel
 BuildRequires:  switchboard-devel

 Requires:       switchboard%?_isa
@@ -41,25 +43,24 @@ Supplements:    switchboard%?_isa

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
-%find_lang %plug_rdnn
+%find_lang %plug_name-plug

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


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


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

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

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

 %_libexecdir/io.elementary.logind.helper
 %_datadir/dbus-1/system-services/io.elementary.logind.helper.service
@@ -19,8 +19,6 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes
-
 BuildRequires:  cups-devel

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
@@ -48,7 +46,6 @@ A printers plug for Switchboard.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang %{plug_name}-plug


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

 Name:           switchboard-plug-security-privacy
 Summary:        Switchboard Security & Privacy Plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.1.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%name
@@ -4,7 +4,7 @@

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

 Name:           switchboard-plug-sharing
 Summary:        Switchboard Sharing Plug
@@ -18,9 +18,12 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
+BuildRequires:  vala >= 0.22.0

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

 Requires:       rygel
 Requires:       switchboard%{?_isa}
@@ -43,21 +46,21 @@ Configure the sharing of system services.
 %install
 %meson_install

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


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


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

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

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


 %changelog
@@ -4,7 +4,7 @@

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

 Name:           switchboard-plug-sound
 Summary:        Switchboard Sound Plug
@@ -18,12 +18,17 @@ Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
-BuildRequires:  fdupes
+BuildRequires:  vala >= 0.34.1

 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libcanberra)
+BuildRequires:  pkgconfig(libcanberra-gtk)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(libpulse-mainloop-glib)
+BuildRequires:  pkgconfig(switchboard-2.0)

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -43,10 +48,9 @@ A sound plug for Switchboard.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug

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


@@ -54,14 +58,13 @@ sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.met
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


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

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

 %{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
-%{_datadir}/glib-2.0/schemas/%{plug_name}.gschema.xml


 %changelog
@@ -4,7 +4,7 @@

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

 Name:           switchboard-plug-useraccounts
 Summary:        Switchboard User Accounts Plug
@@ -18,11 +18,17 @@ Source0:        %url/archive/%version/%srcname-%version.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.1
-BuildRequires:  fdupes
+BuildRequires:  vala

 BuildRequires:  pkgconfig(accountsservice)
-BuildRequires:  pkgconfig(gnome-desktop-4)
+BuildRequires:  gobject-introspection-devel
+BuildRequires:  gnome-desktop3-devel
+BuildRequires:  pkgconfig(granite) >= 0.5
+BuildRequires:  pkgconfig(libhandy-1) >= 0.90.0
+BuildRequires:  pkgconfig(polkit-gobject-1)
 BuildRequires:  pkgconfig(pwquality)
+BuildRequires:  polkit-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  switchboard-devel

 Requires:       switchboard%?_isa
@@ -42,22 +48,21 @@ Supplements:    switchboard%?_isa

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
-%find_lang %plug_rdnn
+%find_lang %plug_name-plug


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


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

-%_libdir/switchboard-3/%plug_type/lib%plug_name.so
-%_libdir/switchboard-3/system/useraccounts/guest-session-toggle
-%_datadir/metainfo/%plug_rdnn.metainfo.xml
+%_libdir/switchboard/%plug_type/lib%plug_name.so
+%_libdir/switchboard/system/pantheon-useraccounts/guest-session-toggle
+%_datadir/metainfo/%plug_rdnn.appdata.xml
 %_datadir/polkit-1/actions/%plug_rdnn.policy


@@ -19,7 +19,7 @@ BuildRequires:  vala
 BuildRequires:  pkgconfig(granite-7)
 BuildRequires:  pkgconfig(gtk4)
 BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  fdupes sassc
+BuildRequires:  sassc

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

@@ -71,9 +71,6 @@ mkdir -p %{buildroot}/%{_libdir}/%{name}/network
 mkdir -p %{buildroot}/%{_libdir}/%{name}/personal
 mkdir -p %{buildroot}/%{_libdir}/%{name}/system

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

 %check
 desktop-file-validate \
@@ -5,8 +5,8 @@

 Name:           wingpanel-applications-menu
 Summary:        Lightweight and stylish app launcher
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.11.1
+Release:        2%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/applications-menu
@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.32.1
-BuildRequires:  fdupes
+

 BuildRequires:  appstream-vala

@@ -52,7 +52,6 @@ The lightweight and stylish app launcher from elementary.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang slingshot


@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-bluetooth
 Summary:        Bluetooth Indicator for wingpanel
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.1
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes
+

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(granite) >= 6.0.0
@@ -45,7 +45,6 @@ A bluetooth indicator for wingpanel.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang bluetooth-indicator

 # remove the specified stock icon from metainfo (invalid in libappstream-glib)
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-datetime
 Summary:        Datetime Indicator for wingpanel
-Version:        2.4.2
-Release:        1%?dist
+Version:        2.4.1
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-datetime
@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes
+

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(granite) >= 6.0.0
@@ -45,7 +45,6 @@ A datetime indicator for wingpanel.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang datetime-indicator

 # remove the specified stock icon from appdata (invalid in libappstream-glib)
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-keyboard
 Summary:        Keyboard Indicator for wingpanel
-Version:        2.4.2
-Release:        1%?dist
+Version:        2.4.1
+Release:        2%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes
+

 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite)
@@ -45,7 +45,6 @@ A keyboard indicator for wingpanel.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang keyboard-indicator


@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-network
 Summary:        Network Indicator for wingpanel
-Version:        7.1.1
-Release:        1%?dist
+Version:        7.1.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-network
@@ -23,7 +23,7 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libnm)
 BuildRequires:  pkgconfig(libnma)
 BuildRequires:  pkgconfig(wingpanel) >= 3.0.0
-BuildRequires:  fdupes
+

 Requires:       network-manager-applet%{?_isa}
 Requires:       wingpanel%{?_isa}
@@ -46,7 +46,6 @@ A network indicator for wingpanel.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang network-indicator


@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-nightlight
 Summary:        Night Light Indicator for wingpanel
-Version:        2.1.3
-Release:        1%?dist
+Version:        2.1.2
+Release:        1%{?dist}
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-nightlight
@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes
+

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(gobject-2.0)
@@ -43,7 +43,6 @@ A wingpanel indicator for Night Light.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang nightlight-indicator


@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-notifications
 Summary:        Notifications Indicator for wingpanel
-Version:        7.1.1
-Release:        1%?dist
+Version:        7.1.0
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-notifications
@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes
+

 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -46,7 +46,6 @@ A notifications indicator for wingpanel.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang notifications-indicator


@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-power
 Summary:        Power indicator for wingpanel
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.2.1
+Release:        1%{?dist}
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-power
@@ -16,9 +16,9 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes

-BuildRequires:  fdupes
+
+
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite) >= 6.0.0
 BuildRequires:  pkgconfig(gtk+-3.0)
@@ -47,7 +47,6 @@ A power indicator for wingpanel.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang power-indicator

 # remove the specified stock icon from appdata (invalid in libappstream-glib)
@@ -16,9 +16,9 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes

-BuildRequires:  fdupes
+
+
 BuildRequires:  pkgconfig(accountsservice)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite) >= 5.3.0
@@ -45,7 +45,6 @@ A session Indicator for wingpanel.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang session-indicator


@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-sound
 Summary:        Sound Indicator for wingpanel
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.0.0
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/%{name}
@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-BuildRequires:  fdupes
+

 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite)
@@ -46,7 +46,6 @@ A sound indicator for wingpanel.

 %install
 %meson_install
-%fdupes %buildroot%_datadir/locale/
 %find_lang sound-indicator

 # remove the specified stock icon from appdata (invalid in libappstream-glib)
@@ -6,8 +6,8 @@ launcher.}

 Name:           wingpanel
 Summary:        Stylish top panel
-Version:        8.0.0
-Release:        1%?dist
+Version:        3.0.5
+Release:        1%{?dist}
 License:        GPL-2.0-or-later
 Epoch:          1

@@ -11,16 +11,15 @@ URL:            https://github.com/fthx/appmenu-is-back
 BuildArch:      noarch

 Source0:        https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz
-Patch0:         https://github.com/fthx/appmenu-is-back/compare/v2..703a31acf900eb7bcab3462baeefa815ec7f13ab.patch

-Requires:       (gnome-shell >= 46~ with gnome-shell < 48~)
+Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
 Recommends:     gnome-extensions-app

 %description
 This extension brings back the app menu in the top panel, for GNOME 45 and later.

 %prep
-%autosetup -n appmenu-is-back-%{version} -p1
+%autosetup -n appmenu-is-back-%{version}

 %install
 install -Dm644 metadata.json %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/metadata.json
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit 3f43a2ec5e6ef3d1c28636b420f49fd96f5d83a0
+%global commit 4f1c08054b1f975176375f615cf9d2470f7ec7ed
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -20,7 +20,7 @@ BuildRequires: pkgconfig(Qt5Core)
 BuildRequires: pkgconfig(Qt5Quick)
 BuildRequires: cppcheck
 BuildRequires: doxygen
-BuildRequires: fdupes
+

 %description
 API to interface with the Lomiri desktop environment.
@@ -52,7 +52,6 @@ sed -i 's?lib/${CMAKE_LIBRARY_ARCHITECTURE}?%{_lib}?' CMakeLists.txt

 %install
 %cmake_install
-%fdupes %buildroot%_docdir/liblomiri-api

 %files
 %doc README
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit a057a37b56b96efddc7f42577407a3a08a0575cf
+%global commit af441bdb31bb76b207119a8c91eef3fa93c0c078
 %forgemeta

 Name:           lomiri-app-launch
@@ -24,7 +24,7 @@ BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(libglog)
 BuildRequires: pkgconfig(liblomiri-api)
 BuildRequires: pkgconfig(systemd)
-BuildRequires: fdupes
+

 %description
 Upload Download Manager performs uploads and downloads from a centralized
@@ -56,7 +56,6 @@ sed -e "s/-Werror//g" -i CMakeLists.txt

 %install
 %cmake_install
-%fdupes %buildroot%_docdir/%name/cpp/html/
 %find_lang %{name}

 %files -f %{name}.lang
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 849214f4bb1a40fae692e18fed5d599e0d8c7af1
+%global commit 0f9ce94e628a245cb3a7e97a7a169cb94e04c9ea
 %forgemeta

 Name:       lomiri-system-settings
@@ -33,7 +33,7 @@ BuildRequires: qt5-qtdeclarative-devel
 BuildRequires: qt5-pim-devel
 BuildRequires: python3-rpm-macros
 BuildRequires: qt5-qtsvg-devel
-BuildRequires: fdupes
+
 Requires:      qt5-qtgraphicaleffects
 Requires:      qt5-qtfeedback

@@ -89,9 +89,6 @@ Examples for Lomiri-ui-toolkit.
 %make_install INSTALL_ROOT=%{buildroot} STRIP=/bin/true
 # Used by apicheck during tests only
 rm -rf %{buildroot}%{_qt5_qmldir}/Extinct
-%fdupes %buildroot%_libdir/qt5/qml/Lomiri/Components/
-%fdupes %buildroot%_libdir/qt5/examples/%name/examples/
-
 %find_lang %{name}
 %find_lang %{name}-gallery

@@ -1,4 +1,4 @@
-%define _ubuntu_rel 7ubuntu1
+%define _ubuntu_rel 1ubuntu4

 Name:    unity-session
 Summary: Lightdm profile for Unity 7
@@ -15,7 +15,7 @@ Source0:       %{url}/-/archive/%commit/unityx-%commit.tar.bz2
 Source2:       https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/-/commit/dee596492f006d02e2b39abd072ddd7b37fefe82.diff
 Patch0:        0001-Remove-social-scope.patch

-BuildRequires: fdupes
+
 BuildRequires: cmake
 BuildRequires: g++
 BuildRequires: gcc
@@ -163,8 +163,6 @@ rm -rf .%{_datadir}/unityx
 ln -s %{_datadir}/unity .%{_datadir}/unityx
 popd

-%fdupes %buildroot%_datadir/themes/
-
 %find_lang unityx
 %find_lang xfce4-windowck-plugin

@@ -1,5 +1,5 @@
 Name:			terra-blueprint-compiler
-Version:		0.14.0
+Version:		0.12.0
 Release:		1%?dist
 License:		LGPL-3.0-or-later
 Summary:		Markup language for GTK user interfaces
@@ -6,22 +6,21 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 %ifarch x86_64
-%define a x64
+%define _aaa x64
 %elifarch aarch64
-%define a arm64
+%define _aaa arm64
 %endif

 Name:			codium
-Version:		1.92.2.24228
+Version:		1.91.1.24193
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
 URL:			https://vscodium.com/
-Source0:		https://github.com/VSCodium/vscodium/releases/download/%version/VSCodium-linux-%a-%version.tar.gz
+Source0:		https://github.com/VSCodium/vscodium/releases/download/%version/VSCodium-linux-%_aaa-%version.tar.gz
 Source1:		https://raw.githubusercontent.com/VSCodium/vscodium/%version/README.md
 Source2:		https://raw.githubusercontent.com/VSCodium/vscodium/%version/LICENSE
 Requires:		at-spi2-atk cairo expat gtk3 xrandr mesa-libgbm nspr nss nss-util xdg-utils
-BuildRequires:	rpm_macro(fdupes)

 %description
 VSCodium is a new choice of tool that combines the simplicity of a code editor
@@ -93,8 +92,6 @@ install -dm755 %buildroot%_datadir/bash-completion/completions
 ln -s %_datadir/%name/resources/completions/zsh/_codium %buildroot%_datadir/zsh/site-functions
 ln -s %_datadir/%name/resources/completions/bash/codium %buildroot%_datadir/bash-completion/completions

-%fdupes %_datadir/%name/resources/app/extensions/
-

 %files
 %doc README.md
@@ -1,6 +1,6 @@
-%global commit 267ccdd069df388d0cfd80146c03fe13e1491c5d
+%global commit fb1d91585f8b7e72bc5776085a36205652a0adec
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240831
+%global commit_date 20240724

 Name:           flow-control-nightly
 Version:        %commit_date.%shortcommit
@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.24.1
+Version:		3.22.3
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause
@@ -1,25 +0,0 @@
-From 518d106d6d54bc65d37116e3c5bc940b5c93fb0e Mon Sep 17 00:00:00 2001
-From: Philipp Trulson <der-eismann@users.noreply.github.com>
-Date: Tue, 13 Aug 2024 10:22:14 +0200
-Subject: [PATCH] Change path in systemd service to use package binary
-
---
- utils/systemd/kvrocks.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/systemd/kvrocks.service b/utils/systemd/kvrocks.service
-index c0180b7c..17482b7a 100644
--- a/utils/systemd/kvrocks.service
-+++ b/utils/systemd/kvrocks.service
-@@ -6,7 +6,7 @@ After=network-online.target
- 
- [Service]
- Type=notify
-ExecStart=/usr/local/bin/kvrocks -c /etc/kvrocks/kvrocks.conf
-+ExecStart=/usr/bin/kvrocks -c /etc/kvrocks/kvrocks.conf
- Restart=on-failure
- ExecStop=/bin/kill -s TERM $MAINPID
- RestartSec=10s
-- 
-2.45.2
-
@@ -1,11 +1,10 @@
 Name:           kvrocks
 Version:        2.9.0
-Release:        2%?dist
+Release:        1%?dist
 Summary:        Distributed key value NoSQL database that uses RocksDB
 License:        Apache-2.0
 URL:            https://kvrocks.apache.org/
 Source0:        https://github.com/apache/kvrocks/archive/refs/tags/v%version.tar.gz
-Patch0:         0001-Change-path-in-systemd-service-to-use-package-binary.patch
 Requires:       openssl
 BuildRequires:  autoconf
 BuildRequires:  cmake
@@ -20,7 +19,7 @@ Apache Kvrocks is a distributed key value NoSQL database that uses RocksDB as st
 engine and is compatible with Redis protocol.

 %prep
-%autosetup -p1
+%autosetup

 %build
 unset LDFLAGS
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
madomado	d982d63fa8	fix(voicevox): try to use large runners (#1865 ) (cherry picked from commit `9224889290`)	2024-08-08 14:46:49 +00:00
madonuko	cf45114ec6	fix(ci/bootstrap): don't remove golang-bin system package	2024-08-08 21:59:03 +08:00
madonuko	b1cca81bac	fix(ci/bootstrap): maybe curl -L?	2024-08-08 21:51:56 +08:00
madonuko	762a25efd6	feat(ci/bootstrap): vendor go buildtime	2024-08-08 21:45:47 +08:00
Raboneko	2d6ffc0e7b	add: youtube-music (#1827 ) (#1860 ) * add: youtube-music * fix buildrequires line? * oops * use NodeJS 22 for build? * use pnpm 9 * use pnpm package from fedora and normal nodejs to see if it would still faikl * try node 18 * attempt to conflict node 22 on build * wtf * forgot to add changelog * try vendoring pnpm with nodejs18 * Revert "try vendoring pnpm with nodejs18" This reverts commit `fdc705e87c`. * vendor pnpm and node on buildtime * add packager line * debug dir tree * arch-specific directories fix --------- Co-authored-by: madonuko <madonuko@outlook.com> (cherry picked from commit `ebef13fac5`) Co-authored-by: Cappy Ishihara <cappy@cappuchino.xyz>	2024-08-08 21:36:55 +08:00
Raboneko	7b67d9dd58	fix: voicevox (#1850 ) (#1864 ) (cherry picked from commit `9c856fdf59`) Co-authored-by: madomado <madonuko@outlook.com>	2024-08-08 21:36:41 +08:00
Raboneko	59f2647c1d	fix(codium): remove `--unity-launch` from .desktop (#1851 ) (#1856 ) (cherry picked from commit `4302efd5a8`) Co-authored-by: madomado <madonuko@outlook.com>	2024-08-08 19:23:16 +07:00
Raboneko	0d2ee70a88	fix: gamescope (#1842 ) (#1846 ) * fix: gamescope Signed-off-by: madomado <madonuko@outlook.com> * Update terra-gamescope.spec Signed-off-by: madomado <madonuko@outlook.com> --------- Signed-off-by: madomado <madonuko@outlook.com> (cherry picked from commit `9b9546524f`) Co-authored-by: madomado <madonuko@outlook.com>	2024-08-08 01:04:35 +08:00
madonuko	5f0d8bb297	fix: keyd (#1839 )	2024-08-05 23:23:09 +08:00
Raboneko	0be84eb416	fix: ruffle (#1834 ) (#1838 ) Signed-off-by: madomado <madonuko@outlook.com> (cherry picked from commit `2125b6f6a4`) Co-authored-by: madomado <madonuko@outlook.com>	2024-08-05 16:12:06 +08:00
Raboneko	8e6a74cf9d	bump: keyd (#1815 ) (#1826 ) Signed-off-by: madomado <madonuko@outlook.com> (cherry picked from commit `886c8cb028`) Co-authored-by: madomado <madonuko@outlook.com>	2024-08-03 11:28:47 +08:00
Raboneko	21ea67da9f	fix(zed*): add cargo clean to make for more disk space (#1805 ) (#1812 ) (cherry picked from commit `2497712261`) Co-authored-by: madomado <madonuko@outlook.com>	2024-08-02 12:55:08 +08:00
Raboneko	3a45fdadbb	fix: don't run zed tests by default (#1786 ) (#1792 ) (cherry picked from commit `662487b534`) Co-authored-by: lea <lleyton@fyralabs.com>	2024-08-01 21:13:41 +08:00
Raboneko	b01e8e9cd8	fix: sbctl (#1788 ) (#1799 ) Signed-off-by: madomado <madonuko@outlook.com> (cherry picked from commit `779eeda900`) Co-authored-by: madomado <madonuko@outlook.com>	2024-08-01 21:12:42 +08:00
Raboneko	ae0accc8a5	Update terra-gamescope.spec (#1787 ) (#1798 ) Signed-off-by: madomado <madonuko@outlook.com> (cherry picked from commit `d4cbab9529`) Co-authored-by: madomado <madonuko@outlook.com>	2024-08-01 21:12:24 +08:00
Raboneko	63dfcf6f9f	fix: disable large runners for zed (#1800 ) (#1804 ) (cherry picked from commit `eda54638b3`) Co-authored-by: lea <lleyton@fyralabs.com>	2024-08-01 21:11:40 +08:00
Raboneko	c5f1f90c44	feat(ruffle): add desktop file (#1769 ) (#1783 ) (cherry picked from commit `09a8da62fb`) Co-authored-by: madomado <madonuko@outlook.com>	2024-07-31 00:48:18 +08:00
Raboneko	131b8ab549	fix: switchboard-plug-security-privacy (#1774 ) (#1779 ) (cherry picked from commit `d0370ddf77`) Co-authored-by: madomado <madonuko@outlook.com>	2024-07-30 23:33:33 +08:00
Raboneko	47e2fe13ae	feat(envision): update by nightly (#1764 ) (#1773 ) Signed-off-by: madomado <madonuko@outlook.com> (cherry picked from commit `2e1c2ccdc0`) Co-authored-by: madomado <madonuko@outlook.com>	2024-07-30 01:17:21 +08:00
Raboneko	3054938665	add: ruffle (#1754 ) (#1763 ) (cherry picked from commit `726e5b4ef8`) Co-authored-by: madomado <madonuko@outlook.com>	2024-07-30 00:46:00 +08:00
lea	9f197392c8	fix: envision (#1667 ) (#1739 ) Signed-off-by: madomado <madonuko@outlook.com> (cherry picked from commit `ff7961a54c`) # Conflicts: # anda/apps/envision/envision.spec Co-authored-by: madomado <madonuko@outlook.com>	2024-07-30 00:45:46 +08:00
Raboneko	e707a1c988	fix: starship (#1742 ) (#1759 ) (cherry picked from commit `2cda5051ae`) Co-authored-by: madomado <madonuko@outlook.com>	2024-07-30 00:08:17 +08:00
Raboneko	b60dc774c7	fix: gamescope-session (#1755 ) (#1768 ) Signed-off-by: madomado <madonuko@outlook.com> (cherry picked from commit `c687fd69f7`) Co-authored-by: madomado <madonuko@outlook.com>	2024-07-30 00:07:56 +08:00
madomado	fb71ec0f3c	fix(ci/bootstrap): rpm-build, not rpmbuild Signed-off-by: madomado <madonuko@outlook.com>	2024-07-29 17:16:58 +08:00
madomado	613436063a	fix(ci/bootstrap): add mock and rpmbuild Signed-off-by: madomado <madonuko@outlook.com>	2024-07-29 17:04:55 +08:00
madomado	e10f07ab56	bump: anda Signed-off-by: madomado <madonuko@outlook.com>	2024-07-29 17:00:11 +08:00
madonuko	2f9b02b811	fix(ci/bootstrap): delay bootstrapping for anda	2024-07-29 14:21:45 +08:00
madonuko	f381a3797d	fix: anda Fix BuildRequires for EL	2024-07-29 14:19:49 +08:00
madonuko	9a6be2b413	fix(ci/bootstrap): checkout properly	2024-07-29 14:16:26 +08:00
madonuko	30e12b4eb1	feat(ci): update bootstrap image	2024-07-29 14:13:34 +08:00
Raboneko	e2a7d6340c	fix: discord* (#1743 ) (#1747 ) (cherry picked from commit `daaa8b8193`) Co-authored-by: madomado <madonuko@outlook.com>	2024-07-29 14:04:52 +08:00
lea	7672ea2893	update out-of-date pakcages (#1725 )	2024-07-28 10:49:53 +08:00
lea	0a0df936d1	fix: use mold for linking and various other fixes (#1648 ) (#1666 ) (cherry picked from commit `1d8cafc982`) # Conflicts: # anda/devs/zed/preview/zed-preview.spec	2024-07-26 20:32:34 -07:00
halfcyan	ea347729b5	Remove fdupes	2024-07-26 13:03:45 -06:00
halfcyan	69ea67a93f	update codium spec for EL9	2024-07-26 12:16:58 -06:00
madonuko	b31a91d10d	feat(ci): update all workflows for el9	2024-07-27 00:50:55 +08:00