remove mesa for now

2026-05-31 17:11:56 +00:00 · 2024-07-20 13:22:23 +07:00
173 changed files with 767 additions and 778 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - el9
+      - frawhide
  pull_request:
    branches:
-      - el9
+      - frawhide
  merge_group:
    branches:
-      - el9
+      - frawhide
  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:el9
+      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,39 +40,26 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["9"]
+        version: ["rawhide"]
      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:el${{ 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 mock-configs/el9.tpl /etc/mock/templates/
-          cp -v mock-configs/epel9.tpl /etc/mock/templates/
+          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl

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

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

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

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

      - name: Install Anda
        run: cargo install anda

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

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

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

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

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

      - name: Upload source packages to subatomic
        if: github.event_name == 'push'
@@ -73,4 +58,4 @@ jobs:
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra-el${{ matrix.version }}-source anda-build/rpm/srpm/*
+            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
@@ -44,35 +44,30 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["9"]
+        version: ["rawhide"]
        arch: ${{ fromJson(needs.parse.outputs.arch) }}
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:el${{ 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 mock-configs/el9.tpl /etc/mock/templates/
-          cp -v mock-configs/epel9.tpl /etc/mock/templates/
+      - 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: Build with Andaman
-        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c mock-configs/terra-el${{ matrix.version }}+epel-${{ matrix.pkg.arch }}.cfg
+        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg

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

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

      - name: Notify Madoguchi (Success)
        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{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,34 +11,29 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["9"]
+        version: ["rawhide"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:el${{ 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 mock-configs/el9.tpl /etc/mock/templates/
-          cp -v mock-configs/epel9.tpl /etc/mock/templates/
+      - 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: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-el${{ matrix.version }}+epel-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg

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

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

      - name: Notify Madoguchi (Success)
        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} $GITHUB_SHA
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{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,12 +2,12 @@ set -x

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

 if [[ $1 == false ]]; then
 	d=${p/\%v/?}
 	d=${d/\%r/?}
-	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra-el$3/builds/f -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
+	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/f -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
 	exit 0
 fi

@@ -17,5 +17,5 @@ for f in anda-build/rpm/rpms/*; do
 	r=$(lesspipe.sh $f | grep -E "Release\s*: " | sed "s@Release\s*: @@")
 	d=${p/\%v/$v}
 	d=${d/\%r/$r}
-	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terra-el$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
+	curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
 done
@@ -3,7 +3,9 @@ name: Push comps updates
 on:
  push:
    branches:
-      - el9
+      - frawhide
+      - f40
+      - f39
    paths:
      - comps.xml
  workflow_dispatch:
@@ -18,7 +20,8 @@ jobs:
      - name: Push to subatomic
        run: |
          branch=${{ github.ref_name }}
+          ver=${branch/f/}
          subatomic-cli upload-comps \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            "terra-${branch}" comps.xml
+            "terra${ver}" comps.xml
@@ -48,6 +48,5 @@ jobs:
            }
            copy_over f39 || true
            copy_over f40 || true
-            copy_over f41 || true
            git push -u origin --all
          fi
@@ -25,7 +25,7 @@ jobs:
          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
-        run: anda update -vv --filters nightly=0
+        run: anda update -vv
        env:
          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full
@@ -49,6 +49,5 @@ jobs:
            }
            copy_over f39 || true
            copy_over f40 || true
-            copy_over f41 || true
            git push -u origin --all
          fi
@@ -1,2 +1 @@
 anda-build/
-**/*.tar*
@@ -8,7 +8,7 @@ Release:		1%?dist
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:			https://apps.ankiweb.net/
-BuildRequires:	python3-pip cargo
+BuildRequires:	python3-pip rpm_macro(fdupes) cargo
 Requires:		python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
 Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
 Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
@@ -50,6 +50,8 @@ cp -r ./{_aqt,anki*,aqt*} %buildroot/usr/lib/python3*/site-packages/

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

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

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

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

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

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

+%fdupes %_libdir/python*/site-packages/_aqt/data/
+
+
 %files
 %license LICENSE*
 %doc README*
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.462
+Version:        0.0.454
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -34,7 +34,6 @@ 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/
@@ -43,11 +42,9 @@ 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.462
+Version:        0.0.454
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
@@ -16,8 +16,9 @@ Requires:       glibc GConf2 nspr >= 4.13 nss >= 3.27 libX11 >= 1.6 libXtst >= 1
 Group:          Applications/Internet
 ExclusiveArch:  x86_64
 %description
-All-in-one voice and text chat for gamers that's free, secure, and works on
-both your desktop and phone.
+Imagine a place where you can belong to a school club, a gaming group, or a
+worldwide art community. Where just you and a handful of friends can spend time
+together. A place that makes it easy to talk every day and hang out more often.

 %prep
 %autosetup -n DiscordCanary
@@ -26,17 +27,14 @@ both your desktop and phone.

 %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.61
+Version:        0.0.60
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -34,7 +34,6 @@ 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/
@@ -43,11 +42,9 @@ 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.96
+Version:        0.0.95
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -34,7 +34,6 @@ 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/
@@ -45,11 +44,9 @@ 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.96
+Version:        0.0.95
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
@@ -20,8 +20,9 @@ Requires:       libXtst >= 1.2
 Group:          Applications/Internet
 ExclusiveArch:  x86_64
 %description
-All-in-one voice and text chat for gamers that's free, secure, and works on
-both your desktop and phone.
+Imagine a place where you can belong to a school club, a gaming group, or a
+worldwide art community. Where just you and a handful of friends can spend time
+together. A place that makes it easy to talk every day and hang out more often.

 %prep
 %autosetup -n DiscordPTB
@@ -30,17 +31,14 @@ both your desktop and phone.

 %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.61
+Version:		0.0.60
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -20,8 +20,9 @@ Requires:		libXtst >= 1.2
 Group:			Applications/Internet
 ExclusiveArch:	x86_64
 %description
-All-in-one voice and text chat for gamers that's free, secure, and works on
-both your desktop and phone.
+Imagine a place where you can belong to a school club, a gaming group, or a
+worldwide art community. Where just you and a handful of friends can spend time
+together. A place that makes it easy to talk every day and hang out more often.

 %prep
 %autosetup -n Discord
@@ -30,17 +31,14 @@ both your desktop and phone.

 %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,7 +2,4 @@ project pkg {
    rpm {
        spec = "envision.spec"
    }
-    labels {
-        nightly = 1
-    }
 }
@@ -1,5 +1,5 @@
-%global commit 5d0131a00c52b791cad3543e33017c28e021cb92
-%global commit_date 20240727
+%global commit 6cf5e40b96d1cbd99a3cfcef1f03899356e79448
+%global commit_date 20240703
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision
@@ -9,15 +9,14 @@ Summary:        UI for building, configuring and running Monado, the open source
 License:        AGPL-3.0-or-later
 URL:            https://gitlab.com/gabmus/envision/
 Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo
+BuildRequires:  meson ninja-build cargo 
 BuildRequires:  pkgconfig(glib-2.0) >= 2.66
 BuildRequires:  pkgconfig(gio-2.0) >= 2.66
 BuildRequires:  pkgconfig(gtk4) >= 4.10.0
 BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
 BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  openssl-devel
-BuildRequires:  openxr-devel
+BuildRequires:  openssl-devel-engine
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
 BuildRequires:  glib2-devel
@@ -1,7 +1,7 @@
-%global commit 3c7b6db205c027d3c4f12285719367792e471b57
+%global commit e509ec0aaffce74e520702e16e3e21ea0f168940
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240725
-%global ver 0.38.0
+%global commit_date 20240720
+%global ver v0.38.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
@@ -1,11 +1,7 @@
 if filters.contains("nightly") {
 	rpm.global("commit", gh_commit("mpv-player/mpv"));
 	if rpm.changed() {
-		let v = gh("mpv-player/mpv");
-		if v.starts_with("v") {
-			v.crop(1);
-		}
-		rpm.global("ver", v);
+		rpm.global("ver", gh("mpv-player/mpv"));
 		rpm.global("commit_date", date());
 		rpm.release();
 	}
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "ruffle-nightly.spec"
-    }
-}
@@ -1,67 +0,0 @@
-%global ver 2024-07-29
-%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
-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/ruffle_desktop.desktop
-%_iconsdir/hicolor/scalable/apps/ruffle_desktop.svg
-
-%prep
-%autosetup -n ruffle-nightly-%ver
-%cargo_prep_online
-
-cat<<EOF > ruffle_desktop.desktop
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Ruffle Desktop
-Comment=%summary
-Exec=%_bindir/ruffle_desktop
-Icon=ruffle_desktop
-Terminal=false
-StartupNotify=false
-Categories=Application;
-MimeType=application/x-shockwave-flash;
-EOF
-
-%build
-%{cargo_license_online} > LICENSE.dependencies
-
-%install
-cd desktop
-%cargo_install
-install -Dm644 assets/icon.svg %buildroot%_iconsdir/hicolor/scalable/apps/ruffle_desktop.svg
-install -Dm644 ../ruffle_desktop.desktop %buildroot%_datadir/applications/ruffle_desktop.desktop
-
-%changelog
-* Mon Jul 29 2024 madonuko <mado@fyralabs.com>
- Initial package
@@ -1,13 +0,0 @@
-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,13 +1,6 @@
 %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 w0.gzdio
-
 # Exclude private libraries
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
@@ -21,7 +14,6 @@ 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

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

 %prep
 cat<<EOF > voicevox.sh
-#!/usr/bin/sh
+#!/bin/sh
 /usr/share/voicevox/VOICEVOX.AppImage
 EOF
 7z x %SOURCE0
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "youtube-music.spec"
-	}
-}
@@ -1 +0,0 @@
-rpm.version(gh("th-ch/youtube-music"));
@@ -1,10 +0,0 @@
-[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;
@@ -1,91 +0,0 @@
-%define debug_package %nil
-
-
-# macro shorthand for calling pnpm
-%global pnpm npx pnpm@%{pnpm_version}
-
-Name:           youtube-music
-Version:        3.5.1
-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
@@ -9,6 +9,7 @@ URL:		https://ubuntubudgie.org/
 Source0:	https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz
 Patch0: 0001-fix-weathershow-desktop-widget-icon-path.patch

+BuildRequires:	rpm_macro(fdupes)
 BuildRequires:	cmake
 BuildRequires:	meson
 BuildRequires:	vala
@@ -273,6 +274,8 @@ workspaces.
 # Remove absolute symlink and replace with relative symlink
 rm -f %{buildroot}%{_bindir}/quickchar

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

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

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

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

 %files -f compiz.lang
 %doc AUTHORS README NEWS
@@ -18,6 +18,7 @@ BuildRequires:  vala

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

 Requires:       hicolor-icon-theme

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

 %find_lang %{appname}

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

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

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

 URL:            https://github.com/elementary/calendar
@@ -32,6 +32,7 @@ BuildRequires:  libhandy >= 0.90.0
 BuildRequires:  meson
 BuildRequires:  vala
 BuildRequires:  evolution-data-server-devel
+BuildRequires:  fdupes

 Requires:       hicolor-icon-theme

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

 %find_lang %{appname}

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

 %check
 %dnl desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
@@ -15,6 +15,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46
 BuildRequires:  vala
+BuildRequires:  fdupes

 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -46,7 +47,7 @@ Camera is a simple app to take photos with a webcam.

 %find_lang %{appname}

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



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

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

 %find_lang %{appname}

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

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

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

 URL:            https://github.com/elementary/%{srcname}
@@ -38,6 +38,7 @@ BuildRequires:  pkgconfig(libpeas-gtk-1.0)
 BuildRequires:  pkgconfig(libsoup-2.4)
 BuildRequires:  pkgconfig(pangoft2)
 BuildRequires:  pkgconfig(vte-2.91)
+BuildRequires:  fdupes

 Requires:       hicolor-icon-theme

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

 %find_lang %{appname}

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

 %files -f %{appname}.lang
 %doc README.md
@@ -21,6 +21,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.50.0
 BuildRequires:  vala >= 0.48.2
+BuildRequires:  fdupes

 BuildRequires:  pkgconfig(cloudproviders) >= 0.3.0
 BuildRequires:  pkgconfig(gdk-x11-3.0)
@@ -84,6 +85,8 @@ This package contains the development headers.

 %find_lang %{appname}

+%fdupes %buildroot%_datadir/icons/hicolor/
+
 # remove unused pixmaps
 rm -r %{buildroot}/%{_datadir}/pixmaps

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

 BuildRequires:  mesa-libEGL-devel

@@ -82,6 +83,8 @@ The elementary Greeter is a styled Login Screen for LightDM.

 %find_lang %{appname}

+%fdupes %buildroot%_datadir/icons/hicolor/
+
 # install LightDM configuration file
 mkdir -p %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d
 install -pm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/
@@ -18,6 +18,7 @@ BuildRequires:  libappstream-glib
 BuildRequires:  librsvg2-tools
 BuildRequires:  meson
 BuildRequires:  xcursorgen
+BuildRequires:  fdupes

 %description
 This is an icon theme designed to be smooth, sexy, clear, and efficient.
@@ -65,6 +66,8 @@ done
 # Create icon cache file
 touch %{buildroot}/%{_datadir}/icons/elementary/icon-theme.cache

+%fdupes %buildroot%_datadir/icons/elementary/
+

 %check
 # ignore validation until appstream-glib knows the "icon-theme" component type
@@ -10,8 +10,8 @@ utilizes Granite for a consistent and slick UI.}

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

 URL:            https://github.com/elementary/%{srcname}
