Revert #3013

2026-05-31 09:01:55 +00:00 · 2025-01-18 23:55:24 +07:00
523 changed files with 9083 additions and 6976 deletions
@@ -0,0 +1,9 @@
+ARG VARIANT="rawhide"
+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 curl -Lo /etc/yum.repos.d/terra.repo https://raw.githubusercontent.com/terrapkg/subatomic-repos/main/terra.repo
+RUN dnf -y install git mock createrepo_c anda terra-mock-configs
@@ -1,19 +1,18 @@
 {
-  "name": "Terra Devcontainer",
-  "image": "ghcr.io/terrapkg/builder:frawhide",
+  "name": "Fedora",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "args": { "VARIANT": "rawhide" }
+  },
+  "remoteUser": "vscode",
  "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"
+  }
 }
@@ -41,7 +41,7 @@ jobs:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
        version: ["rawhide"]
      fail-fast: false
-    runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }}
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }}
    container:
      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
@@ -10,37 +10,23 @@ jobs:
        version: ["rawhide"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-22.04' }}
    container:
      image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Install repositories
        run: |
-          dnf5 swap -y --setopt=install_weak_deps=False systemd-standalone-sysusers systemd
-          dnf5 install -y --setopt=install_weak_deps=False curl wget git-core openssl-devel cargo podman fuse-overlayfs dnf5-plugins rpmbuild script
+          dnf5 install -y --setopt=install_weak_deps=False curl wget git-core openssl-devel cargo podman fuse-overlayfs
+          dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/tools/buildsys/{anda,subatomic}/*.spec
+
+      - name: Install Anda
+        run: cargo install anda

      - uses: actions/checkout@v4
        with:
          ref: f${{ matrix.version }}
          fetch-depth: 1
-
-      - name: Build anda-srpm-macros
-        run: |
-          mkdir -p anda-build/rpm/rpms
-          rpmbuild -bb anda/terra/srpm-macros/*.spec --undefine=_disable_source_fetch -D "_sourcedir $(pwd)/anda/terra/srpm-macros/" -D "_rpmdir $(pwd)/anda-build/rpm/rpms/"
-          mv ./anda-build/rpm/rpms/*/anda-*.rpm ./anda-build/rpm/rpms/
-          dnf5 install -y ./anda-build/rpm/rpms/anda-*.rpm
-
-      - name: Install build dependencies
-        run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/tools/buildsys/{anda,subatomic}/*.spec
-
-      - name: Install Anda
-        run: |
-          rpmbuild -bb anda/tools/buildsys/anda/*.spec --undefine=_disable_source_fetch -D "_sourcedir $(pwd)/anda/tools/buildsys/anda/" -D "_rpmdir $(pwd)/anda-build/rpm/rpms/"
-          mv ./anda-build/rpm/rpms/*/anda-*.rpm ./anda-build/rpm/rpms/
-          dnf5 install -y ./anda-build/rpm/rpms/anda-*.rpm
-
      - name: Build terra-mock-configs
        run: |
          echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV
@@ -50,16 +36,16 @@ jobs:
      - name: Install terra-mock-configs
        run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm

-      - name: Build trra-release
-        run: anda build -rrpmbuild anda/terra/release/pkg
+      - name: Build anda-srpm-macros
+        run: anda build -rrpmbuild anda/terra/srpm-macros/pkg

      - name: Build Subatomic
        run: anda build -rrpmbuild anda/tools/buildsys/subatomic/pkg
      - name: Install Subatomic
        run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm

-      - name: Tidy up output directory
-        run: rmdir anda-build/rpm/rpms/{noarch,aarch64,x86_64} | true
+      - name: Build Andaman
+        run: anda build -rrpmbuild anda/tools/buildsys/anda/pkg

      - name: Upload packages to subatomic
        run: |
@@ -47,7 +47,7 @@ jobs:
        version: ["rawhide"]
        arch: ${{ fromJson(needs.parse.outputs.arch) }}
      fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-22.04' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-22.04' }}
    container:
      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
@@ -13,7 +13,7 @@ jobs:
        pkg: ${{ fromJson(inputs.packages) }}
        version: ["rawhide"]
      fail-fast: false
-    runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }}
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-22.04' }}
    container:
      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
@@ -13,7 +13,6 @@ jobs:
          - frawhide
          - f40
          - f41
-          - f42
          - el10
    container:
      image: ghcr.io/terrapkg/builder:frawhide
@@ -4,7 +4,6 @@ on:
  push:
    branches:
      - frawhide
-      - f42
      - f41
      - f40
      - el10
@@ -48,7 +48,6 @@ jobs:
            }
            copy_over f40 || true
            copy_over f41 || true
-            copy_over f42 || true
            copy_over el10 || true
            git push -u origin --all
          fi
@@ -48,7 +48,6 @@ jobs:
            }
            copy_over f40 || true
            copy_over f41 || true
-            copy_over f42 || true
            copy_over el10 || true
            git push -u origin --all
          fi
@@ -48,7 +48,6 @@ jobs:
            }
            copy_over f40 || true
            copy_over f41 || true
-            copy_over f42 || true
            copy_over el10 || true
            git push -u origin --all
          fi
@@ -3,7 +3,4 @@ project pkg {
 	rpm {
 		spec = "anki-bin.spec"
 	}
-        labels {
-        subrepo = "extras"
-       }
 }
@@ -1,32 +1,29 @@
-%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/ef/fa/6c86371d0e3b71129d2a79e63fc3fdc17733c9ebbf77345c62caad8c9fca/anki-24.11-cp39-abi3-manylinux_2_28_x86_64.whl
+%global aurl https://files.pythonhosted.org/packages/58/6e/9f2d4853a83e57cea48ccae3bc2d887bf7c0550042185e156bab23f524bf/anki-24.11-cp39-abi3-manylinux_2_31_aarch64.whl
+%global qurl https://files.pythonhosted.org/packages/40/3c/b70ef91f1dad8248332971c0cbb2922277512789cadc33cb16233e360a56/aqt-24.11-py3-none-any.whl

 Name:			anki-bin
-Version:		25.02
+Version:		24.11
 Release:		1%?dist
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:			https://apps.ankiweb.net/
-BuildRequires:          python3-pip rpm_macro(fdupes) cargo
-Requires:               python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
-Requires:               python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
-Requires:               python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
-Requires:               python3-protobuf >= 4.21
-Requires:               libxcrypt-compat hicolor-icon-theme sox
-Requires:               (mpv or mpv-nightly)
-
-ExclusiveArch:	        x86_64
+BuildRequires:	python3-pip rpm_macro(fdupes) cargo
+Requires:		python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
+Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
+Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
+Requires:       libxcrypt-compat hicolor-icon-theme sox mpv 
+ExclusiveArch:	x86_64
 Conflicts:		anki
 %ifarch x86_64
 Source0:		%xurl
 %elifarch aarch64
-Source0:                %aurl
+Source0:        %aurl
 %endif
 Source1:		%qurl
 Source2:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/runanki.py
 Source3:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.desktop
-Source4:                https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.png
+Source4:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.png
 Source5:		https://raw.githubusercontent.com/ankitects/anki/%{version}/LICENSE
 Source6:		https://raw.githubusercontent.com/ankitects/anki/%{version}/README.md

