Merge branch 'el10' into el10-mock-nodev

Signed-off-by: Gilver <rockgrub@disroot.org>
bump: terra-mock-configs
2026-05-31 17:11:56 +00:00 · 2025-05-29 05:42:10 -05:00 · 2025-05-29 10:23:54 +00:00 · 2025-05-29 18:19:48 +08:00 · 2025-05-29 07:38:08 +00:00 · 2025-05-29 00:58:18 -05:00
610 changed files with 18861 additions and 7284 deletions
@@ -1,10 +0,0 @@
-ARG VARIANT="38"
-FROM fedora:${VARIANT}
-
-RUN useradd -m vscode
-RUN groupadd mock
-RUN usermod -aG mock vscode
-RUN echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode
-RUN dnf -y install git 'dnf-command(config-manager)' mock createrepo_c
-RUN dnf config-manager --add-repo='https://raw.githubusercontent.com/terrapkg/subatomic-repos/main/terra.repo'
-RUN dnf -y install anda terra-mock-configs
@@ -1,18 +1,19 @@
 {
-  "name": "Fedora",
-  "build": {
-    "dockerfile": "Dockerfile",
-    "args": { "VARIANT": "38" }
-  },
-  "remoteUser": "vscode",
+  "name": "Terra Devcontainer",
+  "image": "ghcr.io/terrapkg/builder:el10",
  "runArgs": [
    "--privileged"
  ],
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {}
+  },
  "customizations": {
    "vscode": {
      "extensions": [
        "rhaiscript.vscode-rhai"
      ]
    }
-  }
-}
+  },
+  "remoteUser": "vscode",
+  "onCreateCommand": "sudo usermod -a -G mock vscode"
+}
@@ -67,13 +67,9 @@ jobs:
        run: |
          dir=$(dirname ${{ matrix.pkg.pkg }})
          dnf builddep -y ${dir}/*.spec
-          
-      - name: Include custom build template instead of package default
-      run: |
-        cp -v mock-configs/terra-el-dev.tpl /etc/mock/templates/

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} -c terra-el${{ matrix.version }}-dev-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }}
+        run: anda build ${{ matrix.pkg.pkg }} -c terra-el${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }}

      - name: Generating artifact name
        id: art
@@ -48,14 +48,14 @@ jobs:
        run: anda build anda/terra/release/pkg --rpm-builder=rpmbuild

      - name: Build Subatomic
-        run: anda build -c terra-el${{ matrix.version }}-dev-${{ matrix.arch }}.cfg anda/tools/buildsys/subatomic/pkg --rpm-builder=rpmbuild
+        run: anda build -c terra-el${{ matrix.version }}-${{ matrix.arch }}.cfg anda/tools/buildsys/subatomic/pkg --rpm-builder=rpmbuild
      - name: Install Subatomic and anda-srpm-macros
        run: dnf install -y ./anda-build/rpm/rpms/{subatomic,anda-srpm-macros}-*.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 }}-dev-${{ matrix.arch }} anda/tools/buildsys/anda/pkg --rpm-builder=rpmbuild
+        run: anda build -c terra-el${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg --rpm-builder=rpmbuild

      - name: Upload packages to subatomic
        run: |
@@ -61,7 +61,7 @@ jobs:
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Build with Andaman
-        run: anda build -c terra-el${{ matrix.version }}-dev-${{ matrix.arch }} anda/${{ matrix.pkg }}pkg
+        run: anda build -c terra-el${{ matrix.version }}-${{ matrix.arch }} anda/${{ matrix.pkg }}pkg

      - name: Generating artifact name
        id: art
@@ -41,7 +41,7 @@ jobs:
          dnf builddep -y ${dir}/*.spec

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} -c terra-el${{ matrix.version }}-dev-${{ matrix.pkg.arch }} ${{ contains(matrix.pkg.labels, 'mock') && '' || '-rrpmbuild' }}
+        run: anda build ${{ matrix.pkg.pkg }} -c terra-el${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ contains(matrix.pkg.labels, 'mock') && '' || '-rrpmbuild' }}

      - name: Generating artifact name
        id: art
@@ -23,7 +23,7 @@ jobs:
          git config --global commit.gpgsign true

      - name: Backport Action
-        uses: sorenlouv/backport-github-action@v9.3.0
+        uses: sorenlouv/backport-github-action@v9.5.1
        with:
          github_token: ${{ secrets.RABONEKO_BACKPORT_GITHUB_TOKEN }}
          auto_backport_label_prefix: sync-
@@ -48,7 +48,7 @@ jobs:
            git config user.email "raboneko@fyralabs.com"
            git config gpg.format "ssh"
            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump(branch): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            msg="bump(branch): $(anda run andax/ci/update_commit_message.rhai)"
            git commit -S -a -m "$msg"
            git push -u origin --all
          fi
@@ -37,7 +37,7 @@ jobs:
            git config user.email "raboneko@fyralabs.com"
            git config gpg.format "ssh"
            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            msg="bump(nightly): $(anda run andax/ci/update_commit_message.rhai)"
            git commit -S -a -m "$msg"
            git format-patch HEAD^
            copy_over () {
@@ -37,7 +37,7 @@ jobs:
            git config user.email "raboneko@fyralabs.com"
            git config gpg.format "ssh"
            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump(weekly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            msg="bump(weekly): $(anda run andax/ci/update_commit_message.rhai)"
            git commit -S -a -m "$msg"
            git format-patch HEAD^
            copy_over () {
@@ -37,7 +37,7 @@ jobs:
            git config user.email "raboneko@fyralabs.com"
            git config gpg.format "ssh"
            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            msg="bump: $(anda run andax/ci/update_commit_message.rhai)"
            git commit -S -a -m "$msg"
            git format-patch HEAD^
            copy_over () {
@@ -1,8 +1,8 @@
 # Terra Sources

-[![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38)
 [![Repository status](https://repology.org/badge/repository-big/terra_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,9 +1,9 @@
-%global xurl https://files.pythonhosted.org/packages/68/9c/7685bd012e597332f8ce379a31b0d58dd4eae960da96ff43e9fcd978c93f/anki-25.02-cp39-abi3-manylinux_2_35_x86_64.whl
-%global aurl https://files.pythonhosted.org/packages/da/36/741cef7b7fce943d187784549fd8de8152986067d9226f384959c07770a7/anki-25.02-cp39-abi3-manylinux_2_35_aarch64.whl
-%global qurl https://files.pythonhosted.org/packages/2c/bc/763589b97aa5c91acf3d834beaa473c25ca7f335c7b40954fd0d5fd41ddc/aqt-25.02-py3-none-any.whl
+%global xurl https://files.pythonhosted.org/packages/c7/cb/fa787ddcea10823b8a77713f6dd4d6cea6b17fe632bede3bf2d988dff7dc/anki-25.02.1-cp39-abi3-manylinux_2_35_x86_64.whl
+%global aurl https://files.pythonhosted.org/packages/6b/b2/514364b7a8de44a9f22ddc9ec50439e0fe404f0e7e63b64dbb3ca8ebac21/anki-25.02.1-cp39-abi3-manylinux_2_35_aarch64.whl
+%global qurl https://files.pythonhosted.org/packages/66/3f/ffa764b5262c8166c84e701cc333a62f8108d8200647be4a8230c1397e3e/aqt-25.02.1-py3-none-any.whl

 Name:			anki-bin
-Version:		25.02
+Version:		25.02.1
 Release:		1%?dist
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -1,5 +1,5 @@
 Name:           anki-qt5
-Version:        25.02
+Version:        25.02.5
 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
@@ -1,5 +1,5 @@
 Name:           anki
-Version:        25.02
+Version:        25.02.5
 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
@@ -8,7 +8,7 @@ for background device management, as well as a GUI to expertly customize your se
 %global __brp_mangle_shebangs %{nil}

 Name:           coolercontrol
-Version:        2.0.0
+Version:        2.1.0
 Release:        1%?dist
 Summary:        Cooling device control for Linux
 License:        GPL-3.0-or-later
@@ -59,13 +59,16 @@ pushd coolercontrold
 %cargo_prep_online &
 popd

+pushd coolercontrol-ui
+npm ci --prefer-offline &
+popd
+
 wait


 %build
-pushd coolercontrold
-%{cargo_license_online} > LICENSE.dependencies &
-%cargo_build -- &
+pushd coolercontrol-ui
+npm run build-only &
 popd

 pushd coolercontrol-liqctld
@@ -74,10 +77,15 @@ popd

 pushd coolercontrol
 %cmake
-%cmake_build
-wait
+%cmake_build &
 popd

+pushd coolercontrold
+%{cargo_license_online} > LICENSE.dependencies &
+wait
+cp -rfp ../coolercontrol-ui/dist/* resources/app/
+%cargo_build
+popd

 %install
 pushd coolercontrol-liqctld
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

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

 Name:           discord-openasar
-Version:        0.0.88
+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
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

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

 Name:			discord
-Version:		0.0.88
+Version:		0.0.95
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,22 +1,27 @@
-%global commit 1ed031a2bf25c81ba3795e42c5b063779bb391bf
-%global commit_date 20250214
+%global commit d42de840a2d1f2bb973278c45a873db75b773e25
+%global commit_date 20250521
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision-nightly
 Version:        %commit_date.%shortcommit
 Release:        1%?dist
 Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
-License:        AGPL-3.0-or-later
+SourceLicense:  AGPL-3.0-or-later
+License:        ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND ISC AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND Unicode-3.0 AND (Unlicense OR MIT) AND Zlib
 URL:            https://gitlab.com/gabmus/envision/
 Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo 
+BuildRequires:  anda-srpm-macros
+BuildRequires:  cargo
+BuildRequires:  cargo-rpm-macros
+BuildRequires:  meson
+BuildRequires:  ninja-build
 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:  pkgconfig(openssl)
 BuildRequires:  openxr-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
@@ -30,17 +35,27 @@ Conflicts:      envision

 %prep
 %autosetup -n envision-%commit
+%cargo_prep_online

 %build
+# generate constants.rs from constants.rs.in
 %meson
+
+# skip subdir
+sed -E "/^subdir\('src'\)/d" -i meson.build
+
+%meson --reconfigure
 %meson_build

 %install
 %meson_install
+%cargo_install
+%{cargo_license_online} > LICENSE.dependencies

 %files
 %doc README.md
 %license LICENSE
+%license LICENSE.dependencies
 %_bindir/envision
 %_datadir/applications/org.gabmus.envision.Devel.desktop
 %_datadir/envision/
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			feishin
-Version:		0.12.3
+Version:		0.13.0
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
@@ -0,0 +1,8 @@
+project pkg {
+    rpm {
+        spec = "flameshot-nightly.spec"
+    }
+    labels {
+        nightly = 1
+    }
+}
@@ -0,0 +1,128 @@
+#? https://github.com/flameshot-org/flameshot/blob/master/packaging/rpm/fedora/flameshot.spec
+
+%global ver v12.1.0
+%global commit 0299a6776b7116c243fd1c285ad660d38cc65914
+%global shortcommit %{sub %{commit} 1 7}
+%global commit_date 20250529
+
+Name:			flameshot.nightly
+Version:		%ver^%{commit_date}git.%shortcommit
+Release:		1%?dist
+License:		GPL-3.0-or-later AND ASL-2.0 AND GPL-2.0-only AND LGPL-3.0-only AND FAL-1.3
+Summary:		Powerful yet simple to use screenshot software
+URL:			https://flameshot.org
+Source0:		https://github.com/flameshot-org/flameshot/archive/%commit/flameshot-%commit.tar.gz
+Packager:  madonuko <mado@fyralabs.com>
+
+BuildRequires:	cmake >= 3.13.0
+BuildRequires:	gcc-c++ >= 7
+BuildRequires:	fdupes
+BuildRequires:	libappstream-glib
+BuildRequires:	ninja-build
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	cmake(Qt5Core) >= 5.9.0
+BuildRequires:	cmake(KF5GuiAddons) >= 5.89.0
+BuildRequires:	cmake(Qt5DBus) >= 5.9.0
+BuildRequires:	cmake(Qt5Gui) >= 5.9.0
+BuildRequires:	cmake(Qt5LinguistTools) >= 5.9.0
+BuildRequires:	cmake(Qt5Network) >= 5.9.0
+BuildRequires:	cmake(Qt5Svg) >= 5.9.0
+BuildRequires:	cmake(Qt5Widgets) >= 5.9.0
+
+Requires:		hicolor-icon-theme
+Requires:		qt5-qtbase >= 5.9.0
+Requires:		qt5-qttools >= 5.9.0
+Requires:		qt5-qtsvg%{?_isa} >= 5.9.0
+
+%dnl Provides:		flameshot = %version-%release
+Conflicts:		flameshot
+
+Recommends:		xdg-desktop-portal%{?_isa}
+Recommends:		(xdg-desktop-portal-gnome%{?_isa} if gnome-shell%{?_isa})
+Recommends:		(xdg-desktop-portal-kde%{?_isa} if plasma-workspace-wayland%{?_isa})
+Recommends:		(xdg-desktop-portal-wlr%{?_isa} if wlroots%{?_isa})
+
+%description
+Powerful and simple to use screenshot software with built-in
+editor with advanced features.
+
+Features:
+
+ * Customizable appearance.
+ * Easy to use.
+ * In-app screenshot edition.
+ * DBus interface.
+ * Upload to Imgur
+
+
+%package bash-completion
+Summary:		Bash completion for %{name}
+Requires:		%{name} = %{version}-%{release}
+Requires: 		bash-completion
+Supplements:	(%{name} and bash-completion)
+
+%description bash-completion
+Bash command line completion support for %{name}.
+
+%package fish-completion
+Summary:		Fish completion for %{name}
+Requires:		%{name} = %{version}-%{release}
+Requires:		fish
+Supplements:	(%{name} and fish)
+
+%description fish-completion
+Fish command line completion support for %{name}.
+
+%package zsh-completion
+Summary:		Zsh completion for %{name}
+Requires:		%{name} = %{version}-%{release}
+Requires:		zsh
+Supplements:	(%{name} and zsh)
+
+%description zsh-completion
+Zsh command line completion support for %{name}.
+
+
+%prep
+%autosetup -p1 -n flameshot-%commit
+
+%build
+%cmake -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DUSE_WAYLAND_CLIPBOARD:BOOL=ON \
+%cmake_build
+
+%install
+%cmake_install
+# https://fedoraproject.org/wiki/PackagingDrafts/find_lang
+%find_lang Internationalization --with-qt
+%fdupes %{buildroot}%{_datadir}/icons
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+
+%files -f Internationalization.lang
+%{_datadir}/flameshot/translations/Internationalization_grc.qm
+%doc README.md
+%license LICENSE
+%dir %{_datadir}/flameshot
+%dir %{_datadir}/flameshot/translations
+%{_bindir}/flameshot
+%{_datadir}/applications/org.flameshot.Flameshot.desktop
+%{_metainfodir}/org.flameshot.Flameshot.metainfo.xml
+%{_datadir}/dbus-1/interfaces/org.flameshot.Flameshot.xml
+%{_datadir}/dbus-1/services/org.flameshot.Flameshot.service
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
+%{_mandir}/man1/flameshot.1*
+
+%files bash-completion
+%{bash_completions_dir}/flameshot
+
+%files fish-completion
+%{fish_completions_dir}/flameshot.fish
+
+%files zsh-completion
+%{zsh_completions_dir}/_flameshot
@@ -0,0 +1,5 @@
+rpm.global("commit", gh_commit("flameshot-org/flameshot"));
+if rpm.changed() {
+    rpm.global("ver", gh("flameshot-org/flameshot"));
+    rpm.global("commit_date", date());
+}
@@ -1,6 +1,6 @@
 project pkg {
 	arches = ["x86_64"]
 	rpm {
-		spec = "tau-helium.spec"
+		spec = "flatpost.spec"
 	}
 }
@@ -0,0 +1,16 @@
+commit 86a77b2e3d69a09f75992e6795903ab56df1a900 (HEAD -> main, fork/main)
+Author: Adam Fidel <adam@fidel.id>
+Date:   Tue Apr 22 14:52:16 2025 -0500
+
+    feat: add MimeType to .desktop file
+
+diff --git a/data/usr/share/applications/com.flatpost.flatpostapp.desktop b/data/usr/share/applications/com.flatpost.flatpostapp.desktop
+index 73013fc..d1f321d 100644
+--- a/data/usr/share/applications/com.flatpost.flatpostapp.desktop
+++ b/data/usr/share/applications/com.flatpost.flatpostapp.desktop
+@@ -4,3 +4,4 @@ Exec=python3 /usr/bin/flatpost
+ Icon=com.flatpost.flatpostapp
+ Type=Application
+ Categories=Utility;
+MimeType=application/vnd.flatpak.ref;application/vnd.flatpak.repo;
+
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/vnd.flatpak.ref">
+    <glob pattern="*.flatpakref"/>
+    <comment>Flatpak Reference File</comment>
+  </mime-type>
+  <mime-type type="application/vnd.flatpak.repo">
+    <glob pattern="*.flatpakrepo"/>
+    <comment>Flatpak Repository File</comment>
+  </mime-type>
+</mime-info>
@@ -0,0 +1,77 @@
+Name:          flatpost
+Version:       1.0.5
+Release:       1%?dist
+License:       BSD-2-Clause
+Summary:       Desktop environment agnostic Flathub software center.
+
+URL:            https://github.com/gloriouseggroll/flatpost
+Source0:        %{url}/archive/refs/tags/%{version}.tar.gz
+Source1:        flatpost-mime.xml
+Patch0:         flatpost-desktop-mimetype.patch
+
+BuildArch:      noarch
+BuildRequires:  python3-devel
+BuildRequires:  make
+BuildRequires:  desktop-file-utils
+
+Provides:	nobara-updater
+
+# App Deps
+Requires: python
+Requires: python3
+Requires: python3-gobject
+Requires: python3-requests
+Requires: python3-pillow
+Requires: python3-svgwrite
+Requires: python3-fonttools
+Requires: python3-numpy
+
+Requires: flatpak
+Requires: glib2
+Requires: gtk3
+Requires: gtk4
+Requires: xdg-utils
+
+Requires(post):      shared-mime-info
+Requires(postun):    shared-mime-info
+Requires(posttrans): shared-mime-info
+
+%description
+Desktop environment agnostic Flathub software center. Allows for browsing,
+installation, removal, updating, and permission management of flatpak packages and repositories.
+
+%prep
+%autosetup -p1
+
+%build
+make all DESTDIR=%{buildroot}
+install -D -m644 %{SOURCE1} %{buildroot}/usr/share/mime/packages/flatpost.xml
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/com.flatpost.flatpostapp.desktop
+
+%post
+xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+update-mime-database usr/share/mime &>/dev/null
+update-desktop-database -q
+
+%postun
+xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+update-mime-database usr/share/mime &>/dev/null
+update-desktop-database -q
+
+%posttrans
+xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+update-mime-database usr/share/mime &>/dev/null
+update-desktop-database -q
+
+%files
+%{python3_sitelib}/flatpost/
+%{_bindir}/flatpost
+%{_datadir}/applications/com.flatpost.flatpostapp.desktop
+%{_datadir}/flatpost/collections_data.json
+%{_datadir}/icons/hicolor/1024x1024/apps/com.flatpost.flatpostapp.png
+%{_datadir}/icons/hicolor/64x64/apps/com.flatpost.flatpostapp.png
+%{_datadir}/mime/packages/flatpost.xml
+%license %{_datadir}/licenses/flatpost/LICENSE
+
@@ -0,0 +1,3 @@
+let v = gh_rawfile("GloriousEggroll/flatpost", "main", "VERSION.txt");
+v.trim();
+rpm.version(v);
@@ -3,18 +3,19 @@
 %global gtk4_version        4.14.4
 %global libadwaita_version  1.5.1
 %global pure_protobuf_version 2.0.0
+%global raw_ver v1.78.0

 Name:           komikku
-Version:        1.72.0
+Version:        1.78.0
 %forgemeta
-Release:        2%?dist
+Release:        1%?dist
 Summary:        A manga reader for GNOME

 BuildArch:      noarch

 License:        GPL-3.0-or-later
 URL:            https://valos.gitlab.io/Komikku
-Source0:        https://codeberg.org/valos/%{appname}/archive/v%{version}.tar.gz#/%{name}-v%{version}.tar.gz
+Source0:        https://codeberg.org/valos/%{appname}/archive/%{raw_ver}.tar.gz#/%{name}-%{version}.tar.gz

 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
@@ -22,6 +23,7 @@ BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.59.0
 BuildRequires:  python3-devel >= 3.8
 BuildRequires:  blueprint-compiler
+BuildRequires:  cmake

 BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 1.35.9
 BuildRequires:  pkgconfig(gtk4) >= %{gtk4_version}
@@ -97,6 +99,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
+%{_datadir}/dbus-1/services/%{uuid}.service
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
 %{_datadir}/icons/hicolor/scalable/*/*.svg
 %{_datadir}/icons/hicolor/symbolic/*/*.svg
@@ -1,3 +1,4 @@
 let latest_tag = get("https://codeberg.org/api/v1/repos/valos/Komikku/tags").json_arr()[0].name;
 let new_version = find("([\\.\\d]+)", latest_tag, 1);
+rpm.global("raw_ver", latest_tag);
 rpm.version(new_version);
@@ -2,47 +2,44 @@
 %global _build_id_links none

 %ifarch x86_64
-%global src LegCord-%version-linux-x64
+%global src Legcord-%version-linux-x64
 %elifarch aarch64
-%global src LegCord-%version-linux-arm64
+%global src Legcord-%version-linux-arm64
 %elifarch armv7l
-%global src LegCord-%version-linux-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.1.0
-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
+Name:           legcord-bin
+Version:        1.1.5
+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.tar.gz
+Source1:        legcord.png
+Source2:        https://raw.githubusercontent.com/Legcord/Legcord/v%version/README.md
+Requires:       xdg-utils
+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
+Legcord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

 %prep
-mkdir legcord
-cd legcord
-unzip %SOURCE0
+%autosetup -n %src

 cat <<EOF > .legcord.desktop
 [Desktop Entry]
-Name=LegCord
+Name=Legcord
 Comment=%summary
 GenericName=Internet Messenger
 Type=Application
@@ -56,7 +53,6 @@ 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
@@ -1,28 +1,28 @@
-%global commit ddd87bf96716c553369c26a6de7137a3c70bc373
-%global commit_date 20250214
+%global commit c8449c05b1f39936424c616cdee34bab670063ce
+%global commit_date 20250529
 %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
+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
+Legcord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

 %prep
@@ -30,7 +30,7 @@ while keeping everything lightweight.

 cat <<EOF > legcord.desktop
 [Desktop Entry]
-Name=LegCord
+Name=Legcord
 Comment=%summary
 GenericName=Internet Messenger
 Type=Application
@@ -4,25 +4,25 @@
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so

-Name:		legcord
-Version:	1.1.0
-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
-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
+Name:           legcord
+Version:        1.1.5
+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
+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
+Legcord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

 %prep
@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "mission-center.spec"
+    }
+}
@@ -0,0 +1,99 @@
+%global forgeurl0 https://gitlab.com/mission-center-devs/mission-center
+Version: 1.0.2
+%global tag0 v%{version}
+
+%global forgeurl1 https://gitlab.com/mission-center-devs/gng
+%global commit1 319d95d29cbc3c373ae61cff228e8440fbaadbbb
+
+
+%forgemeta -a
+
+Name:           mission-center
+Release:        1%?dist
+Summary:        Monitor your CPU, Memory, Disk, Network and GPU usage
+
+License:        GPL-3.0-or-later
+URL:            %{forgeurl0}
+Source0:         %{forgesource0}
+Source1:         %{forgesource1}
+Provides: bundled(mission-center-magpie)
+Provides: bundled(nvtop) = 3.2.0
+#mission centere uses a patched version of nvtop
+
+BuildRequires: meson >= 0.63
+BuildRequires: cargo
+BuildRequires: cmake
+BuildRequires: gcc
+BuildRequires:  gcc-c++
+BuildRequires: pkgconfig(protobuf)
+BuildRequires: pkgconfig(python3)
+BuildRequires: pkgconfig(libdrm)
+BuildRequires: pkgconfig(gbm)
+BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(gtk4)
+BuildRequires: pkgconfig(egl)
+BuildRequires: libadwaita-devel
+BuildRequires: desktop-file-utils
+BuildRequires: blueprint-compiler
+BuildRequires: cargo-rpm-macros >= 24
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+BuildRequires: appstream-data
+BuildRequires: libappstream-glib
+Recommends: nethogs
+
+%description
+Monitor your CPU, Memory, Disk, Network and GPU usage
+
+
+%prep
+%forgesetup -z 0
+mkdir -p ./subprojects/magpie
+tar -x --strip-components=1  -f %{SOURCE1} -C ./subprojects/magpie
+pushd ./subprojects/magpie/
+%cargo_prep_online
+popd
+%cargo_prep_online
+%{cargo_license_summary_online}
+# %cargo_license_online > LICENSE.dependencies
+#builds is erroring
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+%find_lang missioncenter
+
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/io.missioncenter.MissionCenter.desktop
+appstream-util validate-relax  %{buildroot}/%{_datadir}/metainfo/io.missioncenter.MissionCenter.metainfo.xml
+%meson_test
+
+# https://gitlab.com/mission-center-devs/mission-center/-/wikis/Home/Nethogs
+%post
+if  command -v nethogs 2>&1 >/dev/null
+then
+     setcap "cap_net_admin,cap_net_raw,cap_dac_read_search,cap_sys_ptrace+pe" "$(which nethogs)"
+fi
+
+
+%files -f missioncenter.lang
+%doc README.md
+%license COPYING
+#builds is erroring
+# [%]license LICENSE.dependencies
+%{_datadir}/missioncenter/
+%{_datadir}/applications/io.missioncenter.MissionCenter.desktop
+%{_datadir}/metainfo/io.missioncenter.MissionCenter.metainfo.xml
+%{_datadir}/glib-2.0/schemas/io.missioncenter.MissionCenter.gschema.xml
+%{_datadir}/icons/hicolor/scalable/apps/io.missioncenter.MissionCenter.svg
+%{_datadir}/icons/hicolor/symbolic/apps/io.missioncenter.MissionCenter-symbolic.svg
+%{_bindir}/missioncenter-magpie
+%{_bindir}/missioncenter
+
+
+%changelog
+%autochangelog
@@ -0,0 +1,4 @@
+rpm.version(gitlab_tag("44426042"));
+if rpm.changed() {
+  rpm.global("commit1", gitlab_commit("66855638", "main"));
+}
@@ -1,11 +1,11 @@
-%global commit 23e1fb472a165917e623aede9052ab23f03d1ac3
+%global commit 1d1535ff9124fdeb3c81a2f089551e2cc8404613
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250217
-%global ver 0.39.0
+%global commit_date 20250523
+%global ver 0.40.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
-Release:        2%?dist
+Release:        1%?dist

 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary:        Movie player playing most video formats and DVDs
@@ -0,0 +1 @@
+1.11.8
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "nekoray.spec"
+	}
+}
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Type=Application
+Name=nekoray
+Categories=Network;
+Comment=Qt based cross-platform GUI proxy configuration manager (backend: sing-box)
+Comment[zh_CN]=基于 Qt 的跨平台代理配置管理器 (后端 sing-box)
+Keywords=Internet;VPN;Proxy;sing-box;
+Exec=/bin/nekoray
+Icon=/usr/share/icons/nekoray.ico
@@ -0,0 +1,2 @@
+#!/bin/sh
+/lib64/nekoray/nekoray -appdata "${@}"
@@ -0,0 +1,93 @@
+%global gomodulesmode GO111MODULE=on
+Name: nekoray
+Version: 4.3.5
+Release: 0%{?autorelease}
+Summary: Qt based cross-platform GUI proxy configuration manager (backend: sing-box)
+URL: https://github.com/Mahdi-zarei/nekoray
+License: GPLv3
+
+Source0: https://github.com/Mahdi-zarei/nekoray/archive/refs/tags/%{version}.tar.gz#/nekoray-%{version}.tar.gz
+Packager: bunzuhbu <g89156436@gmail.com>
+Source1: vendor-%{version}.tar.gz
+%define fetch_vendor %{_rpmconfigdir}/rpmuncompress -xv %{SOURCE1}
+
+Source2: Sagernet.SingBox.Version.txt
+%define singbox_version $(cat %{SOURCE2})
+
+Source3: %{name}.desktop
+Source4: %{name}.sh
+
+BuildRequires: rpm_macro(cmake)
+BuildRequires: rpm_macro(cmake_build)
+BuildRequires: rpm_macro(cmake_install)
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig(protobuf)
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: cmake(yaml-cpp)
+BuildRequires: cmake(ZXing)
+BuildRequires: cmake(absl)
+BuildRequires: cmake(cpr)
+BuildRequires: cmake(Qt6)
+BuildRequires: cmake(Qt6Svg)
+BuildRequires: cmake(Qt6Linguist)
+BuildRequires: cmake(Qt6Charts)
+BuildRequires: patchelf
+BuildRequires: sed
+BuildRequires: golang
+BuildRequires: rpm_macro(gobuildflags)
+Requires: %{name}-core
+%define core nekobox_core
+
+%package core
+Summary: %{summary}
+
+%description
+%{summary}
+
+%description core
+%{summary}
+
+%prep
+%autosetup -p1 -n %{name}-%{version}
+sed -i 's~find_package(Protobuf CONFIG REQUIRED)~find_package(Protobuf REQUIRED)~' cmake/myproto.cmake
+sed -i 's~add_library(qhotkey 3rdparty/QHotkey/qhotkey.cpp)~add_library(qhotkey STATIC 3rdparty/QHotkey/qhotkey.cpp)~' cmake/QHotkey.cmake
+sed -i 's~ImageFormat::BGRA~ImageFormat::BGR~' 3rdparty/ZxingQtReader.hpp
+pushd core/server
+%{fetch_vendor}
+popd
+
+%build
+%cmake
+%cmake_build
+DEST=$PWD/%{__cmake_builddir}/%{core}
+pushd core/server
+go build %{gobuildflags} -o $DEST -trimpath -ldflags "-B 0x$(echo "%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}" | sha1sum | cut -d ' ' -f1) -w -s -X 'github.com/sagernet/sing-box/constant.Version=%{singbox_version}'" -tags "with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_ech,with_dhcp"
+popd
+
+%install
+mkdir -p %{buildroot}%{_libdir}/%{name}
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/icons
+
+cp %{SOURCE4} %{buildroot}%{_bindir}/%{name}
+cp %{SOURCE3} %{buildroot}%{_datadir}/applications/%{name}.desktop
+sed -i 's~/bin~%{_bindir}~g;s~/usr/share~%{_datadir}~g;s~nekoray~%{name}~g' %{buildroot}%{_datadir}/applications/%{name}.desktop
+sed -i 's~/bin~%{_bindir}~g;s~/lib64~%{_libdir}~g;s~nekoray~%{name}~g' %{buildroot}%{_bindir}/%{name}
+cp %{__cmake_builddir}/%{name} %{buildroot}%{_libdir}/%{name}/%{name}
+cp %{__cmake_builddir}/%{core} %{buildroot}%{_libdir}/%{name}/%{core}
+cp res/nekoray.ico %{buildroot}%{_datadir}/icons/%{name}.ico
+patchelf --remove-rpath %{buildroot}%{_libdir}/%{name}/%{name}
+patchelf --remove-rpath %{buildroot}%{_libdir}/%{name}/%{core}
+
+%files
+%attr(0755, -, -) %{_bindir}/%{name}
+%attr(0755, -, -) %{_libdir}/%{name}/%{name}
+%attr(0644, -, -) %{_datadir}/icons/%{name}.ico
+%attr(0644, -, -) %{_datadir}/applications/%{name}.desktop
+
+%files core
+%dir %{_libdir}/%{name}
+%attr(0755, -, -) %{_libdir}/%{name}/%{core}
+
@@ -0,0 +1,5 @@
+let sourcedir = "anda/apps/nekoray";
+
+sh(`dnf in -y golang rpmdevtools tar rpm-build coreutils`, #{});
+sh(`pushd ${sourcedir}; bash -x pre.sh; popd`, #{});
+
@@ -0,0 +1,9 @@
+export sourcedir="$PWD"
+rpmdev-spectool --all --get-files nekoray.spec
+version=$(rpmspec --query --queryformat "%{VERSION}\n" nekoray.spec | uniq)
+
+tar -xzf "nekoray-${version}.tar.gz"
+pushd "nekoray-${version}/core/server"
+ go mod vendor
+ tar -czf "${sourcedir}/vendor-${version}.tar.gz" vendor
+popd
@@ -0,0 +1,3 @@
+rpm.version(find(`([\d.]+)-\d+-\d+-\d+`, gh_rawfile("Mahdi-zarei/nekoray", "dev", "nekoray_version.txt"), 1));
+
+open_file("anda/apps/nekoray/Sagernet.SingBox.Version.txt", "w").write(gh("sagernet/sing-box"));
@@ -2,8 +2,8 @@
 %define debug_package %nil

 Name:           peazip
-Version:        10.3.0
-Release:        2%?dist
+Version:        10.4.0
+Release:        1%?dist
 Summary:        Free Zip / Unzip software and Rar file extractor. Cross-platform file and archive manager
 License:        LGPL-3.0-only
 URL:            https://peazip.github.io
@@ -101,10 +101,19 @@ lazbuild --ws=qt6 dev/project_pea.lpi && cp dev/pea ../pea.qt6
 %install
 install -Dm755 peazip.* -t %buildroot%_bindir
 install -Dm755 pea.* -t %buildroot%_bindir
+install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/peazip.desktop -t %{buildroot}%{_datadir}/applications
+install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/*.png -t %{buildroot}%{_datadir}/pixmaps
+install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE6-dolphin/peazip-kde6.desktop -t %{buildroot}%{_datadir}/kio/servicemenus
+install -Dm644 peazip-sources/res/share/batch/freedesktop_integration/Nautilus-scripts/PeaZip/* -t %{buildroot}%{_datadir}/nautilus/scripts/PeaZip

 %files
 %doc README.md
 %license LICENSE SECURITY.md
+%{_datadir}/applications/peazip.desktop
+%{_datadir}/pixmaps/peazip*.png
+%{_datadir}/kio/servicemenus/peazip-kde6.desktop
+%dir %{_datadir}/nautilus/scripts/PeaZip
+%{_datadir}/nautilus/scripts/PeaZip/*

 %files -n pea
 %doc README.md
@@ -1,4 +1,4 @@
-%global ver 2025-03-18
+%global ver 2025-05-29
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -9,7 +9,7 @@ language. Ruffle targets both the desktop and the web using WebAssembly.}

 Name:           ruffle-nightly
 Version:        %goodver
-Release:        1%?dist
+Release:        2%?dist
 Summary:        A Flash Player emulator written in Rust
 License:        Apache-2.0 OR MIT
 URL:            https://ruffle.rs/
@@ -31,7 +31,7 @@ Packager:       madonuko <mado@fyralabs.com>
 %doc README.md
 %license LICENSE.md
 %license LICENSE.dependencies
-%_bindir/ruffle_desktop
+%_bindir/ruffle
 %_datadir/applications/rs.ruffle.Ruffle.desktop
 %_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
 %_metainfodir/rs.ruffle.Ruffle.metainfo.xml
@@ -39,18 +39,18 @@ Packager:       madonuko <mado@fyralabs.com>
 %prep
 %autosetup -n ruffle-nightly-%ver -p1
 %cargo_prep_online
-sed -iE 's@^Exec=ruffle %%u$@Exec=ruffle_desktop %%u@' desktop/packages/linux/rs.ruffle.Ruffle.desktop
-cat desktop/packages/linux/rs.ruffle.Ruffle.desktop

 %build
-%{cargo_license_online} > LICENSE.dependencies
+cd desktop
+%cargo_build

 %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
+install -Dm755 target/rpm/ruffle_desktop %buildroot%_bindir/ruffle
+install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
+install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop
+install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml %buildroot%_metainfodir/rs.ruffle.Ruffle.metainfo.xml
+
+%{cargo_license_online} > LICENSE.dependencies

 %changelog
 * Mon Jul 29 2024 madonuko <mado@fyralabs.com>
@@ -2,8 +2,8 @@
 %global realname subtitleedit

 Name:           %realname.bin
-Version:        4.0.11
-Release:        1%?dist
+Version:        4.0.12
+Release:        2%?dist
 Summary:        An advanced subtitle editor and converter
 License:        GPL-3.0-only
 URL:            https://www.nikse.dk/SubtitleEdit
@@ -13,7 +13,7 @@ Packager:       madonuko <mado@fyralabs.com>
 Provides:       %realname = %evr
 Conflicts:      %realname
 BuildRequires:  unzip anda-srpm-macros
-Requires:       mono dejavu-fonts
+Requires:       dejavu-sans-mono-fonts mono-core

 %description
 %summary.
@@ -33,7 +33,7 @@ EOF

 cat<<EOF > subtitleedit
 #!/usr/bin/sh
-exec mono /opt/subtitleedit/SubtitleEdit.exe "$@"
+exec mono /usr/share/subtitleedit/SubtitleEdit.exe "$@"
 EOF


@@ -1,27 +0,0 @@
-From 44046bfbcb30a19c45416113a2a82a4d17a1a998 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Mon, 14 Aug 2023 14:06:45 +0200
-Subject: [PATCH 01/10] main: update GPUs comment for dbus property
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/net.hadess.SwitcherooControl.xml | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/net.hadess.SwitcherooControl.xml b/src/net.hadess.SwitcherooControl.xml
-index e52bc1a..59a8896 100644
--- a/src/net.hadess.SwitcherooControl.xml
-+++ b/src/net.hadess.SwitcherooControl.xml
-@@ -38,7 +38,8 @@
-         will contain a user-facing name for the GPU, the "Environment" (as) key will
-         contain an array of even number of strings, each being an environment
-         variable to set to use the GPU, followed by its value, the "Default" (b) key
-        will tag the default (usually integrated) GPU.
-+        will tag the default GPU, the "Discrete" (b) key tags if the GPU is a
-+        dedicated component.
-     -->
-     <property name="GPUs" type="aa{sv}" access="read"/>
- 
-- 
-2.46.0
-
@@ -1,379 +0,0 @@
-From 4f31415cb61a50c2bcba1510a7511518417d0970 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Mon, 11 Sep 2023 15:21:46 +0200
-Subject: [PATCH 02/10] main: add Discrete key
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- .gitlab-ci.yml                     |   1 +
- data/30-discrete-gpu.rules.in      |   3 +
- data/meson.build                   |   7 ++
- meson.build                        |   9 +++
- meson_options.txt                  |  24 +++++++
- src/discrete-detection/amdgpu.c    |  46 +++++++++++++
- src/discrete-detection/meson.build |  18 +++++
- src/discrete-detection/nouveau.c   | 105 +++++++++++++++++++++++++++++
- src/meson.build                    |   4 +-
- src/switcheroo-control.c           |  16 +++++
- 10 files changed, 232 insertions(+), 1 deletion(-)
- create mode 100644 data/30-discrete-gpu.rules.in
- create mode 100644 src/discrete-detection/amdgpu.c
- create mode 100644 src/discrete-detection/meson.build
- create mode 100644 src/discrete-detection/nouveau.c
-
-diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
-index a6aa3c7..a09fe20 100644
--- a/.gitlab-ci.yml
-+++ b/.gitlab-ci.yml
-@@ -3,6 +3,7 @@ image: fedora:rawhide
- variables:
-   DEPENDENCIES: glib2-devel
-                 libgudev-devel
-+                libdrm-devel
-                 gtk-doc
-                 gcc
-                 gcc-c++
-diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in
-new file mode 100644
-index 0000000..a803ed4
--- /dev/null
-+++ b/data/30-discrete-gpu.rules.in
-@@ -0,0 +1,3 @@
-+DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
-+DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
-+DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu"
-diff --git a/data/meson.build b/data/meson.build
-index 85e5c93..38cf96c 100644
--- a/data/meson.build
-+++ b/data/meson.build
-@@ -17,3 +17,10 @@ install_data(
-   '30-pci-intel-gpu.hwdb',
-   install_dir: hwdb_dir,
- )
-+
-+configure_file(
-+  input: '30-discrete-gpu.rules.in',
-+  output: '30-discrete-gpu.rules',
-+  configuration: data_conf,
-+  install_dir: rules_dir,
-+)
-diff --git a/meson.build b/meson.build
-index b8f4bff..b3aaf0c 100644
--- a/meson.build
-+++ b/meson.build
-@@ -20,6 +20,9 @@ gnome = import('gnome')
- glib = dependency('glib-2.0', version: '>= 2.56.0')
- gio = dependency('gio-2.0', version: '>= 2.56.0')
- gudev = dependency('gudev-1.0', version: '>= 232')
-+libdrm = dependency('libdrm', version: '>= 2.4.97', required: get_option('libdrm'))
-+libdrm_nouveau = dependency('libdrm_nouveau', version: '>= 2.4.97', required: get_option('libdrm_nouveau'))
-+libdrm_amdgpu = dependency('libdrm_amdgpu', version: '>= 2.4.97', required: get_option('libdrm_amdgpu'))
- 
- systemd_systemunitdir = get_option('systemdsystemunitdir')
- if systemd_systemunitdir == ''
-@@ -32,6 +35,12 @@ if hwdb_dir == ''
-   hwdb_dir = udevdir / 'hwdb.d'
- endif
- 
-+rules_dir = get_option('rulesdir')
-+if rules_dir == ''
-+  udevdir = dependency('udev').get_pkgconfig_variable('udevdir')
-+  rules_dir = udevdir / 'rules.d'
-+endif
-+
- # Make like license available in the build root for docs
- configure_file(
-   input: 'COPYING',
-diff --git a/meson_options.txt b/meson_options.txt
-index c8d9619..b8d671a 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -10,6 +10,12 @@ option('hwdbdir',
-   description: 'Directory for hwdb files',
- )
- 
-+option('rulesdir',
-+  type: 'string',
-+  value: '',
-+  description: 'Directory for ruke files',
-+)
-+
- option('gtk_doc',
-   type: 'boolean',
-   value: false,
-@@ -21,3 +27,21 @@ option('tests',
-   type: 'boolean',
-   value: false
- )
-+
-+option('libdrm',
-+  description: 'Whether libdrm should be used to probe GPUs',
-+  type: 'feature',
-+  value: 'auto'
-+)
-+
-+option('libdrm_nouveau',
-+  description: 'Whether libdrm_nouveau should be used to probe Nvidia GPUs',
-+  type: 'feature',
-+  value: 'auto'
-+)
-+
-+option('libdrm_amdgpu',
-+  description: 'Whether libdrm_amdgpu should be used to probe AMD GPUs',
-+  type: 'feature',
-+  value: 'auto'
-+)
-diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c
-new file mode 100644
-index 0000000..2d9804f
--- /dev/null
-+++ b/src/discrete-detection/amdgpu.c
-@@ -0,0 +1,46 @@
-+
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <gio/gio.h>
-+#include <gudev/gudev.h>
-+
-+#include <amdgpu.h>
-+#include <amdgpu_drm.h>
-+
-+typedef int handle;
-+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free);
-+
-+int main(int argc, char** argv)
-+{
-+	if (argc < 2)
-+	{
-+		puts ("check-discrete-amdgpu [DEVNAME]");
-+		return EXIT_FAILURE;
-+	}
-+
-+	const char *devname;
-+	g_auto(handle) fd = -1;
-+	g_autoptr(GUdevDevice) parent = NULL;
-+	struct drm_amdgpu_info_device device_info = {0};
-+	amdgpu_device_handle device = NULL;
-+	uint32_t drm_major, drm_minor;
-+
-+	devname = argv[1];
-+	fd = open (devname, O_RDWR);
-+	if (fd < 0)
-+		return EXIT_FAILURE;
-+
-+	if (amdgpu_device_initialize (fd, &drm_major, &drm_minor, &device))
-+		return EXIT_FAILURE;
-+
-+	if (amdgpu_query_info (device, AMDGPU_INFO_DEV_INFO, sizeof(device_info), &device_info))
-+		return EXIT_FAILURE;
-+
-+	/* AMDGPU_IDS_FLAGS_FUSION is set for all APUs */
-+	if (device_info.ids_flags & AMDGPU_IDS_FLAGS_FUSION)
-+		return EXIT_FAILURE;
-+
-+	return EXIT_SUCCESS;
-+}
-diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build
-new file mode 100644
-index 0000000..3a6c03f
--- /dev/null
-+++ b/src/discrete-detection/meson.build
-@@ -0,0 +1,18 @@
-+
-+if libdrm_amdgpu.found()
-+  executable('check-discrete-amdgpu',
-+    files('amdgpu.c'),
-+    dependencies: deps,
-+    install: true,
-+    install_dir: libexecdir,
-+  )
-+endif
-+
-+if libdrm.found() and libdrm_nouveau.found()
-+  executable('check-discrete-nouveau',
-+    files('nouveau.c'),
-+    dependencies: deps,
-+    install: true,
-+    install_dir: libexecdir,
-+  )
-+endif
-diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c
-new file mode 100644
-index 0000000..0a1f220
--- /dev/null
-+++ b/src/discrete-detection/nouveau.c
-@@ -0,0 +1,105 @@
-+
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <gio/gio.h>
-+#include <gudev/gudev.h>
-+
-+#include <xf86drm.h>
-+#include <nouveau_drm.h>
-+#include <nouveau/nvif/ioctl.h>
-+#include <nvif/cl0080.h>
-+#include <nvif/class.h>
-+
-+typedef int handle;
-+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
-+
-+int main(int argc, char** argv)
-+{
-+	if (argc < 2)
-+	{
-+		puts ("check-discrete-nouveau [DEVNAME]");
-+		return EXIT_FAILURE;
-+	}
-+
-+	const char *devname;
-+	g_auto(handle) fd = -1;
-+
-+	devname = argv[1];
-+	fd = open (devname, O_RDWR);
-+	if (fd < 0)
-+		return EXIT_FAILURE;
-+
-+	g_autofree void *device = malloc(352);
-+
-+	/* Init device */
-+	{	
-+		struct {
-+			struct nvif_ioctl_v0 ioctl;
-+			struct nvif_ioctl_new_v0 new;
-+			struct nv_device_v0 dev;
-+		} init_args = {
-+		  .ioctl = {
-+			 .object = 0,
-+			 .owner = NVIF_IOCTL_V0_OWNER_ANY,
-+			 .route = 0x00,
-+			 .type = NVIF_IOCTL_V0_NEW,
-+			 .version = 0,
-+		  },
-+		  .new = {
-+			 .handle = 0,
-+			 .object = (uintptr_t)device,
-+			 .oclass = NV_DEVICE,
-+			 .route = NVIF_IOCTL_V0_ROUTE_NVIF,
-+			 .token = (uintptr_t)device,
-+			 .version = 0,
-+		  },
-+		  .dev = {
-+			 .device = ~0ULL,
-+		  },
-+	   };
-+
-+		if (drmCommandWrite (fd, DRM_NOUVEAU_NVIF, &init_args, sizeof(init_args)))
-+			return EXIT_FAILURE;
-+	}
-+
-+	/* Query device info */
-+	struct {
-+		struct nvif_ioctl_v0 ioctl;
-+		struct nvif_ioctl_mthd_v0 mthd;
-+		struct nv_device_info_v0 info;
-+	} args = {
-+		.ioctl = {
-+			.object = (uintptr_t)device,
-+			.owner = NVIF_IOCTL_V0_OWNER_ANY,
-+			.route = 0x00,
-+			.type = NVIF_IOCTL_V0_MTHD,
-+			.version = 0,
-+		},
-+		.mthd = {
-+			.method = NV_DEVICE_V0_INFO,
-+			.version = 0,
-+		},
-+		.info = {
-+			.version = 0,
-+		},
-+	};
-+
-+	if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args)))
-+		return EXIT_FAILURE;
-+
-+
-+	switch (args.info.platform)
-+	{
-+		case NV_DEVICE_INFO_V0_IGP:
-+		case NV_DEVICE_INFO_V0_SOC:
-+			return EXIT_FAILURE;
-+
-+		case NV_DEVICE_INFO_V0_PCI:
-+		case NV_DEVICE_INFO_V0_AGP:
-+		case NV_DEVICE_INFO_V0_PCIE:
-+		default:
-+			return EXIT_SUCCESS;
-+	}
-+	return EXIT_FAILURE;
-+}
-diff --git a/src/meson.build b/src/meson.build
-index ab3a77d..da4267f 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -1,4 +1,4 @@
-deps = [glib, gio, gudev]
-+deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu]
- 
- sources = [
-   'info-cleanup.c',
-@@ -34,3 +34,5 @@ configure_file(
-   configuration: switcherooctl_conf,
-   install_dir: get_option('bindir')
- )
-+
-+subdir('discrete-detection')
-diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c
-index abd8154..e407bfb 100644
--- a/src/switcheroo-control.c
-+++ b/src/switcheroo-control.c
-@@ -31,6 +31,7 @@ typedef struct {
- 	char *name;
- 	GPtrArray *env;
- 	gboolean is_default;
-+	gboolean is_discrete;
- } CardData;
- 
- typedef struct {
-@@ -94,6 +95,8 @@ build_gpus_variant (ControlData *data)
- 				       g_variant_new_strv ((const gchar * const *) card->env->pdata, card->env->len));
- 		g_variant_builder_add (&asv_builder, "{sv}", "Default",
- 				       g_variant_new_boolean (card->is_default));
-+		g_variant_builder_add (&asv_builder, "{sv}", "Discrete",
-+				       g_variant_new_boolean (card->is_discrete));
- 
- 		g_variant_builder_add (&builder, "a{sv}", &asv_builder);
- 	}
-@@ -312,6 +315,18 @@ get_card_is_default (GUdevDevice *d)
- 	return g_udev_device_get_sysfs_attr_as_boolean (parent, "boot_vga");
- }
- 
-+static gboolean
-+get_card_is_discrete (GUdevDevice *d)
-+{
-+	const char * const * tags;
-+	g_autoptr (GUdevDevice) platform_device = NULL;
-+
-+	tags = g_udev_device_get_tags (d);
-+	if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu"))
-+		return TRUE;
-+	return FALSE;
-+}
-+
- static CardData *
- get_card_data (GUdevClient *client,
- 	       GUdevDevice *d)
-@@ -328,6 +343,7 @@ get_card_data (GUdevClient *client,
- 	data->name = get_card_name (d);
- 	data->env = env;
- 	data->is_default = get_card_is_default (d);
-+	data->is_discrete = get_card_is_discrete (d);
- 
- 	return data;
- }
-- 
-2.46.0
-
@@ -1,27 +0,0 @@
-From 1b115ed72e03ff1169cbfddd79ef10890baca133 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Tue, 12 Sep 2023 15:53:40 +0200
-Subject: [PATCH 03/10] tests: fix integration tests without UMockdev
- `gi.require_version` throws ValueError if the dependency cannot be found
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- tests/integration-test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/integration-test.py b/tests/integration-test.py
-index d8dea16..e3dd996 100755
--- a/tests/integration-test.py
-+++ b/tests/integration-test.py
-@@ -37,7 +37,7 @@ except ImportError as e:
- try:
-     gi.require_version('UMockdev', '1.0')
-     from gi.repository import UMockdev
-except ImportError:
-+except (ImportError, ValueError):
-     sys.stderr.write('Skipping tests, umockdev not available (https://github.com/martinpitt/umockdev)\n')
-     sys.exit(0)
- 
-- 
-2.46.0
-
@@ -1,278 +0,0 @@
-From d933e96bdb15679ae7653f929461982aa66973ba Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Tue, 12 Sep 2023 15:58:16 +0200
-Subject: [PATCH 04/10] tests: add tests for discrete detection with mock libs
- Both tests have 4 different ways of testing: - Invalid Device - Unexpected
- Device - Non Discrete GPU (iGPU/APU) - Discrete GPU
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/discrete-detection/meson.build            |  4 +-
- tests/discrete-detection/libdrm_amdgpu_mock.c | 57 +++++++++++++
- .../discrete-detection/libdrm_nouveau_mock.c  | 68 ++++++++++++++++
- tests/discrete-detection/meson.build          | 80 +++++++++++++++++++
- tests/meson.build                             |  2 +
- 5 files changed, 209 insertions(+), 2 deletions(-)
- create mode 100644 tests/discrete-detection/libdrm_amdgpu_mock.c
- create mode 100644 tests/discrete-detection/libdrm_nouveau_mock.c
- create mode 100644 tests/discrete-detection/meson.build
-
-diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build
-index 3a6c03f..8eb8437 100644
--- a/src/discrete-detection/meson.build
-+++ b/src/discrete-detection/meson.build
-@@ -1,6 +1,6 @@
- 
- if libdrm_amdgpu.found()
-  executable('check-discrete-amdgpu',
-+  amdgpu_discrete = executable('check-discrete-amdgpu',
-     files('amdgpu.c'),
-     dependencies: deps,
-     install: true,
-@@ -9,7 +9,7 @@ if libdrm_amdgpu.found()
- endif
- 
- if libdrm.found() and libdrm_nouveau.found()
-  executable('check-discrete-nouveau',
-+  nouveau_discrete = executable('check-discrete-nouveau',
-     files('nouveau.c'),
-     dependencies: deps,
-     install: true,
-diff --git a/tests/discrete-detection/libdrm_amdgpu_mock.c b/tests/discrete-detection/libdrm_amdgpu_mock.c
-new file mode 100644
-index 0000000..20fa4aa
--- /dev/null
-+++ b/tests/discrete-detection/libdrm_amdgpu_mock.c
-@@ -0,0 +1,57 @@
-+#include <string.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+
-+#include <amdgpu_drm.h>
-+
-+enum {
-+	OTHER_GPU,
-+	AMD_APU,
-+	AMD_GPU,
-+};
-+
-+/* Mock open(2) so we can test multiple devices configurations */
-+int open(const char *pathname, int flags)
-+{
-+	if (!strcmp(pathname, "OTHER_GPU"))
-+		return OTHER_GPU;
-+	if (!strcmp (pathname, "AMD_APU"))
-+		return AMD_APU;
-+	if (!strcmp (pathname, "AMD_GPU"))
-+		return AMD_GPU;
-+
-+	return -1;
-+}
-+
-+/* open64 may be used for large file support */
-+int open64(const char *pathname, int flags)
-+{
-+	return open (pathname, flags);
-+}
-+
-+int amdgpu_device_initialize(int fd, uint32_t *major_version, uint32_t *minor_version, int *device_handle)
-+{
-+	// Store the fd in the device handle for access in query_info
-+	*device_handle = fd;
-+
-+	if (fd != AMD_GPU && fd != AMD_APU)
-+		return 1;
-+
-+	return 0;
-+}
-+
-+int amdgpu_query_info(int device_handle, unsigned info_id, unsigned size, void *value)
-+{
-+	struct drm_amdgpu_info_device* device_info = value;
-+
-+	if (device_handle == AMD_GPU) {
-+		device_info->ids_flags = 0;
-+		return 0;
-+	}
-+	if (device_handle == AMD_APU) {
-+		device_info->ids_flags = AMDGPU_IDS_FLAGS_FUSION;
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-diff --git a/tests/discrete-detection/libdrm_nouveau_mock.c b/tests/discrete-detection/libdrm_nouveau_mock.c
-new file mode 100644
-index 0000000..cdbfda8
--- /dev/null
-+++ b/tests/discrete-detection/libdrm_nouveau_mock.c
-@@ -0,0 +1,68 @@
-+#include <string.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+
-+#include <xf86drm.h>
-+#include <nouveau_drm.h>
-+#include <nouveau/nvif/ioctl.h>
-+#include <nvif/cl0080.h>
-+#include <nvif/class.h>
-+
-+enum {
-+	OTHER_GPU,
-+	NVIDIA_IGPU,
-+	NVIDIA_GPU,
-+};
-+
-+/* Mock open(2) so we can test multiple devices configurations */
-+int open(const char *pathname, int flags)
-+{
-+	if (!strcmp(pathname, "OTHER_GPU"))
-+		return OTHER_GPU;
-+	if (!strcmp (pathname, "NVIDIA_IGPU"))
-+		return NVIDIA_IGPU;
-+	if (!strcmp (pathname, "NVIDIA_GPU"))
-+		return NVIDIA_GPU;
-+
-+	return -1;
-+}
-+
-+/* open64 may be used for large file support */
-+int open64(const char *pathname, int flags)
-+{
-+	return open (pathname, flags);
-+}
-+
-+int drmCommandWrite(int fd, unsigned long drmCommandIndex, void *data, unsigned long size)
-+{
-+	if (drmCommandIndex != DRM_NOUVEAU_NVIF)
-+		return 1;
-+
-+	if (fd != NVIDIA_GPU && fd != NVIDIA_IGPU)
-+		return 1;
-+
-+	return 0;
-+}
-+
-+int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, void *data, unsigned long size)
-+{
-+	if (drmCommandIndex != DRM_NOUVEAU_NVIF)
-+		return 1;
-+
-+	struct {
-+		struct nvif_ioctl_v0 ioctl;
-+		struct nvif_ioctl_mthd_v0 mthd;
-+		struct nv_device_info_v0 info;
-+	} *args = data;
-+
-+	if (fd == NVIDIA_GPU) {
-+		args->info.platform = NV_DEVICE_INFO_V0_PCIE;
-+		return 0;
-+	}
-+	if (fd == NVIDIA_IGPU) {
-+		args->info.platform = NV_DEVICE_INFO_V0_IGP;
-+		return 0;	
-+	}
-+
-+	return 1;
-+}
-\ No newline at end of file
-diff --git a/tests/discrete-detection/meson.build b/tests/discrete-detection/meson.build
-new file mode 100644
-index 0000000..f01a014
--- /dev/null
-+++ b/tests/discrete-detection/meson.build
-@@ -0,0 +1,80 @@
-+
-+if libdrm_amdgpu.found()
-+    amdgpu_mock_lib = shared_library(
-+        'drm_amdgpu_mock',
-+        files('libdrm_amdgpu_mock.c'),
-+        dependencies: libdrm_amdgpu
-+    )
-+
-+    test(
-+        'test amdgpu detection with invalid device',
-+        amdgpu_discrete,
-+        args: ['NO_GPU'],
-+        env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test amdgpu detection with non-AMD GPU',
-+        amdgpu_discrete,
-+        args: ['OTHER_GPU'],
-+        env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test amdgpu detection with AMD APU',
-+        amdgpu_discrete,
-+        args: ['AMD_APU'],
-+        env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test amdgpu detection with AMD GPU',
-+        amdgpu_discrete,
-+        args: ['AMD_GPU'],
-+        env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
-+        should_fail: false
-+    )
-+endif
-+
-+if libdrm.found() and libdrm_nouveau.found()
-+    nouveau_mock_lib = shared_library(
-+        'drm_nouveau_mock',
-+        files('libdrm_nouveau_mock.c'),
-+        dependencies: [libdrm, libdrm_nouveau]
-+    )
-+
-+    test(
-+        'test nouveau detection with invalid device',
-+        nouveau_discrete,
-+        args: ['NO_GPU'],
-+        env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test nouveau detection with non-Nvidia GPU',
-+        nouveau_discrete,
-+        args: ['OTHER_GPU'],
-+        env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test nouveau detection with Nvidia iGPU',
-+        nouveau_discrete,
-+        args: ['NVIDIA_IGPU'],
-+        env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test nouveau detection with Nvidia GPU',
-+        nouveau_discrete,
-+        args: ['NVIDIA_GPU'],
-+        env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
-+        should_fail: false
-+    )
-+endif
-\ No newline at end of file
-diff --git a/tests/meson.build b/tests/meson.build
-index b0b7476..61ef00c 100644
--- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -15,3 +15,5 @@ foreach ut: unit_tests
-          env: envs,
-         )
- endforeach
-+
-+subdir('discrete-detection')
-- 
-2.46.0
-
@@ -1,39 +0,0 @@
-From c102b643945dc076d881497dd2ca5865938f7053 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Tue, 12 Sep 2023 15:57:47 +0200
-Subject: [PATCH 05/10] main: remove leftover and fix typo
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- meson_options.txt        | 2 +-
- src/switcheroo-control.c | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index b8d671a..c77fea8 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,7 +13,7 @@ option('hwdbdir',
- option('rulesdir',
-   type: 'string',
-   value: '',
-  description: 'Directory for ruke files',
-+  description: 'Directory for rule files',
- )
- 
- option('gtk_doc',
-diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c
-index e407bfb..0f6a548 100644
--- a/src/switcheroo-control.c
-+++ b/src/switcheroo-control.c
-@@ -319,7 +319,6 @@ static gboolean
- get_card_is_discrete (GUdevDevice *d)
- {
- 	const char * const * tags;
-	g_autoptr (GUdevDevice) platform_device = NULL;
- 
- 	tags = g_udev_device_get_tags (d);
- 	if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu"))
-- 
-2.46.0
-
@@ -1,48 +0,0 @@
-From f764db4eb565c19ba14155791fbfced3fb5d34c8 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Tue, 12 Sep 2023 15:58:27 +0200
-Subject: [PATCH 06/10] main: move discrete dependencies out of main deps
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/discrete-detection/meson.build | 5 +++--
- src/meson.build                    | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build
-index 8eb8437..353316f 100644
--- a/src/discrete-detection/meson.build
-+++ b/src/discrete-detection/meson.build
-@@ -1,8 +1,9 @@
-+discrete_deps = deps + [libdrm, libdrm_nouveau, libdrm_amdgpu]
- 
- if libdrm_amdgpu.found()
-   amdgpu_discrete = executable('check-discrete-amdgpu',
-     files('amdgpu.c'),
-    dependencies: deps,
-+    dependencies: discrete_deps,
-     install: true,
-     install_dir: libexecdir,
-   )
-@@ -11,7 +12,7 @@ endif
- if libdrm.found() and libdrm_nouveau.found()
-   nouveau_discrete = executable('check-discrete-nouveau',
-     files('nouveau.c'),
-    dependencies: deps,
-+    dependencies: discrete_deps,
-     install: true,
-     install_dir: libexecdir,
-   )
-diff --git a/src/meson.build b/src/meson.build
-index da4267f..22d69e7 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -1,4 +1,4 @@
-deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu]
-+deps = [glib, gio, gudev]
- 
- sources = [
-   'info-cleanup.c',
-- 
-2.46.0
-
@@ -1,137 +0,0 @@
-From d2ecc29469d5572fd171926c9d1dbb1b851c7b09 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Tue, 12 Sep 2023 17:12:00 +0200
-Subject: [PATCH 07/10] main: use glib for discrete command-line arguments
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/discrete-detection/amdgpu.c  | 29 ++++++++++++++++++++---------
- src/discrete-detection/nouveau.c | 29 ++++++++++++++++++++---------
- 2 files changed, 40 insertions(+), 18 deletions(-)
-
-diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c
-index 2d9804f..5a9a4ab 100644
--- a/src/discrete-detection/amdgpu.c
-+++ b/src/discrete-detection/amdgpu.c
-@@ -1,9 +1,10 @@
-
- #include <fcntl.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <locale.h>
- #include <gio/gio.h>
- #include <gudev/gudev.h>
-+#include <glib.h>
- 
- #include <amdgpu.h>
- #include <amdgpu_drm.h>
-@@ -12,22 +13,32 @@ typedef int handle;
- G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free);
- 
-int main(int argc, char** argv)
-+int main (int argc, char** argv)
- {
-	if (argc < 2)
-	{
-		puts ("check-discrete-amdgpu [DEVNAME]");
-		return EXIT_FAILURE;
-	}
-
- 	const char *devname;
- 	g_auto(handle) fd = -1;
-	g_autoptr(GUdevDevice) parent = NULL;
- 	struct drm_amdgpu_info_device device_info = {0};
- 	amdgpu_device_handle device = NULL;
- 	uint32_t drm_major, drm_minor;
-+	g_autoptr(GOptionContext) option_context = NULL;
-+	g_autoptr(GError) error = NULL;
- 
-+	setlocale (LC_ALL, "");
-+	option_context = g_option_context_new ("");
-+
-+	if (!g_option_context_parse (option_context, &argc, &argv, &error)) {
-+		g_print ("Failed to parse arguments: %s\n", error->message);
-+		return EXIT_FAILURE;
-+	}
-+
-+	if (argc < 2)
-+	{
-+		g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL));
-+		return EXIT_FAILURE;
-+	}
- 	devname = argv[1];
-+;
-+
- 	fd = open (devname, O_RDWR);
- 	if (fd < 0)
- 		return EXIT_FAILURE;
-diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c
-index 0a1f220..1d61cbb 100644
--- a/src/discrete-detection/nouveau.c
-+++ b/src/discrete-detection/nouveau.c
-@@ -1,9 +1,10 @@
-
- #include <fcntl.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <locale.h>
- #include <gio/gio.h>
- #include <gudev/gudev.h>
-+#include <glib.h>
- 
- #include <xf86drm.h>
- #include <nouveau_drm.h>
-@@ -14,23 +15,34 @@
- typedef int handle;
- G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
- 
-int main(int argc, char** argv)
-+int main (int argc, char** argv)
- {
-+	const gchar *devname = NULL;
-+	g_auto(handle) fd = -1;
-+	g_autofree void *device = NULL;
-+	g_autoptr(GOptionContext) option_context = NULL;
-+	g_autoptr(GError) error = NULL;
-+
-+	setlocale (LC_ALL, "");
-+	option_context = g_option_context_new ("");
-+
-+	if (!g_option_context_parse (option_context, &argc, &argv, &error)) {
-+		g_print ("Failed to parse arguments: %s\n", error->message);
-+		return EXIT_FAILURE;
-+	}
-+
- 	if (argc < 2)
- 	{
-		puts ("check-discrete-nouveau [DEVNAME]");
-+		g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL));
- 		return EXIT_FAILURE;
- 	}
-
-	const char *devname;
-	g_auto(handle) fd = -1;
-
- 	devname = argv[1];
-+
- 	fd = open (devname, O_RDWR);
- 	if (fd < 0)
- 		return EXIT_FAILURE;
- 
-	g_autofree void *device = malloc(352);
-+	device = malloc(352);
- 
- 	/* Init device */
- 	{	
-@@ -88,7 +100,6 @@ int main(int argc, char** argv)
- 	if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args)))
- 		return EXIT_FAILURE;
- 
-
- 	switch (args.info.platform)
- 	{
- 		case NV_DEVICE_INFO_V0_IGP:
-- 
-2.46.0
-
@@ -1,25 +0,0 @@
-From 462b09f02de37dfd2965d23cc7c4137bcf45a4ae Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Wed, 14 Feb 2024 20:25:42 +0100
-Subject: [PATCH 08/10] main: add udev rule for i915 checking a lot of systems
- has shown that the intel iGPU will always be available at `0000:00:02.0`.
- Using ID_PATH would have been cleaner, but I couldn't get it to work.
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- data/30-discrete-gpu.rules.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in
-index a803ed4..f30f315 100644
--- a/data/30-discrete-gpu.rules.in
-+++ b/data/30-discrete-gpu.rules.in
-@@ -1,3 +1,4 @@
- DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
- DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
-DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu"
-+DRIVERS=="nvidia", SUBSYSTEM=="drm", TAG+="switcheroo-discrete-gpu"
-+DRIVERS=="i915", SUBSYSTEM=="drm", DEVPATH!="/devices/pci0000:00/0000:00:02.0/drm/*", TAG+="switcheroo-discrete-gpu"
-- 
-2.46.0
-
@@ -1,34 +0,0 @@
-From 55db3aeaeb962952881f73e94432f750cfb64fc8 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Thu, 15 Feb 2024 16:24:00 +0100
-Subject: [PATCH 09/10] main: use Discrete key in switcherooctl
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/switcherooctl.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/switcherooctl.in b/src/switcherooctl.in
-index 96c21cc..c0e3f07 100755
--- a/src/switcherooctl.in
-+++ b/src/switcherooctl.in
-@@ -77,6 +77,7 @@ def print_gpu(gpu, index):
-     print('Device:', index)
-     print('  Name:       ', gpu['Name'])
-     print('  Default:    ', "yes" if gpu['Default'] else "no")
-+    print('  Discrete:   ', "yes" if gpu['Discrete'] else "no")
-     print('  Environment:', env_to_str(gpu['Environment']))
- 
- def _list():
-@@ -126,7 +127,7 @@ def get_discrete_gpu():
-         return None
- 
-     try:
-        gpu = next(gpu for gpu in gpus if not gpu['Default'])
-+        gpu = next(gpu for gpu in gpus if gpu['Discrete'])
-     except StopIteration:
-         return None
-     else:
-- 
-2.46.0
-
@@ -1,45 +0,0 @@
-From 4232c75fe41158bb5063d630d36b3ffd6a8a57ec Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Fri, 6 Sep 2024 22:31:56 +0200
-Subject: [PATCH 10/10] main: use new GPU list on uevent the amount of GPUs may
- still be the same but underlying attributes may have changed On the ASUS TUF
- Dash F15 running Fedora 40 6.10.7-200.fc40.x86_64 the udev tags are not
- applied at the time switcheroo-control starts but at a later uevent they are
- correct. Memory gets allocated anyways to check if the GPU count has changed,
- so this shouldn't affect memory usage.
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/switcheroo-control.c | 16 ++++++----------
- 1 file changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c
-index 0f6a548..01954c7 100644
--- a/src/switcheroo-control.c
-+++ b/src/switcheroo-control.c
-@@ -438,16 +438,12 @@ uevent_cb (GUdevClient *client,
- 
- 	cards = get_drm_cards (data);
- 	num_gpus = cards->len;
-	if (num_gpus != data->num_gpus) {
-		g_debug ("GPUs added or removed (old: %d new: %d)",
-			 data->num_gpus, num_gpus);
-		g_ptr_array_free (data->cards, TRUE);
-		data->cards = cards;
-		data->num_gpus = cards->len;
-		send_dbus_event (data);
-	} else {
-		g_ptr_array_free (cards, TRUE);
-	}
-+	g_debug ("GPUs updated (old: %d new: %d)",
-+		 data->num_gpus, num_gpus);
-+	g_ptr_array_free (data->cards, TRUE);
-+	data->cards = cards;
-+	data->num_gpus = cards->len;
-+	send_dbus_event (data);
- }
- 
- static void
-- 
-2.46.0
-
@@ -1,22 +1,16 @@
 Name:           switcheroo-control
 Version:        2.6
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        D-Bus service to check the availability of dual-GPU

 License:        GPLv3
 URL:            https://gitlab.freedesktop.org/hadess/switcheroo-control/
 # URL from https://gitlab.freedesktop.org/hadess/switcheroo-control/-/releases
 Source0:        https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/86ea54ac7ddb901b6bf6e915209151f8/switcheroo-control-2.6.tar.xz
-Patch:          0001-main-update-GPUs-comment-for-dbus-property.patch
-Patch:          0002-main-add-Discrete-key.patch
-Patch:          0003-tests-fix-integration-tests-without-UMockdev.patch
-Patch:          0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch
-Patch:          0005-main-remove-leftover-and-fix-typo.patch
-Patch:          0006-main-move-discrete-dependencies-out-of-main-deps.patch
-Patch:          0007-main-use-glib-for-discrete-command-line-arguments.patch
-Patch:          0008-main-add-udev-rule-for-i915.patch
-Patch:          0009-main-use-Discrete-key-in-switcherooctl.patch
-Patch:					0010-main-use-new-GPU-list-on-uevent.patch
+# Adds proper discrete GPU detection to switcheroo-control
+# https://gitlab.freedesktop.org/hadess/switcheroo-control/-/merge_requests/69
+Patch:					discrete.patch
+

 BuildRequires:  gcc
 BuildRequires:  pkgconfig(gudev-1.0)
@@ -25,6 +19,7 @@ BuildRequires:  gtk-doc
 BuildRequires:  meson
 BuildRequires:  systemd
 BuildRequires:  libdrm-devel
+BuildRequires:  kernel-headers
 BuildRequires:  python3-dbusmock
 BuildRequires:  umockdev

@@ -78,6 +73,7 @@ fi
 %{_mandir}/man1/switcherooctl.1*
 %{_libexecdir}/check-discrete-amdgpu
 %{_libexecdir}/check-discrete-nouveau
+%{_libexecdir}/check-discrete-xe
 %{_udevrulesdir}/30-discrete-gpu.rules

 %files docs
@@ -86,14 +82,17 @@ fi
 %{_datadir}/gtk-doc/html/%{name}/

 %changelog
-* Fri Sep 06 2024 Jan200101 <sentrycraft123@gmail.com> - 2.6-8
+* Tue Apr 29 2025 Jan200101 <sentrycraft123@gmail.com> - 2.6-9
 - Update discrete patch

-* Thu Feb 15 2024 Jan Drögehoff <sentrycraft123@gmail.com> - 2.6-7
- Update discrete patch
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

-* Wed Feb 14 2024 Jan Drögehoff <sentrycraft123@gmail.com> - 2.6-6
- Add discrete patch
+* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 2.6-7
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
@@ -6,7 +6,7 @@

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.5
+Version:	1.5.6
 Release:	1%?dist
 License:	GPL-3.0
 Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
@@ -0,0 +1,10 @@
+project pkg {
+    arches = ["x86_64"]
+    rpm {
+        spec = "winetricks-git.spec"
+    }
+    labels {
+        subrepo = "extras"
+        nightly = 1
+    }
+}
@@ -0,0 +1,7 @@
+rpm.global("commit", gh_commit("Winetricks/winetricks"));
+if rpm.changed() {
+    rpm.release();
+    rpm.global("commit_date", date());
+    let v = gh("Winetricks/winetricks");
+    rpm.global("ver", v);
+}
@@ -0,0 +1,75 @@
+# Fedora sometimes sources the snapshots under stable versions and just bumps release
+# For user clarity I have separated these into different packages
+%global commit  00427b67de70bfefd282d0abc7edd1daa442e73e
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global ver 20250102
+%global commit_date 20250504
+
+Name:           winetricks-git
+Version:        %{ver}^%{commit_date}git.%{shortcommit}
+Release:        1%{?dist}
+Summary:        Work around common problems in Wine; Winetricks Git builds
+License:        LGPL-2.1-or-later
+URL:            https://github.com/Winetricks/winetricks
+Source0:        %{url}/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz
+BuildRequires:  desktop-file-utils
+BuildRequires:  gcc
+BuildRequires:  make
+Requires:       cabextract
+Requires:       gzip
+Requires:       unzip
+Requires:       wget
+Requires:       which
+Requires:       hicolor-icon-theme
+Requires:       (kdialog or zenity)
+Requires:       (wine-stable or wine-staging or wine-dev or wine-common)
+Conflicts:      winetricks
+Conflicts:      terra-winetricks
+BuildArch:      noarch
+# need arch-specific wine, not available everywhere:
+# - adopted from wine.spec
+ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64
+ExcludeArch:    ppc64 ppc64le
+
+%description
+Winetricks is an easy way to work around common problems in Wine.
+
+It has a menu of supported games/apps for which it can do all the
+workarounds automatically. It also lets you install missing DLLs
+or tweak various Wine settings individually.
+
+This version of Winetricks is built from the latest Git.
+
+It is also compatible with Terra WINE builds.
+
+%prep
+%setup -qn winetricks-%{commit}
+
+sed -i -e s:steam:: -e s:flash:: tests/*
+
+%build
+# Empty build section because RPM
+
+%install
+%make_install
+# some tarballs do not install appdata
+install -Dm0644 -t %{buildroot}%{_datadir}/metainfo src/io.github.winetricks.Winetricks.metainfo.xml
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/winetricks.desktop
+
+
+%files
+%license COPYING
+%license debian/copyright
+%doc README.md
+%{_bindir}/winetricks
+%{_mandir}/man1/winetricks.1*
+%{_datadir}/applications/winetricks.desktop
+%{_datadir}/bash-completion/completions/winetricks
+%{_datadir}/icons/hicolor/scalable/apps/winetricks.svg
+%{_datadir}/metainfo/io.github.winetricks.Winetricks.metainfo.xml
+
+
+%changelog
+%autochangelog
@@ -0,0 +1,9 @@
+project pkg {
+    arches = ["x86_64"]
+    rpm {
+        spec = "winetricks.spec"
+    }
+    labels {
+        subrepo = "extras"
+    }
+}
@@ -0,0 +1 @@
+rpm.version(gh("Winetricks/winetricks"));
@@ -0,0 +1,68 @@
+# Fedora sometimes sources the snapshots under stable versions and just bumps release
+# For user clarity I have separated these into different packages
+
+Name:           terra-winetricks
+Version:        20250102
+Release:        1%{?dist}
+Summary:        Winetricks built to be compatible with Terra WINE builds
+License:        LGPL-2.1-or-later
+URL:            https://github.com/Winetricks/winetricks
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+BuildRequires:  desktop-file-utils
+BuildRequires:  gcc
+BuildRequires:  make
+Requires:       cabextract
+Requires:       gzip
+Requires:       unzip
+Requires:       wget
+Requires:       which
+Requires:       hicolor-icon-theme
+Requires:       (kdialog or zenity)
+Requires:       (wine-stable or wine-staging or wine-dev)
+Conflicts:      winetricks
+Conflicts:      winetricks-git
+BuildArch:      noarch
+# need arch-specific wine, not available everywhere:
+# - adopted from wine.spec
+ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64
+ExcludeArch:    ppc64 ppc64le
+
+%description
+Winetricks is an easy way to work around common problems in Wine.
+
+It has a menu of supported games/apps for which it can do all the
+workarounds automatically. It also lets you install missing DLLs
+or tweak various Wine settings individually.
+
+
+%prep
+%setup -q -n winetricks-%{version}
+
+sed -i -e s:steam:: -e s:flash:: tests/*
+
+%build
+# Empty build section because RPM
+
+%install
+%make_install
+# some tarballs do not install appdata
+install -Dm0644 -t %{buildroot}%{_datadir}/metainfo src/io.github.winetricks.Winetricks.metainfo.xml
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/winetricks.desktop
+
+
+%files
+%license COPYING
+%license debian/copyright
+%doc README.md
+%{_bindir}/winetricks
+%{_mandir}/man1/winetricks.1*
+%{_datadir}/applications/winetricks.desktop
+%{_datadir}/bash-completion/completions/winetricks
+%{_datadir}/icons/hicolor/scalable/apps/winetricks.svg
+%{_datadir}/metainfo/io.github.winetricks.Winetricks.metainfo.xml
+
+
+%changelog
+%autochangelog
@@ -12,8 +12,8 @@
 %global vendor_pnpm 1

 Name:           youtube-music
-Version:        3.7.5
-Release:        4%?dist
+Version:        3.9.0
+Release:        1%?dist
 Summary:        YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
 Source1:        youtube-music.desktop
 License:        MIT
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu13
+%define _ubuntu_rel 22.10.20220822-0ubuntu16
 %global _hardened_build 0

 Name:           compiz9
@@ -8,12 +8,14 @@
 %global portal_helper 1
 %endif

-Name:           gnome-shell.switcheroo
+Name:           gnome-shell
 Version:        %{major_version}.%{minor_version}
-Release:        1%{?dist}.switcheroo
+Release:        2%{?dist}.switcheroo
 Summary:        Window management and application launching for GNOME

 Provides:       gnome-shell = %version-%release
+Provides:       gnome-shell.switcheroo = %version-%release
+Obsoletes:      gnome-shell.switcheroo <= 47.3-2
 License:        GPL-2.0-or-later
 URL:            https://wiki.gnome.org/Projects/GnomeShell
 Source0:        https://download.gnome.org/sources/gnome-shell/%{major_version}/gnome-shell-%{tarball_version}.tar.xz
@@ -1,13 +1,16 @@
 %global framework kio

 %global stable_kf6 stable
-%global majmin_ver_kf6 6.11
+%global majmin_ver_kf6 6.12

-Name:    kf6-%{framework}.switcheroo
+Name:    kf6-%{framework}
 Version: %{majmin_ver_kf6}.0
 Release: 1%{?dist}.switcheroo
 Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction

+Provides: kf6-%{framework}.switcheroo = %version-%release
+Obsoletes: kf6-%{framework}.switcheroo < 6.13.0-2
+
 License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
 URL:     https://invent.kde.org/frameworks/%{framework}

@@ -1,7 +1,7 @@
-%global commit c3f01539e3b036ae940e678f5739b37ca0300ce2
+%global commit 31d29530ad834c1bfb70ed43f9395a549fbace56

 Name:           lightdm-kde-greeter
-Version:        6.0.2
+Version:        6.0.3
 Release:        1%?dist
 Summary:        Login screen using the LightDM framework
 License:        GPL-3.0-or-later
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2025-04-18 01:46:49.810910663 -0500
+++ b/CMakeLists.txt	2025-04-18 02:07:05.663396088 -0500
+@@ -77,7 +77,7 @@
+ 	-pthread
+ )
+ 
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+ 
+ pkg_check_modules(GLIB2 REQUIRED glib-2.0)
@@ -1,19 +1,22 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit 3a0dacbbf99b45b67c39bb92449235c576cbf05a
+%global commit ca7670c0a74c42f03c0bb4196773519c270a0d75
 %forgemeta

 Name:           lomiri-app-launch
-Version:        0.1.11
+Version:        0.1.12
 Release:        1%?dist
 Summary:        Provides the Lomiri App Launch user space daemon
 License:        GPL-3.0
 URL:            https://gitlab.com/ubports/development/core/lomiri-app-launch
 Source0:        %{url}/-/archive/%commit/lomiri-app-launch-%commit.tar.gz
+Patch0:         https://sources.debian.org/data/main/l/lomiri-app-launch/0.1.11-1/debian/patches/2003_remove-werror.patch
+Patch1:         2004-std-workaround.patch

 BuildRequires: cmake
 BuildRequires: pkgconfig
-BuildRequires: g++
 BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: libatomic
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(gobject-introspection-1.0)
 BuildRequires: pkgconfig(lttng-ust)
@@ -49,8 +52,6 @@ This package contains development files needed for lomiri-app-launch.
 %autosetup -n lomiri-app-launch-%commit

 %build
-sed -i 's/-Werror//' ./CMakeLists.txt
-
 # For some reason the macro of cmake fails on both clang and gcc
 cmake -DLOMIRI_APP_LAUNCH_ARCH=%{_arch} -DENABLE_COVERAGE=OFF -DENABLE_TESTS=OFF -B redhat-linux-build -DCMAKE_INSTALL_PREFIX:PATH=/usr -DENABLE_MIRCLIENT=off -DUSE_SYSTEMD=ON
 %cmake_build
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager
-%global commit 682c4928a91da598767e0be2496d9c35af7db035
+%global commit 7f4c49f125209235b9a808a6e72d1fdfdd2b01ca
 %forgemeta

 Name:       lomiri-download-manager
-Version:    0.1.3
+Version:    0.2.1
 Release:    1%?dist
 Summary:    Upload Download Manager for Lomiri
 License:    LGPLv3
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-indicator-network
-%global commit 8393f80825de7447a5567a90d3725b469fae471b
+%global commit 4aa16a3674bf513995cf07fffaf700d007e726d8
 %forgemeta

 Name:       lomiri-indicator-network
-Version:    1.1.0
+Version:    1.1.1
 Release:    1%?dist
 Summary:    The Network indicator for Ubuntu Touch
 License:    GPL-3.0 AND LGPL-3.0
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas
-%global commit 4a74eca0e4dcb745521abf20f975854cc3478a70
+%global commit 139e6090d18040270e942429cf08f6b48a67b0cc
 %forgemeta

 Name:       lomiri-schemas
-Version:    0.1.7
+Version:    0.1.8
 Release:    1%?dist
 Summary:    Configuration schemas for lomiri
 License:    LGPL-2.0-or-later
@@ -1,16 +1,16 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit dfc840a2a4e0b0379b40cb6ec9309c5437c79d19
+%global commit 8ea4a5730db308b73b3e3a9d6935477700091bfd
 %forgemeta

 Name:       lomiri-system-settings
-Version:    1.3.0
+Version:    1.3.1
 Release:    1%?dist
 Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
 Source0:    %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
-Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch
-Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch
+Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-2/debian/patches/2002_use-Noto-font-instead-of-Ubuntu-font.patch
+Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.3.1-2/debian/patches/2011_build-without-trust-store.patch

 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -4,14 +4,13 @@

 Name:           lomiri-ui-toolkit
 Version:        1.3.5110
-Release:        1%?dist
+Release:        2%?dist
 Summary:        QML components to ease the creation of beautiful applications in QML for Lomiri

 License:        LGPL-3.0
 URL:            https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
 Source0:        %{url}/-/archive/%commit/lomiri-ui-toolkit-%commit.tar.gz
-Patch0:         https://sources.debian.org/data/main/l/lomiri-ui-toolkit/1.3.5010%2Bdfsg-1/debian/patches/0002-fix-tests-on-qt-5.15.5.patch
-Patch1:         https://sources.debian.org/data/main/l/lomiri-ui-toolkit/1.3.5010%2Bdfsg-1/debian/patches/2003_stop-using-Ubuntu-fonts.patch
+Patch0:         https://sources.debian.org/data/main/l/lomiri-ui-toolkit/1.3.5110+dfsg-2/debian/patches/2003_stop-using-Ubuntu-fonts.patch

 BuildRequires: pkgconfig
 BuildRequires: make
@@ -31,9 +30,12 @@ BuildRequires: qt5-qtfeedback
 BuildRequires: qt5-qtsystems-devel
 BuildRequires: qt5-qtdeclarative-devel
 BuildRequires: qt5-pim-devel
+BuildRequires: python3-devel
 BuildRequires: python3-rpm-macros
 BuildRequires: qt5-qtsvg-devel
 BuildRequires: fdupes
+BuildRequires: python3dist(pip)
+BuildRequires: python3dist(setuptools)
 Requires:      qt5-qtgraphicaleffects
 Requires:      qt5-qtfeedback

@@ -82,7 +84,13 @@ Examples for Lomiri-ui-toolkit.

 %build
 %{qmake_qt5} 'CONFIG+=ubuntu-uitk-compat' 'CONFIG+=test'
-
+pushd tests/autopilot
+%if 0%{?fedora} <= 41 || 0%{?rhel}
+%py3_build
+%else
+%pyproject_wheel
+%endif
+popd
 %make_build

 %install
@@ -92,6 +100,15 @@ rm -rf %{buildroot}%{_qt5_qmldir}/Extinct
 %fdupes %buildroot%_libdir/qt5/qml/Lomiri/Components/
 %fdupes %buildroot%_libdir/qt5/examples/%name/examples/

+pushd tests/autopilot
+%if 0%{?fedora} <= 41 || 0%{?rhel}
+%py3_install
+%else
+%pyproject_install
+%endif
+mv lomiriuitoolkit/{tests,_custom_proxy_objects} -t %{buildroot}%{python3_sitelib}/lomiriuitoolkit/
+popd
+
 %find_lang %{name}
 %find_lang %{name}-gallery

@@ -138,6 +155,11 @@ rm -rf %{buildroot}%{_qt5_qmldir}/Extinct
 %{python3_sitelib}/lomiriuitoolkit/_custom_proxy_objects/
 %{python3_sitelib}/lomiriuitoolkit/__pycache__/
 %{python3_sitelib}/lomiriuitoolkit/tests/
+%if 0%{?fedora} <= 41 || 0%{?rhel}
+%{python3_sitelib}/lomiriuitoolkit-%{version}-py%{python3_version}.egg-info/
+%else
+%{python3_sitelib}/lomiriuitoolkit-%{version}.dist-info/
+%endif

 %files doc
 %license COPYING.CC-BY-SA-3.0
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit 0b85fddd0123c86fe6b3464143df86a6d0ad6bb9
+%global commit 39840a77525e57f29cde9d6773bd2742feae2486
 %forgemeta

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

@@ -1,4 +1,4 @@
-%define _ubuntu_rel 2ubuntu2
+%define _ubuntu_rel 2ubuntu3

 Name:    unity-session
 Summary: Lightdm profile for Unity 7
@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-datetime
 Summary:    A GTK implementation of the StatusNotifierItem Specification
-Version:    24.5.1
+Version:    25.4.0
 Release:    1%?dist
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-datetime
@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-session
 Summary:    Ayatana Indicator Session Applet
-Version:    24.5.0
+Version:    24.5.1
 Release:    1%?dist
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-session
@@ -1,7 +1,7 @@
 # Generated by rust2rpm 27
-%global commit 5b4cc3e7a8055afb758421f4a114ef4032806e39
+%global commit 98c220126d912b935987766f56650b55f3e226eb
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250216
+%global commit_date 20250518
 %global ver v0.6.0
 %bcond check 0

@@ -1,5 +1,5 @@
 Name:           mpvpaper
-Version:        1.7
+Version:        1.8
 Release:        1%?dist
 Summary:        A video wallpaper program for wlroots based wayland compositors
 License:        GPL-3.0-or-later
@@ -1,16 +1,19 @@
 Name:           swww
-Version:        0.9.5
+Version:        0.10.0
 Release:        1%?dist
 Summary:        Wallpaper daemon for Wayland
 SourceLicense:  GPL-3.0-only
-License:        (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND (CC0-1.0 OR Apache-2.0) AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT)
+License:        (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-3-Clause AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT)
 URL:            https://github.com/LGFae/swww
 Source0:		%url/archive/refs/tags/v%version.tar.gz
+Packager:       madonuko <mado@fyralabs.com>
 BuildRequires:  anda-srpm-macros rust-packaging rpm_macro(bash_completions_dir) mold
 BuildRequires:  scdoc
 BuildRequires:  zstd
 BuildRequires:  pkgconfig(liblz4)
 BuildRequires:  pkgconfig(xkbcommon)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-protocols)

 %description
 swww is a wallpaper daemon for Wayland that is controlled
@@ -56,8 +59,8 @@ Zsh command-line completion support for %{name}.
 ./doc/gen.sh

 %install
-%{cargo_install} &
-cd daemon && %{cargo_install} &
+(cd client && %{cargo_install}) &
+(cd daemon && %{cargo_install}) &
 wait
 install -Dm644 -T completions/swww.bash %buildroot%bash_completions_dir/swww
 install -Dm644 -T completions/swww.fish %buildroot%fish_completions_dir/swww.fish
@@ -73,7 +76,6 @@ install -Dm644 -t %buildroot%_mandir/man1 doc/generated/swww*1
 %_mandir/man1/%name-clear.1.gz
 %_mandir/man1/%name-daemon.1.gz
 %_mandir/man1/%name-img.1.gz
-%_mandir/man1/%name-init.1.gz
 %_mandir/man1/%name-kill.1.gz
 %_mandir/man1/%name-query.1.gz
 %_mandir/man1/%name-restore.1.gz
@@ -12,7 +12,7 @@

 # https://github.com/abenz1267/walker
 %global goipath         github.com/abenz1267/walker
-Version:                0.12.16
+Version:                0.12.23

 %gometa -f

@@ -2,7 +2,7 @@
 %bcond check 1

 Name:           wpaperd
-Version:        1.1.1
+Version:        1.2.2
 Release:        1%?dist
 Summary:        Modern wallpaper daemon for Wayland
 License:        (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND CC0-1.0 AND (CC0-1.0 OR Apache-2.0) AND (CC0-1.0 OR Artistic-2.0) AND GPL-3.0+ AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR NCSA) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT)
@@ -7,7 +7,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           asar
-Version:        3.3.1
+Version:        4.0.0
 Release:        1%?dist
 Summary:        Simple extensive tar-like archive format with indexing
 License:        MIT
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "atac.spec"
+	}
+}
@@ -0,0 +1,42 @@
+%global crate atac
+
+%if 0%{?fedora} >= 42
+%global build_cflags %{__build_flags_lang_c} %{?_distro_extra_cflags} -std=gnu18
+%endif
+%global __brp_mangle_shebangs %{nil}
+
+Name:           atac
+Version:        0.20.1
+Release:        1%?dist
+Summary:        Arguably a Terminal API Client
+
+License:        MIT
+URL:            https://crates.io/crates/atac
+Source:         %{crates_source}
+
+Packager:       xiaoshihou <xiaoshihou@tutamail.com>
+BuildRequires:  anda-srpm-macros cargo-rpm-macros mold
+
+%global _description %{expand:
+Arguably a Terminal API Client. Feature-full, free, open-source, offline
+and account-less.}
+
+%description -n %{crate} %{_description}
+
+%files       -n %{crate}
+%license LICENSE
+%license LICENSE.dependencies
+%doc README.md
+%{_bindir}/%{crate}
+
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep_online
+
+%build
+%{cargo_license_summary_online}
+%{cargo_license_online} > LICENSE.dependencies
+
+%install
+%cargo_install
@@ -0,0 +1 @@
+rpm.version(crates("atac"));
@@ -1,12 +1,12 @@
 %define debug_package %nil
 %ifarch x86_64
-%global a x64
+%global a x64-baseline
 %elifarch aarch64
 %global a aarch64
 %endif

 Name:			bun-bin
-Version:		1.2.5
+Version:		1.2.15
 Release:		1%?dist
 Summary:		Incredibly fast JavaScript runtime, bundler, test runner, and package manager – all in one
 License:		MIT
@@ -17,10 +17,37 @@ BuildRequires:	unzip
 %description
 %summary.

+
+%package bash-completion
+Summary:		Bash completion for %{name}
+Requires:		%{name} = %{version}-%{release}
+Requires: 		bash-completion
+Supplements:	(%{name} and bash-completion)
+
+%description bash-completion
+Bash command line completion support for %{name}.
+
+%package fish-completion
+Summary:		Fish completion for %{name}
+Requires:		%{name} = %{version}-%{release}
+Requires:		fish
+Supplements:	(%{name} and fish)
+
+%description fish-completion
+Fish command line completion support for %{name}.
+
+%package zsh-completion
+Summary:		Zsh completion for %{name}
+Requires:		%{name} = %{version}-%{release}
+Requires:		zsh
+Supplements:	(%{name} and zsh)
+
+%description zsh-completion
+Zsh command line completion support for %{name}.
+
+
 %prep
-unzip %SOURCE0
-%global buildsubdir bun-linux-%a
-cd %buildsubdir
+%autosetup -n bun-linux-%a
 cat<<EOF > LICENSE
 MIT License

@@ -61,6 +88,12 @@ ln -s bun %buildroot%_bindir/bunx
 %license LICENSE
 %_bindir/bun
 %_bindir/bunx
+
+%files bash-completion
 %bash_completions_dir/bun.bash
+
+%files fish-completion
 %fish_completions_dir/bun.fish
+
+%files zsh-completion
 %zsh_completions_dir/_bun
@@ -12,7 +12,7 @@
 %endif

 Name:			codium
-Version:		1.98.2.25078
+Version:		1.100.23258
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "edit.spec"
+	}
+}
@@ -0,0 +1,57 @@
+%global _description %{expand:
+An editor that pays homage to the classic MS-DOS Editor, but with a modern interface and input controls similar to VS Code.}
+%global crate edit
+%bcond rust_nightly 1
+%if %{with rust_nightly}
+%define __cargo /usr/bin/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 RUSTFLAGS='%{build_rustflags}' $HOME/.cargo/bin/cargo
+%define __rustc $HOME/.cargo/bin/rustc
+%define __rustdoc $HOME/.cargo/bin/rustdoc
+%endif
+
+Name:          %{crate}
+Version:       1.1.0
+Release:       1%?dist
+Summary:       A simple editor for simple needs.
+SourceLicense: MIT
+License:       MIT AND (MIT OR Apache-2.0)
+URL:           https://github.com/microsoft/edit
+Source0:       %{url}/archive/refs/tags/v%{version}.tar.gz
+BuildRequires: anda-srpm-macros
+BuildRequires: cargo-rpm-macros
+%if %{with rust_nightly}
+BuildRequires: rustup
+%endif
+BuildRequires: mold
+Packager:      Gilver E. <rockgrub@disroot.org>
+
+%description %_description
+
+%prep
+%autosetup -n %{name}-%{version}
+%if %{with rust_nightly}
+rustup-init -y
+. "$HOME/.cargo/env"
+rustup toolchain install nightly
+rustup override set nightly
+%endif
+%cargo_prep_online
+
+%build
+%cargo_build
+
+%install
+%crate_install_bin
+%{cargo_license_online} > LICENSE.dependencies
+
+%files
+%doc CODE_OF_CONDUCT.md
+%doc README.md
+%doc SECURITY.md
+%license LICENSE
+%license LICENSE.dependencies
+%{_bindir}/%{name}
+
+%changelog
+* Thu May 22 2025 Gilver E. <rockgrub@disroot.org> - 1.0.0-1
+- Initial package
+
--- a/Show More
+++ b/Show More