@@ -23,6 +23,7 @@ BuildRequires:  gettext
 BuildRequires:  meson
 BuildRequires:  libappstream-glib
 BuildRequires:  vala >= 0.26
+BuildRequires:  fdupes

 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -40,7 +41,6 @@ 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

@@ -78,6 +78,8 @@ This package contains files needed for developing with Music.
 %meson_install
 %find_lang %{appname}

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

 %check
 desktop-file-validate \
@@ -97,6 +99,7 @@ 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:        8.0.0
-Release:        1%?dist
+Version:        7.0.1
+Release:        1%{?dist}
 Summary:        GTK Notification server for Pantheon

 License:        GPL-3.0
@@ -54,6 +54,7 @@ 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

@@ -17,6 +17,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
+BuildRequires:  fdupes
 BuildRequires:  git-core
 BuildRequires:  cmake

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

 %find_lang %{appname}

+%fdupes %buildroot%_datadir/icons/hicolor/
+%fdupes %buildroot%_datadir/locale/
+
+
 %check
 desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop
@@ -3,8 +3,8 @@

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

 URL:            https://github.com/elementary/screenshot
@@ -18,6 +18,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46
 BuildRequires:  vala >= 0.24
+BuildRequires:  fdupes

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

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


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

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

@@ -26,8 +26,6 @@ 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

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