@@ -60,8 +57,6 @@ rm -rf %buildroot%_bindir/{distro,flask,jsonschema,markdown_py,normalizer,send2t
 %license LICENSE
 %doc README.md
 %_bindir/anki
-%_bindir/pyuic6
-%_bindir/pylupdate6
 /usr/lib/python*/site-packages/_aqt/
 /usr/lib/python*/site-packages/anki-%{version}.dist-info/
 /usr/lib/python*/site-packages/anki/
@@ -1,5 +1,5 @@
 Name:           anki-qt5
-Version:        25.02
+Version:        24.11
 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
@@ -3,7 +3,4 @@ project pkg {
 	rpm {
 		spec = "anki.spec"
 	}
-        labels {
-                subrepo = "extras"
-        }
 }
@@ -1,5 +1,5 @@
 Name:           anki
-Version:        25.02
+Version:        24.11
 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
@@ -9,7 +9,7 @@ BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-sen
 BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-webengine
 Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
 Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt6-webengine
-Recommends:     (mpv or mpv-nightly)
+Recommends:     mpv
 Obsoletes:      anki <= 2.1.15
 Conflicts:      anki-qt5
 Patch0:         0001-No-update.patch
@@ -1,11 +1,8 @@
 %global __requires_exclude ^lib-.*.so            
 %global __provides_exclude ^lib-.*.so

-%global ver Audacity 3.7.1
-%global sanitized_ver %(sed 's/ *//;s/Audacity//' <<< "%{ver}")
-
 Name:    audacity-freeworld
-Version: %{sanitized_ver}
+Version: Audacity.3.7.1
 Release: 1%?dist
 Summary: Multitrack audio editor
 License: GPLv2
@@ -749,4 +746,4 @@ rm -f %{buildroot}%{_prefix}/%{realname}
 - New upstream version 1.2.0-pre3

 * Sat Oct 25 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:1.2.0-pre2.fdr.1
- First Fedora release
+- First Fedora release
@@ -1 +1 @@
-rpm.global("ver", gh("audacity/audacity"));
+rpm.version(gh("audacity/audacity"));
@@ -1,5 +1,5 @@
 project pkg {
 	rpm {
-		spec = "ags.spec"
+		spec = "authy.spec"
 	}
 }
@@ -0,0 +1,54 @@
+%define debug_package %nil
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
+
+Name: authy
+Version: 2.5.0
+Release: 1%{?dist}
+Summary: Two factor authentication desktop application
+License: Unlicense
+URL: https://authy.com/
+Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_23.snap
+Requires: gtk3
+Requires: nss
+BuildRequires: squashfs-tools desktop-file-utils
+
+%description
+%{summary}.
+
+%prep
+unsquashfs -q -f -d snap %{SOURCE0}
+
+%build
+
+%install
+install -d %buildroot%_datadir/authy
+cp -r snap/. %buildroot%_datadir/authy
+
+sed -i 's|${SNAP}/meta/gui/icon.png|authy|g' %buildroot%_datadir/authy/meta/gui/authy.desktop
+install -Dm644 %buildroot%_datadir/authy/meta/gui/authy.desktop -t %buildroot%_datadir/applications
+install -Dm644 %buildroot%_datadir/authy/meta/gui/icon.png %buildroot%_datadir/pixmaps/authy.png
+
+rm -rf %buildroot%_datadir/authy/{data-dir,gnome-platform,lib,meta,scripts,usr,*.sh}
+
+install -d %buildroot%_bindir
+ln -s %_datadir/authy/authy %buildroot%_bindir
+
+%check
+desktop-file-validate %buildroot%_datadir/applications/authy.desktop
+
+%files
+%_datadir/authy/
+%_bindir/authy
+%_datadir/applications/authy.desktop
+%_datadir/pixmaps/authy.png
+
+%changelog
+* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.3.0-2
+- Use /usr/share/ instead of /opt/
+
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 2.2.1-2
+- Initial release
@@ -0,0 +1,5 @@
+let req = new_req("https://api.snapcraft.io/v2/snaps/info/authy");
+req.head("Snap-Device-Series", "16");
+let obj = json(req.get())["channel-map"][0];
+rpm.version(obj.version);
+rpm.source(0, obj.download.url);
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "blackbox-terminal.spec"
+	}
+}
@@ -0,0 +1,58 @@
+Name:           blackbox-terminal
+Version:        0.14.0
+Release:        1%{?dist}
+Summary:        A beautiful GTK 4 terminal
+License:        GPL-3.0
+URL:            https://gitlab.gnome.org/raggesilver/blackbox
+BuildRequires:  vala meson gettext 
+BuildRequires:  pkgconfig(gtk4) >= 4.6.2
+BuildRequires:  pkgconfig(gio-2.0) >= 2.50
+BuildRequires:  libadwaita-devel >= 1.1
+BuildRequires:  pkgconfig(pqmarble) >= 2
+BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.69.0
+BuildRequires:  pkgconfig(json-glib-1.0) >= 1.4.4
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.9.12
+BuildRequires:  pkgconfig(librsvg-2.0) >= 2.54.0
+BuildRequires:  pkgconfig(libpcre2-8)
+BuildRequires:  pkgconfig(graphene-gobject-1.0)
+BuildRequires:  pkgconfig(gee-0.8)
+BuildRequires:  desktop-file-utils libappstream-glib cmake
+Source0:        %url/-/archive/v%version/blackbox-v%version.tar.gz
+
+%description
+%{summary}.
+
+%prep
+%autosetup -p1 -n blackbox-v%version
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+%check
+appstream-util validate-relax --nonet %buildroot/%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
+
+%files
+%doc README.md
+%license COPYING
+%_bindir/blackbox
+%_bindir/terminal-toolbox
+%_datadir/applications/com.raggesilver.BlackBox.desktop
+%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
+%_datadir/blackbox/
+%_datadir/glib-2.0/schemas/com.raggesilver.BlackBox.gschema.xml
+%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-fullscreen-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-show-headerbar-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/external-link-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/settings-symbolic.svg
+%_datadir/icons/hicolor/scalable/apps/com.raggesilver.BlackBox.svg
+%_datadir/locale/*/LC_MESSAGES/blackbox.mo
+
+
+
+%changelog
+* Sun Oct 23 2022 windowsboy111 <windowsboy111@fyralabs.com>
+- Initial package
@@ -0,0 +1,4 @@
+let txt = get("https://gitlab.gnome.org/api/v4/projects/20397/releases/");
+let ver = txt.json_arr()[0].tag_name;
+ver.crop(1);
+rpm.version(ver);
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.601
+Version:        0.0.571
 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.601
+Version:        0.0.571
 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.87
+Version:        0.0.80
 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.132
+Version:        0.0.126
 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.132
+Version:        0.0.126
 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.87
+Version:		0.0.80
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,8 +1,8 @@
-%global commit 96717d193f5e39a829161fc1f2d6c13393eea186
-%global commit_date 20250302
+%global commit 18e5670d90c1277f09705d4c04585078ebff1bf6
+%global commit_date 20250113
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

-Name:           envision-nightly
+Name:           envision
 Version:        %commit_date.%shortcommit
 Release:        1%?dist
 Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
@@ -23,7 +23,6 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  glib2-devel
 BuildRequires:  git-core
 Recommends:     android-tools
-Conflicts:      envision

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

 Name:			feishin
-Version:		0.12.2
+Version:		0.12.1
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
 URL:			https://github.com/jeffvli/feishin
 Source0:		%url/archive/refs/tags/v%version.tar.gz
 Requires:		fuse mpv
-BuildRequires:	nodejs20-npm jq libxcrypt-compat
+BuildRequires:	nodejs-npm jq libxcrypt-compat

 %description
 %summary.
@@ -38,13 +38,9 @@ Keywords=Music;Jellyfin;Audio;Stream;Sonixd
 EOF

 %build
-export PATH="$PATH:$(pwd)/bin"
-mkdir bin
-ln -s /usr/bin/node-20 bin/node
-ln -s /usr/bin/npm-20 bin/npm
-npm-20 install --legacy-peer-deps
-npm-20 run postinstall
-npm-20 run build
+npm install --legacy-peer-deps
+npm run postinstall
+npm run build
 %ifarch x86_64

 %define a linux
@@ -52,7 +48,7 @@ npm-20 run build
 %define a arm64
 %endif

-npx-20 electron-builder --linux dir --%a
+npx electron-builder --linux dir --%a

 %install
 mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir
@@ -5,7 +5,7 @@
 %global pure_protobuf_version 2.0.0

 Name:           komikku
-Version:        1.70.0
+Version:        1.67.0
 %forgemeta
 Release:        1%?dist
 Summary:        A manga reader for GNOME
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "legcord-bin.spec"
+	}
+}
@@ -0,0 +1,95 @@
+%define debug_package %nil
+%global _build_id_links none
+
+%ifarch x86_64
+%global src LegCord-%version-linux-x64
+%elifarch aarch64
+%global src LegCord-%version-linux-arm64
+%elifarch armv7l
+%global src LegCord-%version-linux-armv7l
+%endif
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
+
+Name:			legcord-bin
+Version:		1.0.6
+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
+BuildRequires:	add-determinism
+Obsoletes:      armcord < 3.3.2-1
+
+%description
+LegCord is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+mkdir legcord
+cd legcord
+unzip %SOURCE0
+
+cat <<EOF > .legcord.desktop
+[Desktop Entry]
+Name=LegCord
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=%_bindir/legcord
+Icon=legcord
+Categories=Network;InstantMessaging;
+StartupWMClass=legcord
+Keywords=discord;armcord;legcord;vencord;shelter;electron;
+EOF
+
+%build
+
+%install
+cd legcord
+mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name
+cp -a * %buildroot%_datadir/legcord/
+ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord
+ln -s %_datadir/legcord %buildroot%_datadir/armcord
+chmod +x -R %buildroot%_datadir/legcord/*
+chmod 755 %buildroot%_datadir/legcord/legcord
+install -Dm644 .legcord.desktop %buildroot%_datadir/applications/LegCord.desktop
+install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/legcord.png
+install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
+
+# HACK: rpm bug for unability to replace existing files on system.
+%pre
+if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
+  echo "Found old %_datadir/armcord directory, removing…"
+  rm -rf %_datadir/armcord
+fi
+
+%files
+%doc README.md
+%_datadir/legcord
+%_datadir/armcord
+%_bindir/legcord
+%_datadir/applications/LegCord.desktop
+%_datadir/pixmaps/legcord.png
+
+%changelog
+* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
+- Rename to LegCord.
+
+* Sat Jun 17 2023 madonuko <mado@fyralabs.com> - 3.2.0-2
+- Remove libnotify dependency.
+- Fix desktop entry.
+- Set as noarch package because there are not binary files.
+- Use /usr/share/ instead of /opt/
+
+* Sat May 6 2023 madonuko <mado@fyralabs.com> - 3.1.7-1
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gh("LegCord/LegCord"));
@@ -2,44 +2,47 @@
 %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.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
+Name:			legcord-bin
+Version:		1.0.6
+Release:		1%?dist
+License:		OSL-3.0
+Summary:		Custom lightweight Discord client designed to enhance your experience
+URL:			https://github.com/LegCord/LegCord
+Group:			Applications/Internet
+Source0:		%url/releases/download/v%version/%src.zip
+Source1:		legcord.png
+Source2:		https://raw.githubusercontent.com/LegCord/LegCord/v%version/README.md
+Requires:		xdg-utils
+BuildRequires:  unzip
+ExclusiveArch:	x86_64 aarch64 armv7l
+Conflicts:		legcord
+Conflicts:		legcord-nightly
+BuildRequires:	add-determinism
 Obsoletes:      armcord < 3.3.2-1

 %description
-Legcord is a custom client designed to enhance your Discord experience
+LegCord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

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

 cat <<EOF > .legcord.desktop
 [Desktop Entry]
-Name=Legcord
+Name=LegCord
 Comment=%summary
 GenericName=Internet Messenger
 Type=Application
@@ -53,6 +56,7 @@ 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 1833760c8be5b5fd4a76bbcd0cf1632d7bff0216
-%global commit_date 20250215
+%global commit 85c7990b511fb7099d5d460aa07051be6638f767
+%global commit_date 20250115
 %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.0.6
+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
@@ -1,6 +1,6 @@
-%global commit ee07dcf4c704e64d3d9d95191129bccd98c2c37d
+%global commit ca211b5b8830a74fecae115ba18b62878348342c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250302
+%global commit_date 20250111
 %global ver 0.39.0

 Name:           mpv-nightly
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Categories=Utility;
-Comment=A cross-platform system monitor
-Exec=NeoHtop
-Icon=NeoHtop
-Name=NeoHtop
-Terminal=false
-Type=Application
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "neohtop.spec"
-    }
-}
@@ -1,51 +0,0 @@
-%global __brp_mangle_shebangs %{nil}
-
-Name:           neohtop
-Version:        1.1.2
-Release:        1%?dist
-Summary:        System monitoring on steroids
-License:        MIT
-URL:            https://github.com/Abdenasser/neohtop
-Source0:        %url/archive/refs/tags/v%version.tar.gz
-Source1:        NeoHtop.desktop
-Packager:       Owen Zimmerman <owen@fyralabs.com>
-BuildRequires:  rust
-BuildRequires:  nodejs-npm
-BuildRequires:  webkit2gtk4.1-devel
-BuildRequires:  javascriptcoregtk4.1-devel
-BuildRequires:  libsoup3-devel
-BuildRequires:  gtk3-devel
-BuildRequires:  rust-gdk-pixbuf-sys-devel
-BuildRequires:  glib2-devel
-BuildRequires:  openssl-devel
-
-%description
-%summary.
-
-%prep
-%autosetup -n neohtop-%version
-
-%build
-npm install
-npm run tauri build
-
-%install
-install -Dpm755 src-tauri/target/release/NeoHtop %buildroot%_bindir/NeoHtop
-install -Dpm644 %{SOURCE1} %buildroot%{_datadir}/applications/NeoHtop.desktop
-# don't mind the numbers not matching, this is how the offical rpm installs these files
-install -Dpm644 src-tauri/icons/128x128@2x.png %buildroot%{_iconsdir}/hicolor/256x256@2/apps/NeoHtop.png
-install -Dpm644 src-tauri/icons/32x32.png %buildroot%{_iconsdir}/hicolor/32x32/apps/NeoHtop.png
-install -Dpm644 src-tauri/icons/128x128.png %buildroot%{_iconsdir}/hicolor/128x128/apps/NeoHtop.png
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/NeoHtop
-%{_datadir}/applications/NeoHtop.desktop
-%{_iconsdir}/hicolor/256x256@2/apps/NeoHtop.png
-%{_iconsdir}/hicolor/32x32/apps/NeoHtop.png
-%{_iconsdir}/hicolor/128x128/apps/NeoHtop.png
-
-%changelog
-* Sat Feb 15 2025 Owen Zimmerman <owen@fyralabs.com>
- Initial package
@@ -1 +0,0 @@
-rpm.version(gh("Abdenasser/neohtop"));
@@ -0,0 +1,11 @@
+--- a/desktop/packages/linux/rs.ruffle.Ruffle.desktop
+++ b/desktop/packages/linux/rs.ruffle.Ruffle.desktop
+@@ -54,7 +54,7 @@ Comment[zh_CN]=播放 Flash 游戏和动画
+ Comment[zh_TW]=播放 Flash 遊戲和動畫
+ Comment=Play Flash games & movies
+ Icon=rs.ruffle.Ruffle
+-Exec=ruffle %u
+Exec=ruffle_desktop %u
+ MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie
+ Categories=AudioVideo;Player;Graphics;Viewer;VectorGraphics;Game
+ Keywords[ar]=الفلاش;swf;مشغل;محاكي
@@ -1,4 +1,4 @@
-%global ver 2025-03-02
+%global ver 2025-01-17
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -14,6 +14,7 @@ Summary:        A Flash Player emulator written in Rust
 License:        Apache-2.0 OR MIT
 URL:            https://ruffle.rs/
 Source0:        https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-%ver.tar.gz
+Patch0:         desktop_file_patch.diff
 Provides:       ruffle
 BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  anda-srpm-macros mold
@@ -39,8 +40,6 @@ 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
@@ -1 +0,0 @@
-rpm.version(gitlab("gitlab.freedesktop.org", "4339"));
@@ -6,7 +6,7 @@

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.5
+Version:	1.5.4
 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
@@ -13,7 +13,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			voicevox
-Version:		0.23.0
+Version:		0.22.4
 Release:		1%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
@@ -2,8 +2,4 @@ project pkg {
 	rpm {
 		spec = "youtube-music.spec"
 	}
-	
-	labels = {
-	    mock = 1
-	}
 }
@@ -5,6 +5,6 @@ TryExec=/usr/bin/youtube-music
 Icon=youtube-music
 Terminal=false
 Type=Application
-StartupWMClass=com.github.th_ch.youtube_music
+StartupWMClass=YouTube Music
 Comment=YouTube Music Desktop App - including custom plugins
 Categories=AudioVideo;
@@ -1,19 +1,12 @@
 %define debug_package %nil

-# Exclude private libraries since this is bundled with electron
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 # macro shorthand for calling pnpm
 %global pnpm npx pnpm@%{pnpm_version}

-# Try to vendor PNPM directly from Fedora
-# but if this fails, you can try setting this to 1 to vendor PNPM directly from upstream
-%global vendor_pnpm 1
-
 Name:           youtube-music
-Version:        3.7.5
-Release:        2%?dist
+Version:        3.7.2
+Release:        1%?dist
 Summary:        YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
 Source1:        youtube-music.desktop
 License:        MIT
@@ -28,10 +21,6 @@ BuildRequires:  git-core gcc make
 # Required for usocket native module built with node-gyp
 BuildRequires:  python3 gcc-c++

-%if !0%{?vendor_pnpm}
-BuildRequires:  pnpm nodejs20
-%endif
-
 %description
 YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)

@@ -46,11 +35,9 @@ git checkout v%{version}
 %build
 # Vendor PNPM directly instead of installing from packages, because we need to somehow force PNPM to use Node.js 20
 # We are not using Fedora's PNPM because we need to use `pnpm env`, which PNPM does not support when not vendored directly from upstream
-%if 0%{?vendor_pnpm}
 curl -fsSL https://get.pnpm.io/install.sh | sh -
-source $HOME/.bashrc
+source /builddir/.bashrc
 pnpm env use --global 20
-%endif
 pnpm install
 pnpm build
 pnpm electron-builder --linux --dir
@@ -0,0 +1,12 @@
+diff --color -ru budgie-extras-1.4.0/budgie-weathershow/src/desktop_weather/desktop_weather.vala budgie-extras-1.4.0-patched/budgie-weathershow/src/desktop_weather/desktop_weather.vala
+--- budgie-extras-1.4.0/budgie-weathershow/src/desktop_weather/desktop_weather.vala	2022-03-11 06:24:44.000000000 +0700
+++ budgie-extras-1.4.0-patched/budgie-weathershow/src/desktop_weather/desktop_weather.vala	2022-06-09 14:57:46.677283438 +0700
+@@ -308,7 +308,7 @@
+     private void get_icondata () {
+         // fetch the icon list
+         string icondir = "/".concat(
+-            "usr/lib/budgie-desktop/plugins",
+            "usr/lib64/budgie-desktop/plugins",
+             "/budgie-weathershow/weather_icons"
+         );
+         iconnames = {};
@@ -1,12 +1,13 @@
 Name:           budgie-extras
-Version:        1.9.0
-Release:        1%?dist
+Version:        1.8.0
+Release:        2%{?dist}

 License:        GPL-3.0
 Summary:        Additional Budgie Desktop enhancements for user experience
 URL:            https://ubuntubudgie.org/

 Source0:        https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz
+Patch0:         0001-fix-weathershow-desktop-widget-icon-path.patch

 BuildRequires:  rpm_macro(fdupes)
 BuildRequires:  cmake
@@ -276,7 +277,7 @@ workspaces.
 # Remove absolute symlink and replace with relative symlink
 rm -f %{buildroot}%{_bindir}/quickchar

-%fdupes %{buildroot}%{_datadir}/budgie-desktop/budgie-weathershow/weather_icons
+%fdupes %_libdir/budgie-desktop/plugins/budgie-weathershow/weather_icons

 %post

@@ -402,8 +403,6 @@ rm -f %{buildroot}%{_bindir}/quickchar

 %files -n budgie-applet-weathershow
 %{_libdir}/budgie-desktop/plugins/budgie-weathershow
-%{_datadir}/budgie-desktop/budgie-weathershow/cities
-%{_datadir}/budgie-desktop/budgie-weathershow/weather_icons/*
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.weathershow.gschema.xml
 %{_datadir}/pixmaps/budgie-wticon-symbolic.svg

@@ -4,6 +4,5 @@ project pkg {
 	}
 	labels {
 		subrepo = "extras"
-		updbranch = 1
 	}
 }
@@ -1,6 +1,6 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 %global major_version 47
-%global minor_version 3
+%global minor_version 1

 %if 0%{?rhel}
 %global portal_helper 0
@@ -8,15 +8,14 @@
 %global portal_helper 1
 %endif

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

-Provides:       gnome-shell = %version-%release
 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
+Source0:        https://download.gnome.org/sources/gnome-shell/%{major_version}/%{name}-%{tarball_version}.tar.xz

 # Replace Epiphany with Firefox in the default favourite apps list
 Patch: gnome-shell-favourite-apps-firefox.patch
@@ -179,7 +178,7 @@ innovative user interface concepts to provide a visually attractive and
 easy to use experience.

 %prep
-%autosetup -S git -n gnome-shell-%{tarball_version}
+%autosetup -S git -n %{name}-%{tarball_version}

 %build
 %meson \
@@ -199,7 +198,7 @@ easy to use experience.
 mkdir -p %{buildroot}%{_datadir}/gnome-shell/extensions
 mkdir -p %{buildroot}%{_datadir}/gnome-shell/search-providers

-%find_lang gnome-shell
+%find_lang %{name}

 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.desktop
@@ -209,7 +208,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Exten
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop
 %endif

-%files -f gnome-shell.lang
+%files -f %{name}.lang
 %license COPYING
 %doc NEWS README.md
 %{_bindir}/gnome-shell
@@ -1,25 +0,0 @@
-import "andax/bump_extras.rhai" as bump;
-
-let pkg = "gnome-shell";
-let branch = bump::as_bodhi_ver(labels.branch);
-
-let url = `https://bodhi.fedoraproject.org/updates/?search=${pkg}&status=stable&releases=${branch}&rows_per_page=10&page=1`;
-
-let done = false;
-
-for entry in get(url).json().updates {
-  for entry in entry.title.split(' ') {
-    let matches = find_all(`${pkg}-([\d.]+)-(\d+)\.[\w\d]+$`, entry);
-    if matches.len() == 0 { continue; }
-    let majminv = matches[0][1].split('.');
-    if majminv.len() != 2 {
-      print(`gnome-shell: ${matches[0][1]} has invalid version?`);
-      terminate();
-    }
-    rpm.global("major_version", majminv[0]);
-    rpm.global("minor_version", majminv[1]);
-    rpm.f = sub(`Release:(\s+)(.+?)\n`, "Release:${1}" + matches[0][2] + "%{?dist}.switcheroo\n", rpm.f);
-    done = true;
-  }
-  if done { break; }
-}
@@ -4,6 +4,5 @@ project pkg {
 	}
 	labels {
 		subrepo = "extras"
-		updbranch = 1
 	}
 }
@@ -1,11 +1,11 @@
 %global framework kio

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

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

 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
@@ -28,7 +28,6 @@ Patch101: kio-no-help-protocol.patch
 # https://invent.kde.org/frameworks/kio/-/merge_requests/1556
 Patch201: 1556.patch

-Provides:       kf6-%{framework}
 BuildRequires:  extra-cmake-modules
 BuildRequires:  gcc-c++
 BuildRequires:  kf6-rpm-macros
@@ -99,7 +98,6 @@ Requires:       cmake(KF6Solid)
 Requires:       cmake(KF6XmlGui)
 Requires:       cmake(KF6WindowSystem)
 Requires:       qt6-qtbase-devel
-Provides:       kf6-kio-devel = %version-%release
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -108,7 +106,6 @@ developing applications that use %{name}.
 Summary:        Documentation files for %{name}
 Requires:       %{name}-core = %{version}-%{release}
 BuildArch:      noarch
-Provides:       kf6-kio-doc = %version-%release
 %description    doc
 Documentation for %{name}.

@@ -119,14 +116,12 @@ Requires:       %{name}-core-libs%{?_isa} = %{version}-%{release}
 Requires:       %{name}-doc = %{version}-%{release}
 Requires:       kf6-filesystem
 Recommends:     switcheroo-control
-Provides:       kf6-kio-core = %version-%release
 %description    core
 KIOCore library provides core non-GUI components for working with KIO.

 %package        core-libs
 Summary:        Runtime libraries for KIO Core
 Requires:       %{name}-core%{?_isa} = %{version}-%{release}
-Provides:       kf6-kio-core-libs = %version-%release
 %description    core-libs
 %{summary}.

@@ -136,7 +131,6 @@ Summary:        Widgets for KIO Framework
 ## included here for completeness, even those -core already has a dependency.
 %{?kf6_kinit_requires}
 Requires:       %{name}-core%{?_isa} = %{version}-%{release}
-Provides:       kf6-kio-widgets = %version-%release
 %description    widgets
 KIOWidgets contains classes that provide generic job control, progress
 reporting, etc.
@@ -144,14 +138,12 @@ reporting, etc.
 %package        widgets-libs
 Summary:        Runtime libraries for KIO Widgets library
 Requires:       %{name}-widgets%{?_isa} = %{version}-%{release}
-Provides:       kf6-kio-widgets-libs = %version-%release
 %description    widgets-libs
 %{summary}.

 %package        file-widgets
 Summary:        Widgets for file-handling for KIO Framework
 Requires:       %{name}-widgets%{?_isa} = %{version}-%{release}
-Provides:       kf6-kio-file-widgets = %version-%release
 %description    file-widgets
 The KIOFileWidgets library provides the file selection dialog and
 its components.
@@ -159,14 +151,12 @@ its components.
 %package        gui
 Summary:        Gui components for the KIO Framework
 Requires:       %{name}-core%{?_isa} = %{version}-%{release}
-Provides:       kf6-kio-gui = %version-%release
 %description    gui
 %{summary}.

 %package        qch-doc
 Summary:        Developer Documentation files for %{name}
 BuildArch:      noarch
-Provides:       kf6-kio-qch-doc = %version-%release
 %description    qch-doc
 Developer Documentation files for %{name} for use with KDevelop or QtCreator.

@@ -182,7 +172,7 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.

 %install
 %cmake_install
-%find_lang kf6-kio --all-name --with-man --with-html
+%find_lang %{name} --all-name --with-man --with-html

 %files
 %license LICENSES/*.txt
@@ -197,7 +187,6 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 %{_kf6_plugindir}/kio/
 %{_kf6_plugindir}/kded/
 %{_kf6_plugindir}/kiod/
-%{_kf6_plugindir}/kio_dnd/
 %{_kf6_datadir}/kf6/searchproviders/*.desktop
 %{_kf6_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.kde.*.service
@@ -206,7 +195,7 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 %files core-libs
 %{_kf6_libdir}/libKF6KIOCore.so.*

-%files doc -f kf6-kio.lang
+%files doc -f %{name}.lang

 %files gui
 %{_kf6_libdir}/libKF6KIOGui.so.*
@@ -234,28 +223,6 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 %{_qt6_docdir}/*.qch

 %changelog
-* Fri Feb 07 2025 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.11.0-1
- 6.11.0
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.10.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Tue Jan 07 2025 Steve Cossette <farchord@gmail.com> - 6.10.0-2
- File Picker: Fix 'All supported files' for more than 3
- filters
-
-* Fri Jan 03 2025 Steve Cossette <farchord@gmail.com> - 6.10.0-1
- 6.10.0
-
-* Sat Dec 14 2024 Steve Cossette <farchord@gmail.com> - 6.9.0-1
- 6.9.0
-
-* Sat Nov 02 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.8.0-1
- 6.8.0
-
-* Mon Oct 14 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-2
- Rebuild (qt6)
-
 * Fri Oct 04 2024 Steve Cossette <farchord@gmail.com> - 6.7.0-1
 - 6.7.0

@@ -1,16 +0,0 @@
-import "andax/bump_extras.rhai" as bump;
-
-let pkg = "kf6-kio";
-let branch = bump::as_bodhi_ver(labels.branch);
-
-let url = `https://bodhi.fedoraproject.org/updates/?search=${pkg}&status=stable&releases=${branch}&rows_per_page=1&page=1`;
-
-for entry in get(url).json().updates[0].title.split(' ') {
-  let matches = find_all(`${pkg}-([\d.]+)-(\d+)\.[\w\d]+$`, entry);
-  if matches.len() == 0 { continue; }
-  if matches[0][1].ends_with(".0") {
-    rpm.global("majmin_ver_kf6", matches[0][1][0..matches[0][1].len()-2]);
-    rpm.f = sub(`Release: (.+?)\n`, "Release: " + matches[0][2] + "%{?dist}.switcheroo\n", rpm.f);
-  }
-  break;
-}
@@ -0,0 +1,8 @@
+project pkg {
+	rpm {
+		spec = "latte-dock-nightly.spec"
+	}
+	labels {
+		nightly = "1"
+	}
+}
@@ -0,0 +1,113 @@
+%global forgeurl https://github.com/KDE/latte-dock/
+
+%global commit a53f381352dae5319cb159692aa8a83574963a5c
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date %(date '+%Y%m%d')
+%global snapshot_info %{commit_date}.%{shortcommit}
+
+Name:     latte-dock-nightly
+Version:  0.10.0^%{snapshot_info}
+
+%forgemeta
+Release:  1%?dist
+Summary:  Latte is a dock based on plasma frameworks
+License:  GPL-2.0-or-later
+
+URL:      %{forgeurl}
+Source0:  https://github.com/KDE/latte-dock/archive/%{commit}.tar.gz
+
+BuildRequires:  libxcb-devel
+BuildRequires:  xcb-util-devel
+BuildRequires:  libSM-devel
+BuildRequires:  extra-cmake-modules
+BuildRequires:  qt5-qtx11extras-devel
+BuildRequires:  kf5-karchive-devel
+BuildRequires:  kf5-kio-devel
+BuildRequires:  kf5-kirigami2-devel
+BuildRequires:  kf5-kactivities-devel
+BuildRequires:  kf5-kcoreaddons-devel
+BuildRequires:  kf5-kdbusaddons-devel
+BuildRequires:  kf5-kdeclarative-devel
+BuildRequires:  kf5-knewstuff-devel
+BuildRequires:  kf5-knotifications-devel
+BuildRequires:  kf5-kiconthemes-devel
+BuildRequires:  kf5-kitemmodels-devel
+BuildRequires:  kf5-ki18n-devel
+BuildRequires:  kf5-kpackage-devel
+BuildRequires:  kf5-plasma-devel
+BuildRequires:  kf5-kwayland-devel
+BuildRequires:  kf5-kwindowsystem-devel
+BuildRequires:  kf5-kxmlgui-devel
+BuildRequires:  kf5-kglobalaccel-devel
+BuildRequires:  kf5-kguiaddons-devel
+BuildRequires:  kf5-kcrash-devel
+BuildRequires:  qt5-qtwayland-devel
+BuildRequires:  plasma-wayland-protocols-devel
+BuildRequires:  wayland-devel
+BuildRequires:  plasma-workspace-devel
+
+Recommends:     %{name}-lang
+
+Conflicts:      latte-dock
+Provides:       latte-dock = 0.10.0^%{snapshot_info}
+Provides:       latte-dock%{?_isa} = 0.10.0^%{snapshot_info}
+
+%description
+Latte is a dock based on plasma frameworks that provides an elegant and
+intuitive experience for your tasks and plasmoids. It animates its contents by
+using parabolic zoom effect and tries to be there only when it is needed.
+
+"Art in Coffee"
+
+%package lang
+Summary: Translation files for latte-dock
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+%description lang
+%{summary}.
+
+%prep
+%{forgesetup}
+%autosetup -n %{archivename}
+
+%build
+%cmake_kf5 \
+  -Wno-dev
+
+%cmake_build
+%install
+
+%cmake_install
+%find_lang %{name} --all-name
+
+%files
+%doc README.md
+%license LICENSES/*
+%{_bindir}/latte-dock
+%{_datadir}/metainfo/org.kde.latte-dock.appdata.xml
+%{_datadir}/metainfo/org.kde.latte.plasmoid.appdata.xml
+%{_datadir}/metainfo/org.kde.latte.shell.appdata.xml
+%{_kf5_datadir}/applications/org.kde.latte-dock.desktop
+%{_kf5_datadir}/dbus-1/interfaces/org.kde.LatteDock.xml
+%{_kf5_datadir}/icons/breeze/*/*/*
+%{_kf5_datadir}/icons/hicolor/*/*/*
+%{_kf5_datadir}/knotifications5/lattedock.notifyrc
+%{_kf5_datadir}/kservicetypes5/latte-indicator.desktop
+%{_kf5_datadir}/plasma/plasmoids/org.kde.latte.plasmoid/
+%{_kf5_datadir}/plasma/plasmoids/org.kde.latte.containment/
+%{_kf5_datadir}/plasma/shells/org.kde.latte.shell/
+%{_kf5_datadir}/latte
+%{_kf5_datadir}/knsrcfiles/latte-indicators.knsrc
+%{_kf5_datadir}/knsrcfiles/latte-layouts.knsrc
+%{_kf5_qmldir}/org/kde/latte
+%{_qt5_plugindir}/kpackage/packagestructure/latte_indicator.so
+%{_qt5_plugindir}/plasma/containmentactions/plasma_containmentactions_lattecontextmenu.so
+
+%files lang -f %{name}.lang
+
+%changelog
+* Sun Dec 25 2022 lleyton <lleyton@fyralabs.com> - 0.10.0^20221226.93c50a7-1
+- Comply with packaging policy
+* Sun Dec 25 2022 windowsboy111 <windowsboy111@fyralabs.com> - 0.10.9-1
+- Initial package
+
@@ -0,0 +1,7 @@
+if filters.contains("nightly") {
+	let req = new_req("https://api.github.com/repos/KDE/latte-dock/commits/HEAD");
+	req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
+	let sha = json(req.get()).sha;
+	rpm.global("commit", sha);
+	rpm.release();
+}
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit 3a0dacbbf99b45b67c39bb92449235c576cbf05a
+%global commit 59b299a43db2443152b0dbe48d14bfc72d205e8b
 %forgemeta

 Name:           lomiri-app-launch
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas
-%global commit 4a74eca0e4dcb745521abf20f975854cc3478a70
+%global commit 0f3990afa510bc2b4af2cb198a23853e5bb3f068
 %forgemeta

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

 Name:       lomiri-system-settings
@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-sound
 Summary:    Ayatana Indicator Sound Applet
-Version:    24.5.2
+Version:    24.5.1
 Release:    1%?dist
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-sound
@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-    spec = "mwc.spec"
-  }
-  labels {
-    nightly = 1
-  }
-}
@@ -1,69 +0,0 @@
-%global commit 9b9d4256be440b511e6c37165e01a6c2686e606f
-%global commit_date 20250301
-%global shortcommit %{sub %{commit} 1 7 }
-%global ver 0.1.2
-
-Name:           mwc
-Version:        %{ver}^%{commit_date}git.%{shortcommit}
-Release:        1%{?dist}
-Summary:        Tiling Wayland compositor based on wlroots and scenefx
-
-License:        MIT
-URL:            https://github.com/dqrk0jeste/mwc
-Source0:        %{url}/archive/%{commit}.tar.gz
-
-BuildRequires:  meson
-BuildRequires:  gcc
-BuildRequires:  pkgconfig(libinput)
-BuildRequires:  pkgconfig(scenefx-0.2)
-BuildRequires:  pkgconfig(wlroots-0.18)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  wayland-devel
-
-Requires:       libdrm
-Requires:       libinput
-Requires:       libxkbcommon
-Requires:       pixman
-Requires:       wayland-devel
-Requires:       wlroots
-Requires:       xdg-desktop-portal-wlr
-
-Recommends:     waybar kitty rofi-wayland
-
-Packager:       sadlerm <lerm@chromebooks.lol>
-
-Provides:       owl = %{version}-%{release}
-Obsoletes:      owl < 0^20250124.9999999
-
-%description
-%{summary}.
-
-%prep
-%autosetup -n %{name}-%{commit}
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-install -Dm644 examples/example.conf %{buildroot}%{_datadir}/%{name}/example.conf
-
-%files
-%license LICENSE
-%doc README.md
-%{_bindir}/%{name}
-%{_bindir}/%{name}-ipc
-%{_datadir}/%{name}/default.conf
-%{_datadir}/%{name}/example.conf
-%{_datadir}/wayland-sessions/%{name}.desktop
-%{_datadir}/xdg-desktop-portal/%{name}-portals.conf
-
-
-%changelog
-* Thu Feb 27 2025 sadlerm <lerm@chromebooks.lol>
- New upstream name
- Package is now built with meson
-* Fri Jan 31 2025 sadlerm <lerm@chromebooks.lol>
- Initial package
@@ -1,9 +0,0 @@
-if filters.contains("nightly") {
-    rpm.global("commit", gh_commit("dqrk0jeste/mwc"));
-    let v = gh("dqrk0jeste/mwc");
-    if rpm.changed() {
-        rpm.global("commit_date", date());
-        v.crop(1);
-        rpm.global("ver", v);
-    }
-}
@@ -0,0 +1,142 @@
+From 4d44531c8f624f5b479c3ff23e8fecc67eb848ab Mon Sep 17 00:00:00 2001
+From: Jeremy Linton <jeremy.linton@arm.com>
+Date: Fri, 22 Oct 2021 14:51:54 -0500
+Subject: [PATCH] Delay for logind, and fallback to seat0
+
+There is systemd/logind race with when restarting
+sddm that causes logind1 not to be available. Previously
+this meant the seat0 was immediately created regardless
+of the state of CanGraphical.
+
+Fixing this, though we still want seat0 to be started
+if none of the seats appear to be graphical. Presumably
+there are some graphics on the machine, otherwise
+why run sddm? Wait a bit, and create seat0 anyway. If
+this fails the output from Xorg should tell us why. This
+is generally a better strategy than what happens a good
+amount of time now, where sddm is started and silent about
+why the screen is blank.
+
+References:
+* https://bugzilla.redhat.com/2011991
+* https://bugzilla.redhat.com/2016310
+
+Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
+---
+ src/daemon/LogindDBusTypes.cpp | 31 +++++++++++++++++++++----------
+ src/daemon/SeatManager.cpp     | 22 ++++++++++++++++++++++
+ src/daemon/SeatManager.h       |  1 +
+ 3 files changed, 44 insertions(+), 10 deletions(-)
+
+diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
+index 011bb7f..6255c69 100644
+--- a/src/daemon/LogindDBusTypes.cpp
+++ b/src/daemon/LogindDBusTypes.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include <QDebug>
+ 
+#include <unistd.h>
+
+ class LogindPathInternal {
+ public:
+     LogindPathInternal();
+@@ -46,17 +48,26 @@ LogindPathInternal::LogindPathInternal()
+     qRegisterMetaType<UserInfoList>("UserInfoList");
+     qDBusRegisterMetaType<UserInfoList>();
+ 
+-    if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
+-        qDebug() << "Logind interface found";
+-        available = true;
+-        serviceName = QStringLiteral("org.freedesktop.login1");
+-        managerPath = QStringLiteral("/org/freedesktop/login1");
+-        managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
+-        seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
+-        sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
+-        userIfaceName = QStringLiteral("org.freedesktop.login1.User");
+-        return;
+#ifdef HAVE_SYSTEMD
+    // systemd-logind should be running, although because it takes a few moments to restart after
+    // systemctl isolate calls, it may not yet be running. Wait a few seconds for it, while blocking everything else.
+    int logind_wait_seconds = 50;
+    while (logind_wait_seconds--) {
+        if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
+            qDebug() << "Logind interface found";
+            available = true;
+            serviceName = QStringLiteral("org.freedesktop.login1");
+            managerPath = QStringLiteral("/org/freedesktop/login1");
+            managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
+            seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
+            sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
+            userIfaceName = QStringLiteral("org.freedesktop.login1.User");
+            return;
+        }
+	qDebug() << "Sleeping for systemd-logind";
+	usleep(100000);
+     }
+#endif
+ 
+     if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
+         qDebug() << "Console kit interface found";
+diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp
+index bd207e6..39d8b85 100644
+--- a/src/daemon/SeatManager.cpp
+++ b/src/daemon/SeatManager.cpp
+@@ -26,6 +26,9 @@
+ #include <QDBusMessage>
+ #include <QDBusPendingReply>
+ #include <QDBusContext>
+#include <QDebug>
+#include <QFileInfo>
+#include <QTimer>
+ 
+ #include "LogindDBusTypes.h"
+ 
+@@ -115,6 +118,8 @@ namespace SDDM {
+ 
+         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatNew"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath)));
+         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath)));
+
+	QTimer::singleShot(5000, this, &SeatManager::checkSeat);
+     }
+ 
+     void SeatManager::createSeat(const QString &name) {
+@@ -152,6 +157,23 @@ namespace SDDM {
+         m_seats.value(name)->createDisplay(Display::defaultDisplayServerType());
+     }
+ 
+    // this is a bit hacky, but linux DRM drivers
+    // won't initially be available so there is a race
+    // between determing if a efifb/etc graphical object
+    // is the only graphics on the machine, or a DRM driver
+    // will take over the display. So we will hang out for a few
+    // seconds and if none of the seats are declared cangraphical
+    // its possible the only graphics on the machine don't have
+    // a drm driver.
+    void SeatManager::checkSeat(void) {
+        if (m_seats.isEmpty()) {
+	     //if (QFileInfo::exists(QStringLiteral("/dev/fb0"))) {
+                 qWarning() << "No graphical seats found, attempt to start one on the main console anyway...";
+                 createSeat(QStringLiteral("seat0"));
+	     //}
+        }
+    }
+
+     void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath)
+     {
+         auto logindSeat = new LogindSeat(name, objectPath);
+diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h
+index b2f9796..aa43047 100644
+--- a/src/daemon/SeatManager.h
+++ b/src/daemon/SeatManager.h
+@@ -49,6 +49,7 @@ namespace SDDM {
+     private:
+         QHash<QString, Seat *> m_seats; //these will exist only for graphical seats
+         QHash<QString, LogindSeat*> m_systemSeats; //these will exist for all seats
+        void checkSeat(void);
+     };
+ }
+ 
+-- 
+2.39.2
+
@@ -0,0 +1,2 @@
+This scripts dir contains only samples, but are generally not used directly.
+In practice, sddm runtime uses items under /etc/sddm by default
@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "terra-sddm.spec"
+  }
+}
@@ -0,0 +1,11 @@
+diff -up sddm-0.18.0/services/sddm.service.in.env sddm-0.18.0/services/sddm.service.in
+--- sddm-0.18.0/services/sddm.service.in.env	2018-07-18 05:31:40.000000000 -0500
+++ sddm-0.18.0/services/sddm.service.in	2019-03-14 08:23:22.095498405 -0500
+@@ -7,6 +7,7 @@ After=systemd-user-sessions.service gett
+ [Service]
+ ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
+ Restart=always
+EnvironmentFile=-/etc/sysconfig/sddm
+ 
+ [Install]
+ Alias=display-manager.service
@@ -0,0 +1,53 @@
+diff --git a/src/common/Configuration.h b/src/common/Configuration.h
+index 54bcace..9b8fa22 100644
+--- a/src/common/Configuration.h
+++ b/src/common/Configuration.h
+@@ -37,9 +37,8 @@ namespace SDDM {
+         enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
+ 
+         //  Name                   Type         Default value                                   Description
+-        // TODO: Change default to x11-user in a future release
+-        Entry(DisplayServer,       QString,     _S("x11"),                                      _S("Which display server should be used.\n"
+-                                                                                                   "Valid values are: x11, x11-user, wayland. Wayland support is experimental"));
+        Entry(DisplayServer,       QString,     _S("wayland"),                                  _S("Which display server should be used.\n"
+                                                                                                   "Valid values are: x11, x11-user, wayland."));
+         Entry(HaltCommand,         QString,     _S(HALT_COMMAND),                               _S("Halt command"));
+         Entry(RebootCommand,       QString,     _S(REBOOT_COMMAND),                             _S("Reboot command"));
+         Entry(Numlock,             NumState,    NUM_NONE,                                       _S("Initial NumLock state. Can be on, off or none.\n"
+@@ -51,7 +50,7 @@ namespace SDDM {
+         //  Name   Entries (but it's a regular class again)
+         Section(Theme,
+             Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
+-            Entry(Current,             QString,     _S(""),                                     _S("Current theme name"));
+            Entry(Current,             QString,     _S("01-breeze-fedora"),                     _S("Current theme name"));
+             Entry(FacesDir,            QString,     _S(DATA_INSTALL_DIR "/faces"),              _S("Global directory for user avatars\n"
+                                                                                                    "The files should be named <username>.face.icon"));
+             Entry(CursorTheme,         QString,     QString(),                                  _S("Cursor theme used in the greeter"));
+@@ -71,9 +70,9 @@ namespace SDDM {
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/xsessions"),
+                                                      _S("/usr/share/xsessions")},               _S("Comma-separated list of directories containing available X sessions"));
+             Entry(SessionCommand,      QString,     _S(SESSION_COMMAND),                        _S("Path to a script to execute when starting the desktop session"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/xorg-session.log"),   _S("Path to the user session log file"));
+-            Entry(DisplayCommand,      QString,     _S(DATA_INSTALL_DIR "/scripts/Xsetup"),     _S("Path to a script to execute when starting the display server"));
+-            Entry(DisplayStopCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xstop"),      _S("Path to a script to execute when stopping the display server"));
+            Entry(SessionLogFile,      QString,     _S(".cache/xsession-errors"),               _S("Path to the user session log file"));
+            Entry(DisplayCommand,      QString,     _S(SYS_CONFIG_DIR "/sddm/Xsetup"),          _S("Path to a script to execute when starting the display server"));
+            Entry(DisplayStopCommand,  QString,     _S(SYS_CONFIG_DIR "/sddm/Xstop"),           _S("Path to a script to execute when stopping the display server"));
+             Entry(EnableHiDPI,         bool,        true,                                      _S("Enable Qt's automatic high-DPI scaling"));
+         );
+ 
+@@ -82,12 +81,12 @@ namespace SDDM {
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/wayland-sessions"),
+                                                      _S("/usr/share/wayland-sessions")},        _S("Comma-separated list of directories containing available Wayland sessions"));
+             Entry(SessionCommand,      QString,     _S(WAYLAND_SESSION_COMMAND),                _S("Path to a script to execute when starting the desktop session"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
+            Entry(SessionLogFile,      QString,     _S(".cache/wayland-errors"),                _S("Path to the user session log file"));
+             Entry(EnableHiDPI,         bool,        true,                                       _S("Enable Qt's automatic high-DPI scaling"));
+         );
+ 
+         Section(Users,
+-            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin"),         _S("Default $PATH for logged in users"));
+            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"), _S("Default $PATH for logged in users"));
+             Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
+             Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
+             Entry(HideUsers,           QStringList, QStringList(),                              _S("Comma-separated list of users that should not be listed"));
@@ -0,0 +1,67 @@
+From 52175648f4e1b415f93b24a3ef970983024659f2 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <neal@gompa.dev>
+Date: Wed, 28 Feb 2024 16:47:16 -0500
+Subject: [PATCH] Default to Qt6 and always use versioned greeters
+
+Distributors can handle creating an unversioned name if necessary.
+---
+ src/common/ThemeMetadata.cpp | 4 ++--
+ src/daemon/Greeter.cpp       | 3 +--
+ src/greeter/CMakeLists.txt   | 9 +--------
+ 3 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/src/common/ThemeMetadata.cpp b/src/common/ThemeMetadata.cpp
+index 2cb3762..003056a 100644
+--- a/src/common/ThemeMetadata.cpp
+++ b/src/common/ThemeMetadata.cpp
+@@ -28,7 +28,7 @@ namespace SDDM {
+         QString mainScript { QStringLiteral("Main.qml") };
+         QString configFile;
+         QString translationsDirectory { QStringLiteral(".") };
+-        int qtVersion = 5;
+        int qtVersion = 6;
+     };
+ 
+     ThemeMetadata::ThemeMetadata(const QString &path, QObject *parent) : QObject(parent), d(new ThemeMetadataPrivate()) {
+@@ -61,6 +61,6 @@ namespace SDDM {
+         d->mainScript = settings.value(QStringLiteral("SddmGreeterTheme/MainScript"), QStringLiteral("Main.qml")).toString();
+         d->configFile = settings.value(QStringLiteral("SddmGreeterTheme/ConfigFile"), QStringLiteral("theme.conf")).toString();
+         d->translationsDirectory = settings.value(QStringLiteral("SddmGreeterTheme/TranslationsDirectory"), QStringLiteral(".")).toString();
+-        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 5).toInt();
+        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 6).toInt();
+     }
+ }
+diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
+index 07fccde..5a956b6 100644
+--- a/src/daemon/Greeter.cpp
+++ b/src/daemon/Greeter.cpp
+@@ -82,8 +82,7 @@ namespace SDDM {
+ 
+     QString Greeter::greeterPathForQt(int qtVersion)
+     {
+-        const QString suffix = qtVersion == 5 ? QString() : QStringLiteral("-qt%1").arg(qtVersion);
+-        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter%1").arg(suffix);
+        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter-qt%1").arg(qtVersion);
+     }
+ 
+     bool Greeter::start() {
+diff --git a/src/greeter/CMakeLists.txt b/src/greeter/CMakeLists.txt
+index 72769e4..524368d 100644
+--- a/src/greeter/CMakeLists.txt
+++ b/src/greeter/CMakeLists.txt
+@@ -1,11 +1,4 @@
+-if(QT_MAJOR_VERSION EQUAL "5")
+-    # Keep the unversioned name for Qt5. When upgrading SDDM, the old daemon
+-    # might still be running and only know about "sddm-greeter". Keeping the
+-    # previous name around also helps users calling it directly.
+-    set(GREETER_TARGET sddm-greeter)
+-else()
+-    set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
+-endif()
+set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
+ 
+ message(STATUS "Building greeter for Qt ${QT_MAJOR_VERSION} as ${GREETER_TARGET}")
+ 
+-- 
+2.43.0
+
@@ -0,0 +1,20 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+
+account    required    pam_nologin.so
+account    include     system-auth
+
+password   include     system-auth
+
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+-session    optional    pam_gnome_keyring.so auto_start
+-session    optional    pam_kwallet5.so auto_start
+-session    optional    pam_kwallet.so auto_start
+session    include     postlogin
@@ -0,0 +1,17 @@
+#%PAM-1.0
+
+# Load environment from /etc/environment and ~/.pam_environment
+auth		required pam_env.so
+
+# Always let the greeter start without authentication
+auth		required pam_permit.so
+
+# No action required for account management
+account		required pam_permit.so
+
+# Can't change password
+password	required pam_deny.so
+
+# Setup session
+session		required pam_unix.so
+session		optional pam_systemd.so
@@ -0,0 +1,12 @@
+diff --git a/services/sddm-tmpfiles.conf.in b/services/sddm-tmpfiles.conf.in
+index fb45553..6acfb6c 100644
+--- a/services/sddm-tmpfiles.conf.in
+++ b/services/sddm-tmpfiles.conf.in
+@@ -1,5 +1,7 @@
+ # Home dir of the sddm user, also contains state.conf
+ d	${STATE_DIR}	0750	sddm	sddm
+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
+Z	${STATE_DIR}	-	sddm	sddm
+ # This contains X11 auth files passed to Xorg and the greeter
+ d	${RUNTIME_DIR}	0711	root	root
+ # Sockets for IPC
@@ -0,0 +1,2 @@
+#Type Name ID GECOS                  Home directory Shell
+u     sddm -  "SDDM Greeter Account" /var/lib/sddm   -
@@ -0,0 +1,2 @@
+[General]
+DisplayServer=x11
@@ -0,0 +1,122 @@
+[Autologin]
+# Whether sddm should automatically log back into sessions when they exit
+#Relogin=false
+
+# Name of session file for autologin session
+#Session=
+
+# Username for autologin session
+#User=
+
+
+[General]
+# Enable Qt's automatic high-DPI scaling
+#EnableHiDPI=false
+
+# Halt command
+#HaltCommand=/usr/bin/systemctl poweroff
+
+# Initial NumLock state. Can be on, off or none.
+# If property is set to none, numlock won't be changed
+# NOTE: Currently ignored if autologin is enabled.
+#Numlock=none
+
+# Reboot command
+#RebootCommand=/usr/bin/systemctl reboot
+
+# Control x11/wayland startup
+# DisplayServer=wayland
+
+[Theme]
+# Current theme name
+#Current=01-breeze-fedora
+
+# Cursor theme used in the greeter
+#CursorTheme=
+
+# Number of users to use as threshold
+# above which avatars are disabled
+# unless explicitly enabled with EnableAvatars
+#DisableAvatarsThreshold=7
+
+# Enable display of custom user avatars
+#EnableAvatars=true
+
+# Global directory for user avatars
+# The files should be named <username>.face.icon
+#FacesDir=/usr/share/sddm/faces
+
+# Theme directory path
+#ThemeDir=/usr/share/sddm/themes
+
+
+[Users]
+# Default $PATH for logged in users
+#DefaultPath=/usr/local/bin:/usr/bin:/bin
+
+# Comma-separated list of shells.
+# Users with these shells as their default won't be listed
+#HideShells=
+
+# Comma-separated list of users that should not be listed
+#HideUsers=
+
+# Maximum user id for displayed users
+#MaximumUid=60000
+
+# Minimum user id for displayed users
+#MinimumUid=1000
+
+# Remember the session of the last successfully logged in user
+#RememberLastSession=true
+
+# Remember the last successfully logged in user
+#RememberLastUser=true
+
+
+[Wayland]
+# Path to a script to execute when starting the desktop session
+#SessionCommand=/etc/sddm/wayland-session
+
+# Directory containing available Wayland sessions
+#SessionDir=/usr/share/wayland-sessions
+
+# Path to the user session log file
+#SessionLogFile=.cache/wayland-errors
+
+
+[X11]
+# Path to a script to execute when starting the display server
+#DisplayCommand=/etc/sddm/Xsetup
+
+# Path to a script to execute when stopping the display server
+#DisplayStopCommand=/etc/sddm/Xstop
+
+# The lowest virtual terminal number that will be used.
+#MinimumVT=1
+
+# Arguments passed to the X server invocation
+#ServerArguments=-nolisten tcp
+
+# Path to X server binary
+#ServerPath=/usr/bin/X
+
+# Path to a script to execute when starting the desktop session
+#SessionCommand=/etc/X11/xinit/Xsession
+
+# Directory containing available X sessions
+#SessionDir=/usr/share/xsessions
+
+# Path to the user session log file
+#SessionLogFile=.cache/xsession-errors
+
+# Path to the Xauthority file
+#UserAuthFile=.Xauthority
+
+# Path to xauth binary
+#XauthPath=/usr/bin/xauth
+
+# Path to Xephyr binary
+#XephyrPath=/usr/bin/Xephyr
+
+
@@ -0,0 +1,23 @@
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth        substack      password-auth
+-auth        optional      pam_gnome_keyring.so
+-auth        optional      pam_kwallet5.so
+-auth        optional      pam_kwallet.so
+auth        include       postlogin
+
+account     required      pam_nologin.so
+account     include       password-auth
+
+password    include       password-auth
+
+session     required      pam_selinux.so close
+session     required      pam_loginuid.so
+-session    optional    pam_ck_connector.so
+session     required      pam_selinux.so open
+session     optional      pam_keyinit.so force revoke
+session     required      pam_namespace.so
+session     include       password-auth
+-session     optional      pam_gnome_keyring.so auto_start
+-session     optional      pam_kwallet5.so auto_start
+-session     optional      pam_kwallet.so auto_start
+session     include       postlogin
@@ -0,0 +1,5 @@
+# workaround https://bugzilla.redhat.com/1686675
+# see also https://bugreports.qt.io/browse/QTBUG-58508
+QML_DISABLE_DISK_CACHE=1
+# enable qDebug messages for debug build
+# QT_LOGGING_RULES="*.debug=true"
@@ -0,0 +1,293 @@
+# Disable X11 for RHEL 10+
+%bcond x11 %[%{undefined rhel} || 0%{?rhel} < 10]
+
+Name:           terra-sddm
+Version:        0.21.0
+Release:        5%{?dist}
+License:        GPL-2.0-or-later
+Summary:        QML based desktop and login manager
+Provides:       sddm = %version-%release
+
+URL:            https://github.com/sddm/sddm
+Source0:        %{url}/archive/v%{version}/sddm-%{version}.tar.gz
+
+## upstream patches
+# Port all themes to Qt 6
+# Submitted: https://github.com/sddm/sddm/pull/1876
+Patch1:         sddm-PR1876.patch
+
+## upstreamable patches
+# Fix race with logind restart, and start seat0 if !CanGraphical on timer
+# https://bugzilla.redhat.com/show_bug.cgi?id=2011991
+# https://bugzilla.redhat.com/show_bug.cgi?id=2016310
+# Submmited: https://github.com/sddm/sddm/pull/1494
+Patch11:        0001-Delay-for-logind-and-fallback-to-seat0.patch
+
+## downstream patches
+Patch101:       sddm-0.20.0-fedora_config.patch
+
+# sddm.service: +EnvironmentFile=-/etc/sysconfig/sddm
+Patch103:       sddm-0.18.0-environment_file.patch
+
+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
+Patch104:       sddm-rpmostree-tmpfiles-hack.patch
+
+# Workaround lack of Qt 5 greeter build
+Patch105:       sddm-0.21.0-qt6greeter.patch
+
+# https://github.com/sddm/sddm/pull/1779
+Patch106:       https://github.com/sddm/sddm/pull/1779.patch
+
+# Shamelessly stolen from gdm
+Source10:       sddm.pam
+# Shamelessly stolen from gdm
+Source11:       sddm-autologin.pam
+# Previously included in sddm sources
+Source12:       sddm-greeter.pam
+# sample sddm.conf generated with sddm --example-config, and entries commented-out
+Source13:       sddm.conf
+# README.scripts
+Source14:       README.scripts
+# sysconfig snippet
+Source15:       sddm.sysconfig
+# sddm x11 override config
+Source16:       sddm-x11.conf
+# sysusers config file. note these are shipped in the upstream tarball
+# but we cannot use the files from the tarball for %pre scriptlet
+# generation, so we duplicate them as source files for that purpose;
+# this is an ugly hack that should be removed if it becomes possible.
+# see https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/TFDMAU7KLMSQTKPJELHSM6PFVXIZ56GK/
+Source17:       sddm-systemd-sysusers.conf
+
+
+Provides: service(graphical-login) = sddm
+
+BuildRequires:  cmake >= 2.8.8
+BuildRequires:  extra-cmake-modules
+BuildRequires:  pam-devel
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(systemd)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-xkb)
+# sometimes python-docutils, sometimes python2-docutils, sometimes python3-docutils.
+# use path then for sanity
+BuildRequires:  /usr/bin/rst2man
+BuildRequires:  cmake(Qt6Core)
+BuildRequires:  cmake(Qt6DBus)
+BuildRequires:  cmake(Qt6Gui)
+BuildRequires:  cmake(Qt6Qml)
+BuildRequires:  cmake(Qt6Quick)
+BuildRequires:  cmake(Qt6LinguistTools)
+BuildRequires:  cmake(Qt6Test)
+BuildRequires:  cmake(Qt6QuickTest)
+# verify presence to pull defaults from /etc/login.defs
+BuildRequires:  shadow-utils
+BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
+
+Obsoletes: kde-settings-sddm < 20-5
+
+%if 0%{?fedora}
+# for /usr/share/backgrounds/default.png
+BuildRequires: desktop-backgrounds-compat
+BuildRequires: GraphicsMagick
+Requires: desktop-backgrounds-compat
+# for /usr/share/pixmaps/system-logo-white.png
+Requires: system-logos
+%endif
+Requires: systemd
+%if %{with x11}
+Requires: xorg-x11-xinit
+%endif
+%{?systemd_requires}
+
+Requires(pre): shadow-utils
+
+# Virtual dependency for sddm greeter setup
+Requires: sddm-greeter-displayserver
+Suggests: sddm-wayland-generic
+
+%description
+SDDM is a modern graphical display manager aiming to be fast, simple and
+beautiful. It uses modern technologies like QtQuick, which in turn gives the
+designer the ability to create smooth, animated user interfaces.
+
+%package wayland-generic
+Summary: Generic Wayland SDDM greeter configuration
+Provides: sddm-greeter-displayserver
+Conflicts: sddm-greeter-displayserver
+Requires: weston
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description wayland-generic
+This package contains configuration and dependencies for SDDM
+to use Weston for the greeter display server.
+
+This is the generic default Wayland configuration provided
+by SDDM.
+
+%if %{with x11}
+%package x11
+Summary: X11 SDDM greeter configuration
+Provides: sddm-greeter-displayserver
+Conflicts: sddm-greeter-displayserver
+# This will eventually go away...
+Provides: deprecated()
+Requires: xorg-x11-server-Xorg
+Requires: %{name} = %{version}-%{release}
+Recommends: qt6-qtvirtualkeyboard
+BuildArch: noarch
+
+%description x11
+This package contains configuration and dependencies for SDDM
+to use X11 for the greeter display server.
+%endif
+
+%package themes
+Summary: SDDM Themes
+# for upgrade path
+Obsoletes: sddm < 0.2.0-0.12
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+%description themes
+A collection of sddm themes, including: elarun, maldives, maya
+
+
+%prep
+%autosetup -p1 %{?commitdate:-n sddm-%{commit}} -n sddm-%version
+
+%if 0%{?fedora}
+#FIXME/TODO: use version on filesystem instead of using a bundled copy
+cp -v /usr/share/backgrounds/default.png  \
+      src/greeter/theme/background.png
+ls -sh src/greeter/theme/background.png
+gm mogrify -resize 1920x1200 src/greeter/theme/background.png
+ls -sh src/greeter/theme/background.png
+%endif
+
+
+%build
+%cmake \
+  -DBUILD_WITH_QT6:BOOL=ON \
+  -DBUILD_MAN_PAGES:BOOL=ON \
+  -DCMAKE_BUILD_TYPE:STRING="Release" \
+  -DENABLE_JOURNALD:BOOL=ON \
+  -DSESSION_COMMAND:PATH=/etc/X11/xinit/Xsession \
+  -DWAYLAND_SESSION_COMMAND:PATH=/etc/sddm/wayland-session
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+mkdir -p %{buildroot}%{_sysconfdir}/sddm.conf.d
+mkdir -p %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d
+install -Dpm 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/sddm
+install -Dpm 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/sddm-autologin
+install -Dpm 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pam.d/sddm-greeter
+install -Dpm 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/sddm.conf
+install -Dpm 644 %{SOURCE14} %{buildroot}%{_datadir}/sddm/scripts/README.scripts
+install -Dpm 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/sddm
+%if %{with x11}
+install -Dpm 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
+%endif
+mkdir -p %{buildroot}/run/sddm
+mkdir -p %{buildroot}%{_localstatedir}/lib/sddm
+mkdir -p %{buildroot}%{_sysconfdir}/sddm/
+cp -a %{buildroot}%{_datadir}/sddm/scripts/* \
+      %{buildroot}%{_sysconfdir}/sddm/
+# we're using /etc/X11/xinit/Xsession (by default) instead
+rm -fv %{buildroot}%{_sysconfdir}/sddm/Xsession
+
+# De-conflict the dbus file
+mv %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf \
+   %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
+
+%if 0%{?fedora} && 0%{?fedora} < 43
+# Provide unversioned greeter until F40 is EOL
+ln -sr %{buildroot}%{_bindir}/sddm-greeter-qt6 %{buildroot}%{_bindir}/sddm-greeter
+%endif
+
+
+%pre
+%sysusers_create_compat %{SOURCE17}
+
+%post
+%systemd_post sddm.service
+# handle incompatible configuration changes
+(grep \
+   -e '^Current=fedora$' \
+   -e '^\[XDisplay\]$' \
+   -e '^\[WaylandDisplay\]$' \
+   %{_sysconfdir}/sddm.conf > /dev/null && \
+ sed -i.rpmsave \
+   -e 's|^Current=fedora$|#Current=01-breeze-fedora|' \
+   -e 's|^\[XDisplay\]$|\[X11\]|' \
+   -e 's|^\[WaylandDisplay\]$|\[Wayland\]|' \
+   %{_sysconfdir}/sddm.conf
+) ||:
+
+
+%preun
+%systemd_preun sddm.service
+
+
+%postun
+%systemd_postun sddm.service
+
+
+%files
+%license LICENSE
+%doc README.md CONTRIBUTORS
+%dir %{_sysconfdir}/sddm/
+%dir %{_sysconfdir}/sddm.conf.d
+%dir %{_prefix}/lib/sddm/sddm.conf.d
+%config(noreplace)   %{_sysconfdir}/sddm/*
+%config(noreplace)   %{_sysconfdir}/sddm.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/sddm
+%config(noreplace) %{_sysconfdir}/pam.d/sddm*
+%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
+%{_bindir}/sddm
+%{_bindir}/sddm-greeter*
+%{_libexecdir}/sddm-helper
+%{_libexecdir}/sddm-helper-start-wayland
+%{_libexecdir}/sddm-helper-start-x11user
+%{_tmpfilesdir}/sddm.conf
+%{_sysusersdir}/sddm.conf
+%attr(0711, root, sddm) %dir /run/sddm
+%attr(1770, sddm, sddm) %dir %{_localstatedir}/lib/sddm
+%{_unitdir}/sddm.service
+%{_qt6_archdatadir}/qml/SddmComponents/
+%dir %{_datadir}/sddm
+%{_datadir}/sddm/faces/
+%{_datadir}/sddm/flags/
+%{_datadir}/sddm/scripts/
+%dir %{_datadir}/sddm/themes/
+# %%lang'ify? they're small, probably not worth it -- rex
+%{_datadir}/sddm/translations*/
+%{_mandir}/man1/sddm.1*
+%{_mandir}/man1/sddm-greeter.1*
+%{_mandir}/man5/sddm.conf.5*
+%{_mandir}/man5/sddm-state.conf.5*
+
+
+%files wayland-generic
+# No files since default configuration
+
+
+%if %{with x11}
+%files x11
+%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
+%endif
+
+
+%files themes
+%{_datadir}/sddm/themes/elarun/
+%{_datadir}/sddm/themes/maldives/
+%{_datadir}/sddm/themes/maya/
+
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(gh("sddm/sddm"));
@@ -1,8 +1,8 @@
-%global swayVersion 1.10.1
+%global swayVersion 1.9

 Name:           swayfx
