let's see what we can make happen

bump: kotlin-native kotlin
bump: ruffle moby-buildx
2026-05-31 09:01:55 +00:00 · 2024-11-27 09:27:30 -06:00 · 2024-11-27 14:21:54 +00:00 · 2024-11-27 01:57:06 +00:00 · 2024-11-26 23:58:52 +00:00 · 2024-11-26 15:55:51 +00:00
399 changed files with 5661 additions and 3524 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - frawhide
+      - f41
  pull_request:
    branches:
-      - frawhide
+      - f41
  merge_group:
    branches:
-      - frawhide
+      - f41
  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:f41
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,26 +40,38 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["41"]
      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:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
        uses: actions/checkout@v4
        with:
          fetch-depth: 0
+
+      - name: Checkout latest Mock configs
+        uses: actions/checkout@v4
+        with:
+          repository: terrapkg/mock-configs
+          path: mock-configs
+
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

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

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

      - name: Generating artifact name
        id: art
@@ -94,7 +106,7 @@ jobs:

      - name: Notify Madoguchi (Success)
        if: success() && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
      - name: Notify Madoguchi (Failure)
        if: ( cancelled() || failure() ) && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
@@ -7,7 +7,7 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["rawhide"]
+        version: ["41"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -16,7 +16,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Install repositories
-        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel cargo podman fuse-overlayfs
+        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel-engine cargo podman fuse-overlayfs

      - name: Install Anda
        run: cargo install anda
@@ -44,7 +44,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["41"]
        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' }}
@@ -56,18 +56,22 @@ jobs:
        uses: actions/checkout@v4
        with:
          fetch-depth: 0
+
+      - name: Checkout latest Mock configs
+        uses: actions/checkout@v4
+        with:
+          repository: terrapkg/mock-configs
+          path: mock-configs
+
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: Cache buildroot
-        id: br-cache
-        uses: actions/cache@v4
-        with:
-          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
+      - name: Include custom build template instead of package default
+        run: |
+          cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl

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

      - name: Generating artifact name
        id: art
@@ -100,7 +104,7 @@ jobs:

      - name: Notify Madoguchi (Success)
        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
      - name: Notify Madoguchi (Failure)
        if: cancelled() || failure()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
@@ -11,7 +11,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["41"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
@@ -22,18 +22,22 @@ jobs:
        uses: actions/checkout@v4
        with:
          fetch-depth: 0
+
+      - name: Checkout latest Mock configs
+        uses: actions/checkout@v4
+        with:
+          repository: terrapkg/mock-configs
+          path: mock-configs
+
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: Cache buildroot
-        id: br-cache
-        uses: actions/cache@v4
-        with:
-          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
+      - name: Include custom build template instead of package default
+        run: |
+          cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl

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

      - name: Generating artifact name
        id: art
@@ -67,7 +71,7 @@ jobs:

      - name: Notify Madoguchi (Success)
        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
      - name: Notify Madoguchi (Failure)
        if: cancelled() || failure()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
@@ -2,7 +2,7 @@ set -x

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

 if [[ $1 == false ]]; then
 	d=${p/\%v/?}
@@ -17,5 +17,5 @@ for f in anda-build/rpm/rpms/*; do
 	r=$(lesspipe.sh $f | grep -E "Release\s*: " | sed "s@Release\s*: @@")
 	d=${p/\%v/$v}
 	d=${d/\%r/$r}
-	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/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$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
 done
@@ -4,8 +4,8 @@ on:
  push:
    branches:
      - frawhide
+      - f41
      - f40
-      - f39
    paths:
      - comps.xml
  workflow_dispatch:
@@ -25,7 +25,7 @@ jobs:
          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
-        run: anda update -vv
+        run: anda update -vv --filters nightly=0
        env:
          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full
@@ -1 +1,2 @@
 anda-build/
+**/*.tar*
@@ -1,7 +1,7 @@
 # Terra Sources

-[![Repository status](https://repology.org/badge/repository-big/terra_39.svg?header=Terra+39)](https://repology.org/repository/terra_39)
 [![Repository status](https://repology.org/badge/repository-big/terra_40.svg?header=Terra+40)](https://repology.org/repository/terra_40)
+[![Repository status](https://repology.org/badge/repository-big/terra_41.svg?header=Terra+41)](https://repology.org/repository/terra_41)
 [![Repository status](https://repology.org/badge/repository-big/terra_rawhide.svg?header=Terra+Rawhide)](https://repology.org/repository/terra_rawhide)

 Terra is a rolling-release Fedora repository for all the software you need.
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "armcord-bin.spec"
-	}
-}
@@ -1,78 +0,0 @@
-%define debug_package %nil
-%global _build_id_links none
-
-%ifarch x86_64
-%global src ArmCord-%version
-%elifarch aarch64
-%global src ArmCord-%version-arm64
-%elifarch armv7l
-%global src ArmCord-%version-armv7l
-%endif
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/armcord/.*\\.so
-
-Name:			armcord-bin
-Version:		3.2.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
-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
-BuildRequires:	add-determinism
-
-%description
-ArmCord is a custom client designed to enhance your Discord experience
-while keeping everything lightweight.
-
-%prep
-%autosetup -n %src
-
-cat <<EOF > .armcord.desktop
-[Desktop Entry]
-Name=ArmCord
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=%_bindir/armcord
-Icon=armcord
-Categories=Network;InstantMessaging;
-StartupWMClass=armcord
-Keywords=discord;armcord;vencord;shelter;electron;
-EOF
-
-%build
-
-%install
-mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/armcord %buildroot%_docdir/%name
-cp -a * %buildroot%_datadir/armcord/
-ln -s %_datadir/armcord/armcord %buildroot%_bindir/armcord
-chmod +x -R %buildroot%_datadir/armcord/*
-chmod 755 %buildroot%_datadir/armcord/armcord
-install -Dm644 .armcord.desktop %buildroot%_datadir/applications/ArmCord.desktop
-install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/armcord.png
-install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
-
-%files
-%doc README.md
-%_datadir/armcord
-%_bindir/armcord
-%_datadir/applications/ArmCord.desktop
-%_datadir/pixmaps/armcord.png
-
-%changelog
-* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
- Use /usr/share/ instead of /opt/
-
-* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
- Initial package
@@ -1 +0,0 @@
-rpm.version(gh("ArmCord/ArmCord"));
@@ -1,67 +0,0 @@
-%define debug_package %nil
-
-Name:		armcord
-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
-Requires:	electron xdg-utils
-BuildRequires:	nodejs-npm git add-determinism
-Conflicts:	armcord-bin
-BuildArch:	noarch
-
-%description
-ArmCord is a custom client designed to enhance your Discord experience
-while keeping everything lightweight.
-
-%prep
-rm -rf *
-git clone %url .
-git checkout v%version
-
-cat <<EOF > armcord.desktop
-[Desktop Entry]
-Name=ArmCord
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=/usr/bin/armcord
-Icon=armcord
-Categories=Network;InstantMessaging;
-StartupWMClass=armcord
-Keywords=discord;armcord;vencord;shelter;electron;
-EOF
-
-
-%build
-npx pnpm@7 install --no-frozen-lockfile
-npm run packageQuick
-
-
-%install
-install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/armcord/app.asar
-
-install -Dm755 %SOURCE1 %buildroot/usr/bin/armcord
-install -Dm644 armcord.desktop %buildroot/usr/share/applications/ArmCord.desktop
-install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png
-
-%files
-%doc README.md
-%license LICENSE
-/usr/bin/armcord
-/usr/share/applications/ArmCord.desktop
-/usr/share/pixmaps/armcord.png
-/usr/share/armcord/app.asar
-
-%changelog
-* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
-
-* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
- Initial package
-
@@ -1 +0,0 @@
-rpm.version(gh("ArmCord/ArmCord"));
@@ -0,0 +1,8 @@
+project pkg {
+    rpm {
+        spec = "coolercontrol.spec"
+    }
+    labels {
+        large = 1
+    }
+}
@@ -0,0 +1,159 @@
+%bcond_without mold
+%global _desc %{expand:
+CoolerControl is a feature-rich cooling device control application for Linux. It has a system daemon
+for background device management, as well as a GUI to expertly customize your settings.
+}
+%global rdnn org.coolercontrol.CoolerControl
+# Don't mangle shebangs
+%global __brp_mangle_shebangs %{nil}
+
+Name:           coolercontrol
+Version:        1.4.4
+Release:        1%?dist
+Summary:        Cooling device control for Linux
+License:        GPL-3.0-or-later
+URL:            https://gitlab.com/coolercontrol/coolercontrol
+Source0:		%url/-/archive/%version/coolercontrol-%version.tar.gz
+Packager:       madonuko <mado@fyralabs.com>
+Provides:       coolercontrol-ui
+Provides:       coolercontrol-gui
+Requires:       hicolor-icon-theme
+Requires:       webkit2gtk4.1
+Requires:       libappindicator-gtk3
+Requires:       coolercontrold
+BuildRequires:  git-core make nodejs-npm libdrm-devel curl wget file mold
+BuildRequires:  systemd-rpm-macros anda-srpm-macros cargo >= 1.75.0 cargo-rpm-macros
+BuildRequires:  autoconf automake binutils bison flex gcc gcc-c++ gdb libtool pkgconf strace
+BuildRequires:  pkgconfig(webkit2gtk-4.1) pkgconfig(openssl) pkgconfig(librsvg-2.0)
+BuildRequires:  libappindicator-gtk3-devel
+BuildRequires:  python3-devel python3-wheel python3-liquidctl python3-setproctitle python3-fastapi python3-uvicorn python3-pip
+BuildRequires:  libappstream-glib
+BuildRequires:  desktop-file-utils
+%description %_desc
+
+%package liqctld
+Summary:        CoolerControl daemon for interacting with liquidctl devices on a system level
+Requires:       coolercontrold
+%description liqctld %_desc
+coolercontrol-liqctld is a CoolerControl daemon for interacting with liquidctl devices on a system level, and is
+installed as the coolercontrol-liqctld application. Its main purpose is to wrap the underlying
+liquidctl library providing an API interface that the main coolercontrol daemon interacts with.
+It also enables parallel device communication and access to specific device properties.
+
+%package -n coolercontrold
+Summary:        Monitor and control your cooling devices.
+Requires:       coolercontrol-liqctld
+%description -n coolercontrold %_desc
+coolercontrold is the main daemon containing the core logic for interfacing with devices, and installed as
+"coolercontrold". It is meant to run in the background as a system daemon. It handles all device
+communication and data management, additionally connecting to the liqctld daemon for liquidctl
+supported devices. It has an API that services client programs like the coolercontrol-gui.
+
+
+%prep
+%autosetup
+
+pushd coolercontrold
+%cargo_prep_online &
+popd
+
+pushd coolercontrol-ui
+npm ci --prefer-offline &
+pushd src-tauri
+%cargo_prep_online &
+popd
+popd
+
+wait
+
+
+%build
+pushd coolercontrold
+%{cargo_license_online} > LICENSE.dependencies &
+%cargo_build -- &
+popd
+
+pushd coolercontrol-liqctld
+%pyproject_wheel
+popd
+
+pushd coolercontrol-ui
+npm run build &
+pushd src-tauri
+%{cargo_license_online} > LICENSE.dependencies &
+wait
+%cargo_build -f custom-protocol
+popd
+popd
+
+
+%install
+pushd coolercontrol-liqctld
+#define _pyproject_wheeldir .
+%pyproject_install
+%pyproject_save_files coolercontrol_liqctld
+popd
+
+pushd coolercontrold
+install -Dpm755 target/rpm/coolercontrold %buildroot%_bindir/coolercontrold
+install -Dpm644 LICENSE.dependencies %buildroot%_datadir/licenses/coolercontrold/LICENSE.dependencies
+popd
+
+pushd coolercontrol-ui/src-tauri
+install -Dpm755 target/rpm/coolercontrol %buildroot%_bindir/coolercontrol
+install -Dpm644 LICENSE.dependencies %buildroot%_datadir/licenses/%name/LICENSE.dependencies
+popd
+
+install -Dpm644 packaging/systemd/coolercontrol-liqctld.service %buildroot%_unitdir/coolercontrol-liqctld.service
+desktop-file-install --dir=%buildroot%_datadir/applications packaging/metadata/%rdnn.desktop
+install -Dpm644 packaging/metadata/%rdnn.svg %buildroot%_iconsdir/hicolor/scalable/apps/%rdnn.svg
+install -Dpm644 packaging/metadata/%rdnn.png %buildroot%_iconsdir/hicolor/256x256/apps/%rdnn.svg
+for f in packaging/systemd/*.service; do
+  install -Dpm644 $f %buildroot%_unitdir/$(basename $f)
+done
+install -Dpm644 packaging/metadata/%rdnn.metainfo.xml %buildroot%_metainfodir/%rdnn.metainfo.xml
+
+
+%check
+appstream-util validate-relax --nonet %buildroot%_metainfodir/%rdnn.metainfo.xml
+%pyproject_check_import
+
+
+%post -n coolercontrold
+%systemd_post coolercontrold.service
+
+%preun -n coolercontrold
+%systemd_preun coolercontrold.service
+
+%postun -n coolercontrold
+%systemd_postun_with_restart coolercontrold.service
+
+# coolercontrold.service automatically uses the liqctld service, so there are
+# no scriptlets for liqctld.
+
+
+%files
+%doc README.md
+%license LICENSE
+%license LICENSE.dependencies
+%_bindir/coolercontrol
+%_datadir/applications/%rdnn.desktop
+%_datadir/metainfo/%rdnn.metainfo.xml
+%_iconsdir/hicolor/*/apps/%rdnn.svg
+
+%files -n coolercontrold
+%doc coolercontrold/README.md
+%license LICENSE
+%license LICENSE.dependencies
+%_bindir/coolercontrold
+%_unitdir/coolercontrold.service
+
+%files liqctld -f %pyproject_files
+%doc coolercontrol-liqctld/README.md
+%license LICENSE
+%_bindir/coolercontrol-liqctld
+%_unitdir/coolercontrol-liqctld.service
+
+%changelog
+* Thu Aug 15 2024 madonuko <mado@fyralabs.com> - 1.4.0-1
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gitlab("30707566"));
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.454
+Version:        0.0.528
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -34,6 +34,7 @@ sed "s@Discord Canary@Discord Canary OpenAsar@g" a > discord-canary.desktop

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


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

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

 %prep
 %autosetup -n DiscordCanary
@@ -27,14 +26,17 @@ together. A place that makes it easy to talk every day and hang out more often.

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

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

 Name:           discord-openasar
-Version:        0.0.60
+Version:        0.0.76
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -34,6 +34,7 @@ sed "s@Discord@Discord OpenAsar@g" a > discord.desktop

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


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

 Name:           discord-ptb-openasar
-Version:        0.0.95
+Version:        0.0.118
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -34,6 +34,7 @@ sed "s@Discord Ptb@Discord Ptb OpenAsar@g" a > discord-ptb.desktop

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


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

 Name:           discord-ptb
-Version:        0.0.95
+Version:        0.0.118
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
@@ -20,9 +20,8 @@ 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.
+All-in-one voice and text chat for gamers that's free, secure, and works on
+both your desktop and phone.

 %prep
 %autosetup -n DiscordPTB
@@ -31,14 +30,17 @@ together. A place that makes it easy to talk every day and hang out more often.

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

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

 Name:			discord
-Version:		0.0.60
+Version:		0.0.76
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -20,9 +20,8 @@ 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.
+All-in-one voice and text chat for gamers that's free, secure, and works on
+both your desktop and phone.

 %prep
 %autosetup -n Discord
@@ -31,14 +30,17 @@ together. A place that makes it easy to talk every day and hang out more often.

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

 %files
+%_bindir/discord
 %{_datadir}/discord/
 %{_datadir}/applications/discord.desktop
 %{_datadir}/pixmaps/discord.png
@@ -2,4 +2,7 @@ project pkg {
    rpm {
        spec = "envision.spec"
    }
+    labels {
+        nightly = 1
+    }
 }
@@ -1,5 +1,5 @@
-%global commit 6cf5e40b96d1cbd99a3cfcef1f03899356e79448
-%global commit_date 20240703
+%global commit a34faa9cd7fa5f4fe658092efd509e8f5257f569
+%global commit_date 20241003
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision
@@ -17,9 +17,11 @@ BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
 BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(libusb-1.0)
 BuildRequires:  openssl-devel-engine
+BuildRequires:  openxr-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
 BuildRequires:  glib2-devel
+BuildRequires:  git-core
 Recommends:     android-tools

 %description
@@ -39,8 +41,8 @@ Recommends:     android-tools
 %doc README.md
 %license LICENSE
 %_bindir/envision
-%_datadir/applications/org.gabmus.envision.desktop
+%_datadir/applications/org.gabmus.envision.Devel.desktop
 %_datadir/envision/
-%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.svg
-%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg
-%_metainfodir/org.gabmus.envision.appdata.xml
+%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.Devel.svg
+%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision.Devel-symbolic.svg
+%_metainfodir/org.gabmus.envision.Devel.appdata.xml
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			feishin
-Version:		0.7.1
+Version:		0.12.1
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "fontviewer.spec"
+  }
+}
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index 4784ac2..2348b13 100644
+--- a/meson.build
+++ b/meson.build
+@@ -13,4 +13,5 @@ executable(
+         dependency('cairomm-1.0'),
+         dependency('freetype2'),
+     ],
+-)
+\ No newline at end of file
+    install: true
+)
@@ -0,0 +1,47 @@
+%global commit dc5cd1490235f8c19424b3345a89727199c86df3
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20241003
+
+Name:           fontviewer
+Version:        %{commit_date}.git~%{shortcommit}
+Release:        1%{?dist}
+Summary:        View and install fonts
+
+License:        GPL-2.0
+URL:            https://github.com/chocolateimage/%{name}
+Source0:        %{url}/archive/%{commit}.tar.gz 
+Patch0:         fontviewer-meson.patch
+
+BuildRequires:  gcc-c++
+BuildRequires:  meson
+BuildRequires:  pkgconfig(cairomm-1.0)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gtkmm-3.0)
+
+Requires:       gtk3 fontconfig
+
+Packager:       sadlerm <sad_lerm@hotmail.com>
+
+%description
+A platform-agnostic GTK+ 3 alternative to GNOME's Font Viewer
+
+%prep
+%autosetup -n %{name}-%{commit} -p1
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+install -m 0755 -vd %{buildroot}%{_datadir}/applications
+install -m 0644 -vp data/%{name}.desktop %{buildroot}%{_datadir}/applications/
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
@@ -0,0 +1,5 @@
+rpm.global("commit", gh_commit("chocolateimage/fontviewer"));
+if rpm.changed() {
+    rpm.release();
+    rpm.global("commit_date", date());
+}
@@ -5,9 +5,9 @@
 %global pure_protobuf_version 2.0.0

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

 BuildArch:      noarch
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "legcord-bin.spec"
+	}
+}
@@ -0,0 +1,95 @@
+%define debug_package %nil
+%global _build_id_links none
+
+%ifarch x86_64
+%global src LegCord-%version-linux-x64
+%elifarch aarch64
+%global src LegCord-%version-linux-arm64
+%elifarch armv7l
+%global src LegCord-%version-linux-armv7l
+%endif
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
+
+Name:			legcord-bin
+Version:		1.0.2
+Release:		4%?dist
+License:		OSL-3.0
+Summary:		Custom lightweight Discord client designed to enhance your experience
+URL:			https://github.com/LegCord/LegCord
+Group:			Applications/Internet
+Source0:		%url/releases/download/v%version/%src.zip
+Source1:		legcord.png
+Source2:		https://raw.githubusercontent.com/LegCord/LegCord/v%version/README.md
+Requires:		xdg-utils
+BuildRequires:  unzip
+ExclusiveArch:	x86_64 aarch64 armv7l
+Conflicts:		legcord
+BuildRequires:	add-determinism
+Obsoletes:      armcord < 3.3.2-1
+
+%description
+LegCord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+mkdir legcord
+cd legcord
+unzip %SOURCE0
+
+cat <<EOF > .legcord.desktop
+[Desktop Entry]
+Name=LegCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=%_bindir/legcord
+Icon=legcord
+Categories=Network;InstantMessaging;
+StartupWMClass=legcord
+Keywords=discord;armcord;legcord;vencord;shelter;electron;
+EOF
+
+%build
+
+%install
+cd legcord
+mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name
+cp -a * %buildroot%_datadir/legcord/
+ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord
+ln -s %_datadir/legcord %buildroot%_datadir/armcord
+chmod +x -R %buildroot%_datadir/legcord/*
+chmod 755 %buildroot%_datadir/legcord/legcord
+install -Dm644 .legcord.desktop %buildroot%_datadir/applications/LegCord.desktop
+install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/legcord.png
+install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
+
+# HACK: rpm bug for unability to replace existing files on system.
+%pre
+if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
+  echo "Found old %_datadir/armcord directory, removing…"
+  rm -rf %_datadir/armcord
+fi
+
+%files
+%doc README.md
+%_datadir/legcord
+%_datadir/armcord
+%_bindir/legcord
+%_datadir/applications/LegCord.desktop
+%_datadir/pixmaps/legcord.png
+
+%changelog
+* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
+- Rename to LegCord.
+
+* Sat Jun 17 2023 madonuko <mado@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 madonuko <mado@fyralabs.com> - 3.1.7-1
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gh("LegCord/LegCord"));
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "legcord-bin.spec"
+	}
+}
@@ -0,0 +1,96 @@
+%define debug_package %nil
+%global _build_id_links none
+
+%ifarch x86_64
+%global src LegCord-%version-linux-x64
+%elifarch aarch64
+%global src LegCord-%version-linux-arm64
+%elifarch armv7l
+%global src LegCord-%version-linux-armv7l
+%endif
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
+
+Name:			legcord-bin
+Version:		1.0.4
+Release:		1%?dist
+License:		OSL-3.0
+Summary:		Custom lightweight Discord client designed to enhance your experience
+URL:			https://github.com/LegCord/LegCord
+Group:			Applications/Internet
+Source0:		%url/releases/download/v%version/%src.zip
+Source1:		legcord.png
+Source2:		https://raw.githubusercontent.com/LegCord/LegCord/v%version/README.md
+Requires:		xdg-utils
+BuildRequires:  unzip
+ExclusiveArch:	x86_64 aarch64 armv7l
+Conflicts:		legcord
+Conflicts:		legcord-nightly
+BuildRequires:	add-determinism
+Obsoletes:      armcord < 3.3.2-1
+
+%description
+LegCord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+mkdir legcord
+cd legcord
+unzip %SOURCE0
+
+cat <<EOF > .legcord.desktop
+[Desktop Entry]
+Name=LegCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=%_bindir/legcord
+Icon=legcord
+Categories=Network;InstantMessaging;
+StartupWMClass=legcord
+Keywords=discord;armcord;legcord;vencord;shelter;electron;
+EOF
+
+%build
+
+%install
+cd legcord
+mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name
+cp -a * %buildroot%_datadir/legcord/
+ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord
+ln -s %_datadir/legcord %buildroot%_datadir/armcord
+chmod +x -R %buildroot%_datadir/legcord/*
+chmod 755 %buildroot%_datadir/legcord/legcord
+install -Dm644 .legcord.desktop %buildroot%_datadir/applications/LegCord.desktop
+install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/legcord.png
+install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
+
+# HACK: rpm bug for unability to replace existing files on system.
+%pre
+if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
+  echo "Found old %_datadir/armcord directory, removing…"
+  rm -rf %_datadir/armcord
+fi
+
+%files
+%doc README.md
+%_datadir/legcord
+%_datadir/armcord
+%_bindir/legcord
+%_datadir/applications/LegCord.desktop
+%_datadir/pixmaps/legcord.png
+
+%changelog
+* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
+- Rename to LegCord.
+
+* Sat Jun 17 2023 madonuko <mado@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 madonuko <mado@fyralabs.com> - 3.1.7-1
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gh("LegCord/LegCord"));
@@ -0,0 +1,9 @@
+project pkg {
+	arches = ["x86_64"]
+	rpm {
+		spec = "legcord-nightly.spec"
+	}
+	labels {
+		nightly = 1
+	}
+}
@@ -0,0 +1,91 @@
+%global commit 54a482bcf4384ffdeaf57568f52c7f2b5178695d
+%global commit_date 20241122
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%define debug_package %nil
+
+Name:		legcord-nightly
+Version:	%commit_date.%shortcommit
+Release:	1%?dist
+License:	OSL-3.0
+Summary:	Custom lightweight Discord client designed to enhance your experience
+URL:		https://github.com/LegCord/LegCord
+Group:		Applications/Internet
+Source0:  %url/archive/%commit/legcord-%commit.tar.gz
+Source1:	launch.sh
+Packager:	Owen <owen@fyralabs.com>
+Requires:	electron xdg-utils
+Provides:   armcord-nightly
+Obsoletes:  armcord < 3.3.2-1
+Conflicts:	legcord-bin
+Conflicts:	legcord
+BuildArch:	noarch
+BuildRequires:  anda-srpm-macros pnpm
+
+%description
+legcord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+%autosetup -n Legcord-%commit
+
+cat <<EOF > legcord.desktop
+[Desktop Entry]
+Name=LegCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=/usr/bin/legcord
+Icon=legcord
+Categories=Network;InstantMessaging;
+StartupWMClass=legcord
+Keywords=discord;armcord;legcord;vencord;shelter;electron;
+EOF
+
+
+%build
+pnpm install --no-frozen-lockfile
+pnpm run packageQuick
+
+
+%install
+install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar
+
+install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord
+install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop
+install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png
+
+ln -s %_datadir/legcord %buildroot%_datadir/armcord
+
+# HACK: rpm bug for unability to replace existing files on system.
+%pre
+if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
+  echo "Found old %_datadir/armcord directory, removing…"
+  rm -rf %_datadir/armcord
+fi
+
+%files
+%doc README.md
+%license license.txt
+/usr/bin/legcord
+/usr/share/applications/LegCord.desktop
+/usr/share/pixmaps/legcord.png
+/usr/share/legcord/app.asar
+/usr/share/armcord
+
+%changelog
+* Fri Nov 22 2024 owen <owen@fyralabs.com> - 1.0.2-2
+- Add nightly package.
+
+* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
+- Rename to LegCord.
+
+* 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.
+- Set as noarch package because there are not binary files.
+
+* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
+- Initial package
@@ -0,0 +1,5 @@
+rpm.global("commit", gh_commit("Legcord/Legcord"));
+if rpm.changed() {
+  rpm.release();
+  rpm.global("commit_date", date());
+}
@@ -1,6 +1,6 @@
 project pkg {
 	arches = ["x86_64"]
 	rpm {
-		spec = "armcord.spec"
+		spec = "legcord.spec"
 	}
 }
@@ -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 "$@"
@@ -0,0 +1,84 @@
+%define debug_package %nil
+
+Name:		legcord
+Version:	1.0.2
+Release:	3%?dist
+License:	OSL-3.0
+Summary:	Custom lightweight Discord client designed to enhance your experience
+URL:		https://github.com/LegCord/LegCord
+Group:		Applications/Internet
+Source1:	launch.sh
+Packager:	madonuko <mado@fyralabs.com>
+Requires:	electron xdg-utils
+Provides:   armcord
+Obsoletes:  armcord < 3.3.2-1
+Conflicts:	legcord-bin
+Conflicts:	legcord-nightly
+BuildArch:	noarch
+BuildRequires:  anda-srpm-macros pnpm
+
+%description
+legcord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+%git_clone %url v%version
+
+cat <<EOF > legcord.desktop
+[Desktop Entry]
+Name=LegCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=/usr/bin/legcord
+Icon=legcord
+Categories=Network;InstantMessaging;
+StartupWMClass=legcord
+Keywords=discord;armcord;legcord;vencord;shelter;electron;
+EOF
+
+
+%build
+pnpm install --no-frozen-lockfile
+pnpm run packageQuick
+
+
+%install
+install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar
+
+install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord
+install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop
+install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png
+
+ln -s %_datadir/legcord %buildroot%_datadir/armcord
+
+# HACK: rpm bug for unability to replace existing files on system.
+%pre
+if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
+  echo "Found old %_datadir/armcord directory, removing…"
+  rm -rf %_datadir/armcord
+fi
+
+%files
+%doc README.md
+%license license.txt
+/usr/bin/legcord
+/usr/share/applications/LegCord.desktop
+/usr/share/pixmaps/legcord.png
+/usr/share/legcord/app.asar
+/usr/share/armcord
+
+%changelog
+* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
+- Rename to LegCord.
+
+* 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.
+- Set as noarch package because there are not binary files.
+
+* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gh("LegCord/LegCord"));
@@ -1,7 +1,7 @@
-%global commit e509ec0aaffce74e520702e16e3e21ea0f168940
+%global commit 6ed3781a3dae41ae1449bfadc5878bb0587bc774
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240720
-%global ver v0.38.0
+%global commit_date 20241009
+%global ver 0.39.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
@@ -42,6 +42,7 @@ BuildRequires:  pkgconfig(libavutil) >= 57.24.100
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libdisplay-info)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.19
@@ -182,7 +183,6 @@ sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf
    -Dvdpau-gl-x11=enabled \
    -Dvdpau=enabled \
    -Dvector=enabled \
-    -Dvulkan-interop=disabled \
    -Dvulkan=enabled \
    -Dwayland=enabled \
    -Dwerror=false \
@@ -1,7 +1,11 @@
 if filters.contains("nightly") {
 	rpm.global("commit", gh_commit("mpv-player/mpv"));
 	if rpm.changed() {
-		rpm.global("ver", gh("mpv-player/mpv"));
+		let v = gh("mpv-player/mpv");
+		if v.starts_with("v") {
+			v.crop(1);
+		}
+		rpm.global("ver", v);
 		rpm.global("commit_date", date());
 		rpm.release();
 	}
@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "ruffle-nightly.spec"
+    }
+}
@@ -0,0 +1,55 @@
+%global ver 2024-11-27
+%global goodver %(echo %ver | sed 's/-//g')
+%global __brp_mangle_shebangs %{nil}
+%bcond_without mold
+
+%global _description %{expand:
+Ruffle is an Adobe Flash Player emulator written in the Rust programming
+language. Ruffle targets both the desktop and the web using WebAssembly.}
+
+Name:           ruffle-nightly
+Version:        %goodver
+Release:        1%?dist
+Summary:        A Flash Player emulator written in Rust
+License:        Apache-2.0 OR MIT
+URL:            https://ruffle.rs/
+Source0:        https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-%ver.tar.gz
+Provides:       ruffle
+BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  anda-srpm-macros mold
+BuildRequires:  gcc-c++ cmake java
+BuildRequires:  java-latest-openjdk-headless
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(xcb-cursor)
+Packager:       madonuko <mado@fyralabs.com>
+
+%description %_description
+
+%files
+%doc README.md
+%license LICENSE.md
+%license LICENSE.dependencies
+%_bindir/ruffle_desktop
+%_datadir/applications/rs.ruffle.Ruffle.desktop
+%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
+%_metainfodir/rs.ruffle.Ruffle.metainfo.xml
+
+%prep
+%autosetup -n ruffle-nightly-%ver
+%cargo_prep_online
+
+%build
+%{cargo_license_online} > LICENSE.dependencies
+
+%install
+cd desktop
+%cargo_install
+install -Dm644 packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
+install -Dm644 packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop
+install -Dm644 packages/linux/rs.ruffle.Ruffle.metainfo.xml %buildroot%_metainfodir/rs.ruffle.Ruffle.metainfo.xml
+
+%changelog
+* Mon Jul 29 2024 madonuko <mado@fyralabs.com>
+- Initial package
@@ -0,0 +1,13 @@
+let releases = "https://api.github.com/repos/ruffle-rs/ruffle/releases".get().json_arr();
+for release in releases {
+  let tag = release.tag_name;
+  if !tag.starts_with("nightly-") {
+    continue;
+  }
+  tag.crop(8); // remove "nightly-"
+  rpm.global("ver", tag);
+  break;
+}
+if rpm.changed() {
+  rpm.release();
+}
@@ -1,16 +0,0 @@
--- sccache-0.8.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sccache-0.8.1/Cargo.toml	2024-07-10T16:31:31.705674+00:00
-@@ -403,13 +403,3 @@
- [target."cfg(unix)".dependencies.daemonize]
- version = "0.5"
- 
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = [
-    "fileapi",
-    "handleapi",
-    "stringapiset",
-    "winnls",
-    "processenv",
-    "std",
-]
@@ -1,19 +1,27 @@
 %define debug_package %nil
 %global _build_id_links none

+# do not strip binaries
+%define __strip /bin/true
+
+# do not perform compression in cpio
+%define _source_payload w0.ufdio
+%define _binary_payload w19.zstdio
+
 # Exclude private libraries
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			voicevox
-Version:		0.19.2
-Release:		4%?dist
+Version:		0.21.1
+Release:		1%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
 URL:			https://voicevox.hiroshiba.jp
 Source0:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.001
 Source1:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.002
 Source2:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.003
+Packager:       madonuko <mado@fyralabs.com>
 BuildRequires:  p7zip-plugins
 ExclusiveArch:  x86_64

@@ -28,7 +36,7 @@ Summary: Documentation files for voicevox (Japanese)

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

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

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

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

 URL:            https://github.com/elementary/calendar
@@ -5,8 +5,8 @@

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

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

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

 URL:            https://github.com/elementary/%{srcname}
@@ -42,6 +42,8 @@ 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
@@ -76,6 +78,7 @@ This package contains the development headers.


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

@@ -85,11 +88,6 @@ This package contains the development headers.

 %find_lang %{appname}

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

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

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

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

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

 Provides:       pantheon-greeter = %{version}-%{release}
@@ -10,8 +10,8 @@ utilizes Granite for a consistent and slick UI.}

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

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

 Requires:       hicolor-icon-theme

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

 %files devel

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


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

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

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

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

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

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

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

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

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

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

 Requires:       xdg-desktop-portal

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

+%find_lang %appname
+

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


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

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

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

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

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

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

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

 Requires:       hicolor-icon-theme

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

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

 # License breakdown is available in debian/copyright
 License:        CC-BY-SA-4.0 AND CC0-1.0 AND Unlicense
@@ -2,8 +2,8 @@

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

@@ -12,7 +12,6 @@ Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz

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

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

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

@@ -89,8 +86,8 @@ This package contains the development headers.


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

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

 %{_bindir}/gala
 %{_bindir}/gala-daemon
@@ -3,38 +3,31 @@
 %global srcname switchboard-plug-about

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

 Name:           switchboard-plug-about
 Summary:        Switchboard System Information plug
-Version:        6.2.0
-Release:        3%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 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:  vala >= 0.22.0
 BuildRequires:  fdupes

-BuildRequires:  pkgconfig(appstream) >= 0.12.10
 BuildRequires:  pkgconfig(fwupd)
-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(glib-2.0)
 BuildRequires:  pkgconfig(libgtop-2.0)
-BuildRequires:  pkgconfig(libhandy-1)
-BuildRequires:  pkgconfig(switchboard-2.0)
-BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(switchboard-3)
 BuildRequires:  pkgconfig(udisks2)
+BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(packagekit-glib2)
+BuildRequires:  pkgconfig(polkit-gobject-1)

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

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


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


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

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

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


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

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

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

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

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

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

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


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


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

-%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
+%{_libdir}/switchboard-3/%{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:        2.3.6
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later

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

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

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

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

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

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

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


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


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

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

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


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

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

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

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

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

 URL:            https://github.com/elementary/switchboard-plug-keyboard
@@ -21,14 +21,8 @@ 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(libgnomekbd)
-BuildRequires:  pkgconfig(libgnomekbdui)
-BuildRequires:  pkgconfig(libhandy-1) >= 0.90.0
-BuildRequires:  pkgconfig(switchboard-2.0)
+BuildRequires:  pkgconfig(switchboard-3)
 BuildRequires:  pkgconfig(xkeyboard-config)

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


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


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

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


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

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

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

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

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

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


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


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

-%_libdir/switchboard/%plug_type/lib%plug_name-plug.so
-%_libdir/switchboard/personal/pantheon-locale/languagelist
-%_libdir/switchboard/personal/pantheon-locale/packages_blacklist
+%_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
 %_datadir/glib-2.0/schemas/%plug_rdnn.gschema.xml
 %_datadir/polkit-1/actions/%plug_rdnn.policy

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

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

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

 URL:            https://github.com/elementary/switchboard-plug-mouse-touchpad
@@ -18,13 +18,9 @@ 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) >= 2.32
-BuildRequires:  pkgconfig(granite)
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(switchboard-2.0)
-BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(switchboard-3)

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

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


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


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

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

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


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

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

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

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

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
-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)
+BuildRequires:  pkgconfig(libnm)
+BuildRequires:  pkgconfig(libnma-gtk4)
+BuildRequires:  pkgconfig(switchboard-3)

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


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


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

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

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


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

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

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

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

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

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


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


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

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

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


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

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

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

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

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

 URL:            https://github.com/elementary/%name
@@ -25,12 +25,8 @@ 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}
@@ -51,24 +47,25 @@ Supplements:    switchboard%{?_isa}
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_name}-plug
+%find_lang %{plug_rdnn}

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


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


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

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

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

 %_sysconfdir/pantheon-parental-controls/daemon.conf
 %_bindir/pantheon-parental-controls-daemon
@@ -76,8 +73,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/io.elementary.switchboard.screentime-limits.policy
-/usr/lib/systemd/system/pantheon-parental-controls.service
+%_datadir/polkit-1/actions/%plug_rdnn.policy
+%_unitdir/pantheon-parental-controls.service

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

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

 Name:           switchboard-plug-power
 Summary:        Switchboard Power Plug
-Version:        2.7.0
-Release:        2%?dist
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/%name
@@ -18,13 +18,10 @@ Source0:        %url/archive/%version/%srcname-%version.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
-BuildRequires:  vala
 BuildRequires:  fdupes

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

 Requires:       switchboard%?_isa
@@ -45,24 +42,24 @@ Supplements:    switchboard%?_isa
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %plug_name-plug
+%find_lang %plug_rdnn

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


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


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

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

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

 %_libexecdir/io.elementary.logind.helper
 %_datadir/dbus-1/system-services/io.elementary.logind.helper.service
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-printers
 Summary:        Switchboard Printers Plug
-Version:        2.2.1
-Release:        2%?dist
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later

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

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

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

 URL:            https://github.com/elementary/%name
@@ -17,11 +17,11 @@ Source0:        %url/archive/%version/%srcname-%version.tar.gz

 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
-BuildRequires:  vala
+#BuildRequires:  vala

-BuildRequires:  granite-devel
-BuildRequires:  pkgconfig(polkit-gobject-1)
-BuildRequires:  pkgconfig(switchboard-2.0)
+#BuildRequires:  granite-devel
+#BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  pkgconfig(switchboard-3)
 BuildRequires:  pkgconfig(zeitgeist-2.0)
 BuildRequires:  meson >= 0.46.1
 BuildRequires:  polkit-devel
@@ -46,7 +46,7 @@ Supplements:    switchboard%{?_isa}
 %install
 %meson_install

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


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


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

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

 %{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml

-%_libdir/switchboard/personal/security-privacy-plug-helper
+%_libdir/switchboard-3/personal/security-privacy-plug-helper
 %_datadir/glib-2.0/schemas/%plug_rdnn.gschema.xml
 %_datadir/polkit-1/actions/%plug_rdnn.policy

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

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

 Name:           switchboard-plug-sharing
 Summary:        Switchboard Sharing Plug
-Version:        2.1.6
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0

 URL:            https://github.com/elementary/switchboard-plug-sharing
@@ -18,12 +18,9 @@ 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) >= 2.32
-BuildRequires:  pkgconfig(granite)
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(switchboard-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(switchboard-3)

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

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


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


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

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

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


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

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

 Name:           switchboard-plug-sound
 Summary:        Switchboard Sound Plug
-Version:        2.3.3
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        LGPL-2.0-or-later

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

 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(libhandy-1)
-BuildRequires:  pkgconfig(libpulse-mainloop-glib)
-BuildRequires:  pkgconfig(switchboard-2.0)
+BuildRequires:  pkgconfig(switchboard-3)

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -50,9 +44,9 @@ A sound plug for Switchboard.
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %{plug_name}-plug
+%find_lang %{plug_rdnn}

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


@@ -60,13 +54,14 @@ 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_name}-plug.lang
+%files -f %{plug_rdnn}.lang
 %doc README.md
 %license COPYING

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

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


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

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

 Name:           switchboard-plug-useraccounts
 Summary:        Switchboard User Accounts Plug
-Version:        2.4.3
-Release:        2%?dist
+Version:        8.0.0
+Release:        1%?dist
 License:        LGPL-3.0-or-later

 URL:            https://github.com/elementary/%name
@@ -18,18 +18,11 @@ Source0:        %url/archive/%version/%srcname-%version.tar.gz
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.1
-BuildRequires:  vala
 BuildRequires:  fdupes

 BuildRequires:  pkgconfig(accountsservice)
-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(gnome-desktop-4)
 BuildRequires:  pkgconfig(pwquality)
-BuildRequires:  polkit-devel
-BuildRequires:  gtk3-devel
 BuildRequires:  switchboard-devel

 Requires:       switchboard%?_isa
@@ -50,21 +43,21 @@ Supplements:    switchboard%?_isa
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
-%find_lang %plug_name-plug
+%find_lang %plug_rdnn


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


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

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


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

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

 URL:            https://github.com/elementary/applications-menu
@@ -5,8 +5,8 @@

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

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

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

 URL:            https://github.com/elementary/wingpanel-indicator-datetime
@@ -5,8 +5,8 @@

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

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

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

 URL:            https://github.com/elementary/wingpanel-indicator-network
@@ -5,8 +5,8 @@

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

 URL:            https://github.com/elementary/wingpanel-indicator-nightlight
@@ -5,8 +5,8 @@

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

 URL:            https://github.com/elementary/wingpanel-indicator-notifications
@@ -5,8 +5,8 @@

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

 URL:            https://github.com/elementary/wingpanel-indicator-power
@@ -5,8 +5,8 @@

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

 URL:            https://github.com/elementary/%{name}
@@ -6,14 +6,14 @@ launcher.}

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

 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0:         https://github.com/elementary/wingpanel/compare/23a3eb7c2448b4f35398116df7d01b075361ef1f..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch
+Patch0:         https://github.com/elementary/wingpanel/commit/d6009d9f0d5c7479172093447ccceccba86ff1f3.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -29,9 +29,9 @@ BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
-BuildRequires:  pkgconfig(mutter-clutter-14)
-BuildRequires:  pkgconfig(mutter-cogl-14)
-BuildRequires:  pkgconfig(mutter-cogl-pango-14)
+BuildRequires:  pkgconfig(mutter-clutter-13)
+BuildRequires:  pkgconfig(mutter-cogl-13)
+BuildRequires:  pkgconfig(mutter-cogl-pango-13)

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

--- a/Show More
+++ b/Show More