-%find_lang %appname
-

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


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

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

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

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

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

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


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

 BuildRequires:  meson
+BuildRequires:  fdupes

 BuildArch:      noarch

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

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


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

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

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


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

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

+%fdupes %buildroot%_datadir/themes/
+

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

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

 URL:            https://github.com/elementary/%{srcname}
@@ -15,20 +15,20 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
+BuildRequires:  fdupes

 BuildRequires:  pkgconfig(clutter-gst-3.0)
 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-7)
+BuildRequires:  pkgconfig(granite)
 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

@@ -49,6 +49,8 @@ to the desktop.
 %install
 %meson_install

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


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

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

 # License breakdown is available in debian/copyright
 License:        CC-BY-SA-4.0 AND CC0-1.0 AND Unlicense
@@ -17,6 +17,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.48.2
 BuildRequires:  vala >= 0.48
+BuildRequires:  fdupes

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

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

 %find_lang granite-7

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

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

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


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

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

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


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

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

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


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

 Name:           switchboard-plug-about
 Summary:        Switchboard System Information plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.2.0
+Release:        3%{?dist}
 License:        GPL-3.0-or-later

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

 BuildRequires:  pkgconfig(appstream) >= 0.12.10
 BuildRequires:  pkgconfig(fwupd)
@@ -55,6 +56,7 @@ This switchboard plug shows system information.

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

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

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

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

 BuildRequires:  pkgconfig(flatpak) >= 1.1.2
 BuildRequires:  pkgconfig(glib-2.0) >= 2.34