-Version:        0.5
-Release:        2%?dist
+Version:        0.4
+Release:        2%{?dist}

 Summary:        SwayFX: Sway, but with eye candy!
 URL:            https://github.com/WillPower3309/swayfx
@@ -21,7 +21,7 @@ BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(json-c) >= 0.13
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libevdev)
-BuildRequires:  pkgconfig(libinput) >= 1.26.0
+BuildRequires:  pkgconfig(libinput) >= 1.21.0
 BuildRequires:  pkgconfig(libpcre2-8)
 BuildRequires:  pkgconfig(libsystemd) >= 239
 BuildRequires:  pkgconfig(libudev)
@@ -33,8 +33,8 @@ BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-server) >= 1.21.0
 BuildRequires:  pkgconfig(wayland-protocols) >= 1.24
-BuildRequires:  pkgconfig(scenefx-0.2)
-BuildRequires:  pkgconfig(wlroots-0.18)
+BuildRequires:  (pkgconfig(wlroots) >= 0.17.0 with pkgconfig(wlroots) < 0.18)
+BuildRequires:  (pkgconfig(scenefx) >= 0.1 with pkgconfig(scenefx) < 0.2)
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xcb-icccm)
 BuildRequires:  pkgconfig(xkbcommon) >= 1.5.0
@@ -46,7 +46,7 @@ Conflicts:      sway
 Provides:       sway = %{swayVersion}


-Packager:       Atmois <info@atmois.com>
+Packager:       Atmois <atmois@atmois.com>
 
 %description
 %{summary}
@@ -61,6 +61,15 @@ Provides:       sway-config = %{version}-%{release}
 Conflicts:      sway-config


+%package        wallpapers
+Summary:        Wallpapers for Sway
+BuildArch:      noarch
+License:        CC0
+
+%description    wallpapers
+Wallpaper collection provided with Sway
+
+
 # Require the wallpaper referenced in the config.
 # Weak dependency here causes a swaynag warning during the configuration load
 Requires:       sway-wallpapers
@@ -97,20 +106,10 @@ Recommends:     (qt6-qtwayland if qt6-qtbase-gui)
 Upstream configuration for Sway.
 Includes all important dependencies for a typical desktop system with minimal or no divergence from the upstream.

-%package        wallpapers
-Summary:        Wallpapers for Sway
-BuildArch:      noarch
-License:        CC0
-
-%description    wallpapers
-Wallpaper collection provided with Sway
-

 %prep
 %autosetup -N -n %{name}-%{version}

-%autopatch -p1 -M99
-
 %build
 %meson \
    -Dsd-bus-provider=libsystemd \