@@ -47,6 +48,7 @@ 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

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

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

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

 BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(libadwaita-1)
@@ -42,6 +43,7 @@ Supplements:    switchboard%{?_isa}

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

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

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

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


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

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

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

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(granite) >= 6.0.0
@@ -52,6 +53,7 @@ same time. Keyboard shortcuts are also part of this plug.

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


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

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

 URL:            https://github.com/elementary/%name
@@ -19,6 +19,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.1
 BuildRequires:  vala
+BuildRequires:  fdupes

 BuildRequires:  pkgconfig(accountsservice)
 BuildRequires:  pkgconfig(ibus-1.0)
@@ -44,6 +45,7 @@ Supplements:    switchboard%?_isa

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


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

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

 URL:            https://github.com/elementary/switchboard-plug-mouse-touchpad
@@ -8,8 +8,8 @@

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

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

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(granite)
@@ -50,6 +51,7 @@ A switchboard plug for configuring available networks.

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


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

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

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

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(granite)
@@ -48,6 +49,7 @@ related to the Notifications plugin for Gala.

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


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

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

 URL:            https://github.com/elementary/switchboard-plug-onlineaccounts
@@ -17,6 +17,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
+BuildRequires:  fdupes

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

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

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

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

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


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

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

 URL:            https://github.com/elementary/%name