@@ -1,13 +1,13 @@
 # Generated by rust2rpm 27
-%global commit 5b4cc3e7a8055afb758421f4a114ef4032806e39
+%global commit 593a4f4666f0bc42790d6d033e64a2b38449090f
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250216
-%global ver v0.6.0
+%global commit_date 20250115
+%global ver 0.6.0
 %bcond check 0

 Name:           eww
 Version:        %ver^%commit_date.git~%shortcommit
-Release:        1%?dist
+Release:        %autorelease
 Summary:        Widgets for everyone!

 SourceLicense:  MIT
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "rust-matugen.spec"
-  }
-}
@@ -1,69 +0,0 @@
-# Generated by rust2rpm 27
-%global crate matugen
-
-Name:           rust-matugen
-Version:        2.4.1
-Release:        1%{?dist}
-Summary:        Material you color generation tool with templates
-
-License:        GPL-2.0
-URL:            https://crates.io/crates/matugen
-Source:         %{crates_source}
-
-BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  anda-srpm-macros
-BuildRequires:  mold
-
-Packager:       sadlerm <sad_lerm@hotmail.com>
-
-%global _description %{expand:
-A material you color generation tool with templates.}
-
-%description %{_description}
-
-
-%package     -n %{crate}
-Summary:        %{summary}
-License:        GPL-2.0
-# LICENSE.dependencies contains a full license breakdown
-
-%description -n %{crate} %{_description}
-
-%files       -n %{crate}
-%license LICENSE
-%license LICENSE.dependencies
-%doc CHANGELOG.md
-%doc README.md
-%{_bindir}/matugen
-
-
-%package        devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description    devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files          devel
-%license %{crate_instdir}/LICENSE
-%doc %{crate_instdir}/CHANGELOG.md
-%doc %{crate_instdir}/README.md
-%{crate_instdir}/
-
-
-%prep
-%autosetup -n %{crate}-%{version} -p1
-%cargo_prep_online
-
-%build
-%{cargo_license_summary_online}
-%{cargo_license} > LICENSE.dependencies
-
-%install
-%cargo_install
-
-%changelog
-* Wed Jan 22 2025 sadlerm <sad_lerm@hotmail.com> - 2.4.1-1
- Initial package
@@ -1 +0,0 @@
-rpm.version(crates("matugen"));
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "swaylock-effects.spec"
-  }
-}
@@ -1,94 +0,0 @@
-%global commit 496059a8565c2d5eed672c2e5bc5e1edd14b3de8
-%global shortcommit %{sub %{commit} 1 7}
-
-Name:           swaylock-effects
-Version:        1.7.0.0^1.%{shortcommit}
-Release:        1%{?dist}
-Summary:        Swaylock, with fancy effects
-
-License:        MIT
-URL:            https://github.com/jirutka/swaylock-effects
-Source0:        %{url}/archive/%{commit}.tar.gz
-
-Packager:       sadlerm <lerm@chromebooks.lol>
-
-BuildRequires:  meson gcc
-BuildRequires:  pam-devel
-BuildRequires:  pkgconfig(cairo)
-BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  scdoc
-
-Recommends:     %{name}-bash-completion
-
-Conflicts:      swaylock
-
-%define binary_name swaylock
-
-%description
-swaylock-effects is a fork of swaylock which adds built-in screenshots and image manipulation effects like blurring.
-
-
-%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 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}.
-
-%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}.
-
-
-%prep
-%autosetup -n %{name}-%{commit}
-
-
-%build
-%meson
-%meson_build
-
-
-%install
-%meson_install
-
-
-%files
-%license LICENSE
-%doc README.md
-%{_bindir}/%{binary_name}
-%{_mandir}/man1/%{binary_name}.1.gz
-%config(noreplace) %{_sysconfdir}/pam.d/%{binary_name}
-
-%files bash-completion
-%{bash_completions_dir}/%{binary_name}
-
-%files zsh-completion
-%{zsh_completions_dir}/_%{binary_name}
-
-%files fish-completion
-%{fish_completions_dir}/%{binary_name}.fish
-
-
-%changelog
-* Tue Feb 04 2025 sadlerm <lerm@chromebooks.lol>
- Initial package
@@ -2,17 +2,15 @@
 %bcond check 0
 %bcond bootstrap 0

+%global debug_package %{nil}
+
 %if %{with bootstrap}
 %global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$
 %endif

-%if 0%{?fedora} <= 40
-%global debug_package %{nil}
-%endif
-
 # https://github.com/abenz1267/walker
 %global goipath         github.com/abenz1267/walker
-Version:                0.12.16
+Version:                0.12.3

 %gometa -f

@@ -45,19 +43,18 @@ BuildRequires:  pkgconfig(vips)

 %prep
 %goprep -A
+%autopatch -p1
 %go_prep_online
-mv {LICENSE,README.md} cmd
-%setup -T -D -n %{name}-%{version}/cmd


 %build
-go build -x -o walker
+%go_build_online cmd/walker.go

 %install
 #gopkginstall
 %if %{without bootstrap}
-install -m 0755 -vd        %{buildroot}%{_bindir}
-install -m 0755 -vp walker %{buildroot}%{_bindir}/walker
+install -m 0755 -vd                         %{buildroot}%{_bindir}
+install -m 0755 -vp build/bin/cmd/walker.go %{buildroot}%{_bindir}/walker
 %endif

 %if %{without bootstrap}
@@ -7,7 +7,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           asar
-Version:        3.3.1
+Version:        3.2.18
 Release:        1%?dist
 Summary:        Simple extensive tar-like archive format with indexing
 License:        MIT