@@ -19,6 +19,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.1
 BuildRequires:  vala
+BuildRequires:  fdupes

 BuildRequires:  pkgconfig(accountsservice)
 BuildRequires:  pkgconfig(dbus-1)
@@ -49,6 +50,7 @@ Supplements:    switchboard%{?_isa}

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

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

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

 URL:            https://github.com/elementary/%name
@@ -19,6 +19,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
+BuildRequires:  fdupes

 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(granite)
@@ -43,6 +44,7 @@ Supplements:    switchboard%?_isa

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

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

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

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

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

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


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

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

 Name:           switchboard-plug-security-privacy
 Summary:        Switchboard Security & Privacy Plug
@@ -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-3)
+BuildRequires:  granite-devel
+BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  pkgconfig(switchboard-2.0)
 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_rdnn}
+%find_lang %{plug_name}-plug


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


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

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

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

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

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

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

 URL:            https://github.com/elementary/switchboard-plug-sharing
@@ -8,8 +8,8 @@

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

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

 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite)
@@ -48,6 +49,7 @@ A sound plug for Switchboard.

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

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

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

 URL:            https://github.com/elementary/%name
@@ -19,6 +19,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.1
 BuildRequires:  vala
+BuildRequires:  fdupes

 BuildRequires:  pkgconfig(accountsservice)
 BuildRequires:  gobject-introspection-devel
@@ -48,6 +49,7 @@ Supplements:    switchboard%?_isa

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


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

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

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

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

 %check
 desktop-file-validate \
@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.32.1
-
+BuildRequires:  fdupes

 BuildRequires:  appstream-vala

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

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


@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-
+BuildRequires:  fdupes

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

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

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

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

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

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

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

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


@@ -23,7 +23,7 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libnm)
 BuildRequires:  pkgconfig(libnma)
 BuildRequires:  pkgconfig(wingpanel) >= 3.0.0
-
+BuildRequires:  fdupes

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

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


@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-
+BuildRequires:  fdupes

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

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


@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-
+BuildRequires:  fdupes

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

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


@@ -16,9 +16,9 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
+BuildRequires:  fdupes

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

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

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

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

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


@@ -16,7 +16,7 @@ BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala >= 0.22.0
-
+BuildRequires:  fdupes

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

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

 # remove the specified stock icon from appdata (invalid in libappstream-glib)