@@ -1,6 +1,6 @@
 project pkg {
 	arches = ["x86_64"]
 	rpm {
-		spec = "pokemon-colorscripts.spec"
+		spec = "terra-blueprint-compiler.spec"
 	}
 }
@@ -0,0 +1,44 @@
+Name:			terra-blueprint-compiler
+Version:		0.16.0
+Release:		1%?dist
+License:		LGPL-3.0-or-later
+Summary:		Markup language for GTK user interfaces
+URL:			https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/
+Source0:		https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/v%version/blueprint-compiler-v%version.tar.gz
+BuildArch:		noarch
+BuildRequires:	meson gtk4-devel python3-devel python3-gobject-devel
+Requires:		python3-gobject-devel
+
+%description
+GtkBuilder XML format is quite verbose, and many app developers don't like
+using WYSIWYG editors for creating UIs. Blueprint files are intended to be a
+concise, easy-to-read format that makes it easier to create and edit GTK UIs.
+Internally, it compiles to GtkBuilder XML as part of an app's build system. It
+adds no new features, just makes the features that exist more accessible.
+Another goal is to have excellent developer tooling--including a language
+server--so that less knowledge of the format is required. Hopefully this will
+increase adoption of cool advanced features like GtkExpression.
+
+%prep
+%autosetup -n blueprint-compiler-v%version
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+#check
+#meson_test
+
+%files
+%doc README.md docs/*.rst
+%license COPYING
+%_bindir/blueprint-compiler
+%python3_sitelib/blueprintcompiler
+%_datadir/pkgconfig/blueprint-compiler.pc
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - 0.8.0-1
+- Initial package
@@ -0,0 +1,2 @@
+let txt = get("https://gitlab.gnome.org/api/v4/projects/17669/releases/");
+rpm.version(txt.json_arr()[0].tag_name);
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`rpm.version(gitlab("gitlab.freedesktop.org", "4339"));`