@@ -1,8 +1,8 @@
 %define debug_package %{nil}

 Name:			xdg-desktop-portal-pantheon
-Version:		7.2.0
-Release:		1%?dist
+Version:		7.1.1
+Release:		1%{?dist}
 Summary:		Pantheon XDG Desktop Portals
 License:		GPL-3.0
 URL:			https://github.com/elementary/portals
@@ -20,7 +20,7 @@ BuildRequires: pkgconfig(Qt5Core)
 BuildRequires: pkgconfig(Qt5Quick)
 BuildRequires: cppcheck
 BuildRequires: doxygen
-
+BuildRequires: fdupes

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

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

 %files
 %doc README
@@ -24,7 +24,7 @@ BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(libglog)
 BuildRequires: pkgconfig(liblomiri-api)
 BuildRequires: pkgconfig(systemd)
-
+BuildRequires: fdupes

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

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

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

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

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

@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit 0b85fddd0123c86fe6b3464143df86a6d0ad6bb9
+%global commit a083a14fe65105fc1996ceb1b92165ca3b0cb94e
 %forgemeta

 Name:          lomiri
-Version:       0.3.0
-Release:       1%?dist
+Version:       0.2.1
+Release:       1%{?dist}
 Summary:       A convergent desktop environment by Ubports

 License:       GPLv3 AND LGPLv3
@@ -15,7 +15,7 @@ Source0:       %{url}/-/archive/%commit/unityx-%commit.tar.bz2
 Source2:       https://gitlab.xfce.org/panel-plugins/xfce4-windowck-plugin/-/commit/dee596492f006d02e2b39abd072ddd7b37fefe82.diff
 Patch0:        0001-Remove-social-scope.patch

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

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

@@ -6,9 +6,9 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

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

 %description
 VSCodium is a new choice of tool that combines the simplicity of a code editor
@@ -51,7 +52,7 @@ cat <<EOF > vscodium-bin.desktop
 Name=VSCodium
 Comment=Code Editing. Redefined.
 GenericName=Text Editor
-Exec=/usr/bin/codium --no-sandbox %F
+Exec=/usr/bin/codium --no-sandbox --unity-launch %F
 Icon=vscodium
 Type=Application
 StartupNotify=false
@@ -92,6 +93,8 @@ install -dm755 %buildroot%_datadir/bash-completion/completions
 ln -s %_datadir/%name/resources/completions/zsh/_codium %buildroot%_datadir/zsh/site-functions
 ln -s %_datadir/%name/resources/completions/bash/codium %buildroot%_datadir/bash-completion/completions

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

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

 Name:           flow-control-nightly
 Version:        %commit_date.%shortcommit
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "tracy.spec"
-    }
-}
@@ -1,77 +0,0 @@
-%global _desc Tracy is a real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.
-
-Name:			tracy
-Version:		0.11.0
-Release:		1%?dist
-Summary:		A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.
-License:		BSD-3-Clause
-URL:			https://github.com/wolfpld/tracy
-Source0:		https://github.com/wolfpld/tracy/archive/refs/tags/v%version.tar.gz
-BuildRequires:  pkgconfig(egl) pkgconfig(glfw3) pkgconfig(freetype2) pkgconfig(dbus-1) pkgconfig(libunwind) pkgconfig(libdebuginfod) pkgconfig(tbb) pkgconfig(wayland-client) pkgconfig(wayland-protocols) pkgconfig(xkbcommon) pkgconfig(capstone)
-BuildRequires:  cmake gcc gcc-c++ meson
-
-%description
-%_desc
-
-%package devel
-Summary: Development files for the tracy package
-
-%description devel
-%_desc
-This package contains the development files for the tracy package.
-
-%prep
-%autosetup -p1
-
-%build
-%meson
-%meson_build
-
-for project in capture csvexport import-chrome import-fuchsia update profiler
-do
-    pushd $project
-    %cmake -DDOWNLOAD_CAPSTONE=0
-    %cmake_build
-    popd
-done
-
-%install
-%meson_install
-
-# NOTE: the subprojects don't have install targets so we do it manually
-install -Dm755 capture/%__cmake_builddir/tracy-capture %buildroot%_bindir/tracy-capture
-install -Dm755 csvexport/%__cmake_builddir/tracy-csvexport %buildroot%_bindir/tracy-csvexport
-install -Dm755 import-chrome/%__cmake_builddir/tracy-import-chrome %buildroot%_bindir/tracy-import-chrome
-install -Dm755 import-fuchsia/%__cmake_builddir/tracy-import-fuchsia %buildroot%_bindir/tracy-import-fuchsia
-install -Dm755 update/%__cmake_builddir/tracy-update %buildroot%_bindir/tracy-update
-install -Dm755 profiler/%__cmake_builddir/tracy-profiler %buildroot%_bindir/tracy
-
-install -Dm644 extra/desktop/tracy.desktop %buildroot%_datadir/applications/tracy.desktop
-install -Dm644 icon/icon.svg %buildroot%_iconsdir/hicolor/scalable/apps/tracy.svg
-install -Dm644 extra/desktop/application-tracy.xml %buildroot%_datadir/mime/packages/application-tracy.xml
-install -Dm644 icon/application-tracy.svg %buildroot%_iconsdir/hicolor/scalable/apps/application-tracy.svg
-
-%files
-%license LICENSE
-%doc README.*
-%_bindir/tracy
-%_bindir/tracy-capture
-%_bindir/tracy-csvexport
-%_bindir/tracy-import-chrome
-%_bindir/tracy-import-fuchsia
-%_bindir/tracy-update
-%_libdir/libtracy.so
-%_datadir/applications/tracy.desktop
-%_datadir/mime/packages/application-tracy.xml
-%_iconsdir/hicolor/scalable/apps/tracy.svg
-%_iconsdir/hicolor/scalable/apps/application-tracy.svg
-
-%files devel
-%_libdir/pkgconfig/tracy.pc
-%_includedir/common
-%_includedir/tracy
-%_includedir/client
-
-%changelog
-* Wed Jul 24 2024 Owen Zimmerman <owen@fyralabs.com> - 0.11-1
- Initial package.
@@ -1 +0,0 @@
-rpm.version(gh("wolfpld/tracy"));
@@ -4,5 +4,6 @@ project pkg {
  }
  labels {
    nightly = 1
+    large = 1
  }
 }
@@ -1,14 +1,12 @@
-%global commit 479ffbbd51516c7741e2948e048ab13e5b010064
+%global commit 0129d4e2506d5ec5e50ef0968382770b9abec390
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240726
-%global ver 0.147.0
+%global commit_date 20240619
+%global ver 0.142.0

-%bcond_with check
+%bcond_without check

 # Exclude input files from mangling
 %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
-# Use Mold as the linker
-%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold

 %global crate zed
 %global app_id dev.zed.Zed-Nightly
@@ -35,7 +33,7 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  wayland-devel
 BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel-engine
+BuildRequires:  openssl-devel
 BuildRequires:  libzstd-devel
 BuildRequires:  perl-FindBin
 BuildRequires:  perl-IPC-Cmd
@@ -79,8 +77,6 @@ script/generate-licenses
 install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
 install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed

-%__cargo clean
-
 install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
 install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir}/pixmaps/%app_id.png

@@ -2,4 +2,7 @@ project pkg {
  rpm {
    spec = "zed-preview.spec"
  }
+  labels {
+    large = 1
+  }
 }
@@ -1,10 +1,6 @@
-%bcond_with check
-
-%global ver 0.146.1
-# Exclude input files from mangling
-%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
-# Use Mold as the linker
-%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold
+%bcond_without check
+%global debug_package %{nil}
+%global ver 0.145.1

 %global crate zed
 %global app_id dev.zed.Zed-Preview
@@ -75,8 +71,6 @@ script/generate-licenses
 install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
 install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed

-%__cargo clean
-
 install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
 install -Dm644 crates/zed/resources/app-icon-preview.png %{buildroot}%{_datadir}/pixmaps/%app_id.png

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