Revert #3013

2026-05-31 09:01:55 +00:00 · 2025-01-18 23:55:24 +07:00
150 changed files with 6423 additions and 452 deletions
@@ -3,7 +3,4 @@ project pkg {
 	rpm {
 		spec = "anki-bin.spec"
 	}
-        labels {
-        subrepo = "extras"
-       }
 }
@@ -4,29 +4,26 @@

 Name:			anki-bin
 Version:		24.11
-Release:		2%?dist
+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

@@ -3,7 +3,4 @@ project pkg {
 	rpm {
 		spec = "anki.spec"
 	}
-        labels {
-                subrepo = "extras"
-        }
 }
@@ -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,8 +1,5 @@
 project pkg {
-  rpm {
-    spec = "blackbox-terminal.spec"
-  }
-  labels {
-    subrepo = "extras"
-  }
+	rpm {
+		spec = "blackbox-terminal.spec"
+	}
 }
@@ -1,17 +1,10 @@
-%global commit d5fff0dd5bfb8bda19b050f66610d19370c5fd39
-%global commit_date 20241019
-%global shortcommit %{sub %{commit} 1 7}
-
 Name:           blackbox-terminal
-Version:        0.14.0^%{commit_date}.%{shortcommit}
+Version:        0.14.0
 Release:        1%{?dist}
 Summary:        A beautiful GTK 4 terminal
-
 License:        GPL-3.0
 URL:            https://gitlab.gnome.org/raggesilver/blackbox
-Source0:        %{url}/-/archive/%{commit}/blackbox-%{commit}.tar.gz
-
-BuildRequires:  vala meson gettext
+BuildRequires:  vala meson gettext 
 BuildRequires:  pkgconfig(gtk4) >= 4.6.2
 BuildRequires:  pkgconfig(gio-2.0) >= 2.50
 BuildRequires:  libadwaita-devel >= 1.1
@@ -24,12 +17,13 @@ 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
-An elegant and customizable terminal for GNOME.
+%{summary}.

 %prep
-%autosetup -n blackbox-%{commit}
+%autosetup -p1 -n blackbox-v%version

 %build
 %meson
@@ -39,7 +33,7 @@ An elegant and customizable terminal for GNOME.
 %meson_install

 %check
-appstream-util validate-relax --nonet %buildroot%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
+appstream-util validate-relax --nonet %buildroot/%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml

 %files
 %doc README.md
@@ -58,6 +52,7 @@ appstream-util validate-relax --nonet %buildroot%_datadir/metainfo/com.raggesilv
 %_datadir/locale/*/LC_MESSAGES/blackbox.mo


+
 %changelog
 * Sun Oct 23 2022 windowsboy111 <windowsboy111@fyralabs.com>
 - Initial package
@@ -1,5 +1,4 @@
-rpm.global("commit", gitlab_commit("gitlab.gnome.org", "20397", "main"));
-if rpm.changed {
-    rpm.global("commit_date", date());
-    rpm.release();
-}
+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.574
+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.574
+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.81
+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.127
+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.127
+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.81
+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 2bec37ee24d404a7b3f27aae499be13d5873b56f
-%global commit_date 20250122
+%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.
@@ -5,7 +5,7 @@
 %global pure_protobuf_version 2.0.0

 Name:           komikku
-Version:        1.68.0
+Version:        1.67.0
 %forgemeta
 Release:        1%?dist
 Summary:        A manga reader for GNOME
@@ -14,7 +14,7 @@
 %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so

 Name:			legcord-bin
-Version:		1.0.8
+Version:		1.0.6
 Release:		1%?dist
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
@@ -14,7 +14,7 @@
 %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so

 Name:			legcord-bin
-Version:		1.0.8
+Version:		1.0.6
 Release:		1%?dist
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
@@ -1,5 +1,5 @@
-%global commit b8b5bcb6f48531ef55800b63b7b567db831be105
-%global commit_date 20250124
+%global commit 85c7990b511fb7099d5d460aa07051be6638f767
+%global commit_date 20250115
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %define debug_package %nil

@@ -5,7 +5,7 @@
 %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so

 Name:		legcord
-Version:	1.0.8
+Version:	1.0.6
 Release:	1%?dist
 License:	OSL-3.0
 Summary:	Custom lightweight Discord client designed to enhance your experience
@@ -1,6 +1,6 @@
-%global commit df3872e318ff7dd1ad9a4f6ca0822014e2c3f439
+%global commit ca211b5b8830a74fecae115ba18b62878348342c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250123
+%global commit_date 20250111
 %global ver 0.39.0

 Name:           mpv-nightly
@@ -1,4 +1,4 @@
-%global ver 2025-01-24
+%global ver 2025-01-17
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit 6acb37bc5af067686c87924c7bd6955839599f6a
+%global commit a53f381352dae5319cb159692aa8a83574963a5c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -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 9f9a92375a49f01fdef9e06fe825ce8cf815ef6e
+%global commit c486a2da7bbf8edc3d1514506a7524de45ecdf67
 %forgemeta

 Name:       lomiri-system-settings
@@ -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,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"));
@@ -2,13 +2,15 @@
 %bcond check 0
 %bcond bootstrap 0

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

 # https://github.com/abenz1267/walker
 %global goipath         github.com/abenz1267/walker
-Version:                0.12.10
+Version:                0.12.3

 %gometa -f

@@ -41,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}
@@ -1,6 +1,6 @@
-%global commit 1d947ab49967943b04a1c4ae37c048d657b52ca9
+%global commit 0eec33c35ea85a33de8a5fa9be363278db79ea3f
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250124
+%global commit_date 20250118

 Name:           flow-control-nightly
 Version:        %commit_date.%shortcommit
@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.27.3
+Version:		3.27.2
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause
@@ -1,6 +1,6 @@
-%global commit 95327bff18188b713ae22e47bf6272f2ec61ef9b
+%global commit 72d085525b22d66468c5969a4d507a0fa68d4a04
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250124
+%global commit_date 20250118
 %global public_key RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV
 %global cache_dir %{builddir}/zig-cache

@@ -1,7 +1,7 @@
-%global commit c55cdd0cb9d16468d175f9f41f8bdf22aa6a4b9f
+%global commit bf0578e32a44a43d7626dafd5c31851dc571ddba
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250124
-%global ver 0.172.0
+%global commit_date 20250118
+%global ver 0.171.0

 %bcond_with check

@@ -1,6 +1,6 @@
 %bcond_with check

-%global ver 0.171.1-pre
+%global ver 0.170.0-pre
 # Exclude input files from mangling
 %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
 # Use Mold as the linker
@@ -9,7 +9,7 @@
 %global app_id dev.zed.Zed

 Name:           zed
-Version:        0.170.2
+Version:        0.169.2
 Release:        1%?dist
 Summary:        Zed is a high-performance, multiplayer code editor

@@ -0,0 +1,2 @@
+containerd-*.tar.gz
+clog
@@ -0,0 +1,33 @@
+From 788f2f928c1d0099d3861553bf82e83169811a29 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Tue, 1 Nov 2022 22:09:38 +0100
+Subject: [PATCH] Add reaper StartLocked
+
+---
+ sys/reaper/reaper_unix.go | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/sys/reaper/reaper_unix.go b/sys/reaper/reaper_unix.go
+index 6c4f13b90..a6d6a1e77 100644
+--- a/sys/reaper/reaper_unix.go
+++ b/sys/reaper/reaper_unix.go
+@@ -101,6 +101,16 @@ func (m *Monitor) Start(c *exec.Cmd) (chan runc.Exit, error) {
+ 	return ec, nil
+ }
+ 
+// StartLocked starts the command a registers the process with the reaper
+func (m *Monitor) StartLocked(c *exec.Cmd) (chan runc.Exit, error) {
+	ec := m.Subscribe()
+	if err := c.Start(); err != nil {
+		m.Unsubscribe(ec)
+		return nil, err
+	}
+	return ec, nil
+}
+
+ // Wait blocks until a process is signal as dead.
+ // User should rely on the value of the exit status to determine if the
+ // command was successful or not.
+-- 
+2.38.1
+
@@ -0,0 +1,157 @@
+From beb23ffb0624b40b2ee1bc56730e54943bd3020f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Thu, 1 Oct 2020 07:19:45 +0200
+Subject: [PATCH] Revert commit for Windows metrics
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+---
+ cmd/ctr/commands/tasks/metrics.go | 113 ------------------------------
+ 1 file changed, 113 deletions(-)
+
+diff --git a/cmd/ctr/commands/tasks/metrics.go b/cmd/ctr/commands/tasks/metrics.go
+index a83e45ef..f8371401 100644
+--- a/cmd/ctr/commands/tasks/metrics.go
+++ b/cmd/ctr/commands/tasks/metrics.go
+@@ -23,9 +23,6 @@ import (
+ 	"os"
+ 	"text/tabwriter"
+ 
+-	wstats "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats"
+-	v1 "github.com/containerd/cgroups/stats/v1"
+-	v2 "github.com/containerd/cgroups/v2/stats"
+ 	"github.com/containerd/containerd/cmd/ctr/commands"
+ 	"github.com/containerd/typeurl"
+ 	"github.com/urfave/cli"
+@@ -77,42 +74,12 @@ var metricsCommand = cli.Command{
+ 		if err != nil {
+ 			return err
+ 		}
+-		var (
+-			data         *v1.Metrics
+-			data2        *v2.Metrics
+-			windowsStats *wstats.Statistics
+-		)
+-		switch v := anydata.(type) {
+-		case *v1.Metrics:
+-			data = v
+-		case *v2.Metrics:
+-			data2 = v
+-		case *wstats.Statistics:
+-			windowsStats = v
+-		default:
+-			return errors.New("cannot convert metric data to cgroups.Metrics or windows.Statistics")
+-		}
+ 
+ 		switch context.String(formatFlag) {
+ 		case formatTable:
+ 			w := tabwriter.NewWriter(os.Stdout, 1, 8, 4, ' ', 0)
+ 			fmt.Fprintf(w, "ID\tTIMESTAMP\t\n")
+ 			fmt.Fprintf(w, "%s\t%s\t\n\n", metric.ID, metric.Timestamp)
+-			if data != nil {
+-				printCgroupMetricsTable(w, data)
+-			} else if data2 != nil {
+-				printCgroup2MetricsTable(w, data2)
+-			} else {
+-				if windowsStats.GetLinux() != nil {
+-					printCgroupMetricsTable(w, windowsStats.GetLinux())
+-				} else if windowsStats.GetWindows() != nil {
+-					printWindowsContainerStatistics(w, windowsStats.GetWindows())
+-				}
+-				// Print VM stats if its isolated
+-				if windowsStats.VM != nil {
+-					printWindowsVMStatistics(w, windowsStats.VM)
+-				}
+-			}
+ 			return w.Flush()
+ 		case formatJSON:
+ 			marshaledJSON, err := json.MarshalIndent(anydata, "", "  ")
+@@ -126,83 +93,3 @@ var metricsCommand = cli.Command{
+ 		}
+ 	},
+ }
+-
+-func printCgroupMetricsTable(w *tabwriter.Writer, data *v1.Metrics) {
+-	fmt.Fprintf(w, "METRIC\tVALUE\t\n")
+-	if data.Memory != nil {
+-		fmt.Fprintf(w, "memory.usage_in_bytes\t%d\t\n", data.Memory.Usage.Usage)
+-		fmt.Fprintf(w, "memory.limit_in_bytes\t%d\t\n", data.Memory.Usage.Limit)
+-		fmt.Fprintf(w, "memory.stat.cache\t%d\t\n", data.Memory.TotalCache)
+-	}
+-	if data.CPU != nil {
+-		fmt.Fprintf(w, "cpuacct.usage\t%d\t\n", data.CPU.Usage.Total)
+-		fmt.Fprintf(w, "cpuacct.usage_percpu\t%v\t\n", data.CPU.Usage.PerCPU)
+-	}
+-	if data.Pids != nil {
+-		fmt.Fprintf(w, "pids.current\t%v\t\n", data.Pids.Current)
+-		fmt.Fprintf(w, "pids.limit\t%v\t\n", data.Pids.Limit)
+-	}
+-}
+-
+-func printCgroup2MetricsTable(w *tabwriter.Writer, data *v2.Metrics) {
+-	fmt.Fprintf(w, "METRIC\tVALUE\t\n")
+-	if data.Pids != nil {
+-		fmt.Fprintf(w, "pids.current\t%v\t\n", data.Pids.Current)
+-		fmt.Fprintf(w, "pids.limit\t%v\t\n", data.Pids.Limit)
+-	}
+-	if data.CPU != nil {
+-		fmt.Fprintf(w, "cpu.usage_usec\t%v\t\n", data.CPU.UsageUsec)
+-		fmt.Fprintf(w, "cpu.user_usec\t%v\t\n", data.CPU.UserUsec)
+-		fmt.Fprintf(w, "cpu.system_usec\t%v\t\n", data.CPU.SystemUsec)
+-		fmt.Fprintf(w, "cpu.nr_periods\t%v\t\n", data.CPU.NrPeriods)
+-		fmt.Fprintf(w, "cpu.nr_throttled\t%v\t\n", data.CPU.NrThrottled)
+-		fmt.Fprintf(w, "cpu.throttled_usec\t%v\t\n", data.CPU.ThrottledUsec)
+-	}
+-	if data.Memory != nil {
+-		fmt.Fprintf(w, "memory.usage\t%v\t\n", data.Memory.Usage)
+-		fmt.Fprintf(w, "memory.usage_limit\t%v\t\n", data.Memory.UsageLimit)
+-		fmt.Fprintf(w, "memory.swap_usage\t%v\t\n", data.Memory.SwapUsage)
+-		fmt.Fprintf(w, "memory.swap_limit\t%v\t\n", data.Memory.SwapLimit)
+-	}
+-}
+-
+-func printWindowsContainerStatistics(w *tabwriter.Writer, stats *wstats.WindowsContainerStatistics) {
+-	fmt.Fprintf(w, "METRIC\tVALUE\t\n")
+-	fmt.Fprintf(w, "timestamp\t%s\t\n", stats.Timestamp)
+-	fmt.Fprintf(w, "start_time\t%s\t\n", stats.ContainerStartTime)
+-	fmt.Fprintf(w, "uptime_ns\t%d\t\n", stats.UptimeNS)
+-	if stats.Processor != nil {
+-		fmt.Fprintf(w, "cpu.total_runtime_ns\t%d\t\n", stats.Processor.TotalRuntimeNS)
+-		fmt.Fprintf(w, "cpu.runtime_user_ns\t%d\t\n", stats.Processor.RuntimeUserNS)
+-		fmt.Fprintf(w, "cpu.runtime_kernel_ns\t%d\t\n", stats.Processor.RuntimeKernelNS)
+-	}
+-	if stats.Memory != nil {
+-		fmt.Fprintf(w, "memory.commit_bytes\t%d\t\n", stats.Memory.MemoryUsageCommitBytes)
+-		fmt.Fprintf(w, "memory.commit_peak_bytes\t%d\t\n", stats.Memory.MemoryUsageCommitPeakBytes)
+-		fmt.Fprintf(w, "memory.private_working_set_bytes\t%d\t\n", stats.Memory.MemoryUsagePrivateWorkingSetBytes)
+-	}
+-	if stats.Storage != nil {
+-		fmt.Fprintf(w, "storage.read_count_normalized\t%d\t\n", stats.Storage.ReadCountNormalized)
+-		fmt.Fprintf(w, "storage.read_size_bytes\t%d\t\n", stats.Storage.ReadSizeBytes)
+-		fmt.Fprintf(w, "storage.write_count_normalized\t%d\t\n", stats.Storage.WriteCountNormalized)
+-		fmt.Fprintf(w, "storage.write_size_bytes\t%d\t\n", stats.Storage.WriteSizeBytes)
+-	}
+-}
+-
+-func printWindowsVMStatistics(w *tabwriter.Writer, stats *wstats.VirtualMachineStatistics) {
+-	fmt.Fprintf(w, "METRIC\tVALUE\t\n")
+-	if stats.Processor != nil {
+-		fmt.Fprintf(w, "vm.cpu.total_runtime_ns\t%d\t\n", stats.Processor.TotalRuntimeNS)
+-	}
+-	if stats.Memory != nil {
+-		fmt.Fprintf(w, "vm.memory.working_set_bytes\t%d\t\n", stats.Memory.WorkingSetBytes)
+-		fmt.Fprintf(w, "vm.memory.virtual_node_count\t%d\t\n", stats.Memory.VirtualNodeCount)
+-		fmt.Fprintf(w, "vm.memory.available\t%d\t\n", stats.Memory.VmMemory.AvailableMemory)
+-		fmt.Fprintf(w, "vm.memory.available_buffer\t%d\t\n", stats.Memory.VmMemory.AvailableMemoryBuffer)
+-		fmt.Fprintf(w, "vm.memory.reserved\t%d\t\n", stats.Memory.VmMemory.ReservedMemory)
+-		fmt.Fprintf(w, "vm.memory.assigned\t%d\t\n", stats.Memory.VmMemory.AssignedMemory)
+-		fmt.Fprintf(w, "vm.memory.slp_active\t%t\t\n", stats.Memory.VmMemory.SlpActive)
+-		fmt.Fprintf(w, "vm.memory.balancing_enabled\t%t\t\n", stats.Memory.VmMemory.BalancingEnabled)
+-		fmt.Fprintf(w, "vm.memory.dm_operation_in_progress\t%t\t\n", stats.Memory.VmMemory.DmOperationInProgress)
+-	}
+-}
+-- 
+2.28.0
+
@@ -0,0 +1,162 @@
+From 4347fc8bc2ac225117a3280c0445e855ca7a69f3 Mon Sep 17 00:00:00 2001
+From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
+Date: Tue, 9 May 2023 22:24:47 +0900
+Subject: [PATCH] go.mod: github.com/opencontainers/image-spec v1.1.0-rc3
+
+Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
+---
+ go.mod                                        |  2 +-
+ go.sum                                        |  4 +--
+ images/converter/default.go                   |  4 +--
+ images/converter/uncompress/uncompress.go     |  6 ++--
+ images/diffid.go                              |  2 +-
+ images/mediatypes.go                          |  2 +-
+ integration/client/go.mod                     |  2 +-
+ integration/client/go.sum                     |  4 +--
+ integration/client/import_test.go             |  8 +++--
+ oci/spec_opts.go                              |  1 +
+ pkg/cri/opts/spec_windows.go                  |  4 +--
+ remotes/handlers_test.go                      |  1 +
+ .../image-spec/specs-go/v1/annotations.go     |  3 --
+ .../image-spec/specs-go/v1/artifact.go        | 34 -------------------
+ .../image-spec/specs-go/v1/config.go          | 34 ++++++-------------
+ .../image-spec/specs-go/v1/manifest.go        | 11 ++++++
+ .../image-spec/specs-go/v1/mediatype.go       | 19 +++++++++--
+ .../image-spec/specs-go/version.go            |  2 +-
+ vendor/modules.txt                            |  4 +--
+ 19 files changed, 64 insertions(+), 83 deletions(-)
+ delete mode 100644 vendor/github.com/opencontainers/image-spec/specs-go/v1/artifact.go
+
+diff --git a/images/converter/default.go b/images/converter/default.go
+index c67617e4ccfc..4a887242ce40 100644
+--- a/images/converter/default.go
+++ b/images/converter/default.go
+@@ -431,11 +431,11 @@ func ConvertDockerMediaTypeToOCI(mt stri
+ 	case images.MediaTypeDockerSchema2LayerGzip:
+ 		return ocispec.MediaTypeImageLayerGzip
+ 	case images.MediaTypeDockerSchema2LayerForeignGzip:
+-		return ocispec.MediaTypeImageLayerNonDistributableGzip
+		return ocispec.MediaTypeImageLayerNonDistributableGzip //nolint:staticcheck // deprecated
+ 	case images.MediaTypeDockerSchema2Layer:
+ 		return ocispec.MediaTypeImageLayer
+ 	case images.MediaTypeDockerSchema2LayerForeign:
+-		return ocispec.MediaTypeImageLayerNonDistributable
+		return ocispec.MediaTypeImageLayerNonDistributable //nolint:staticcheck // deprecated
+ 	case images.MediaTypeDockerSchema2Config:
+ 		return ocispec.MediaTypeImageConfig
+ 	default:
+diff --git a/images/converter/uncompress/uncompress.go b/images/converter/uncompress/uncompress.go
+index 30ae02cf5ef9..ceb998fb8ff6 100644
+--- a/images/converter/uncompress/uncompress.go
+++ b/images/converter/uncompress/uncompress.go
+@@ -99,7 +99,7 @@ func IsUncompressedType(mt string) bool
+ 		images.MediaTypeDockerSchema2Layer,
+ 		images.MediaTypeDockerSchema2LayerForeign,
+ 		ocispec.MediaTypeImageLayer,
+-		ocispec.MediaTypeImageLayerNonDistributable:
+		ocispec.MediaTypeImageLayerNonDistributable: //nolint:staticcheck // deprecated
+ 		return true
+ 	default:
+ 		return false
+@@ -114,8 +114,8 @@ func convertMediaType(mt string) string
+ 		return images.MediaTypeDockerSchema2LayerForeign
+ 	case ocispec.MediaTypeImageLayerGzip, ocispec.MediaTypeImageLayerZstd:
+ 		return ocispec.MediaTypeImageLayer
+-	case ocispec.MediaTypeImageLayerNonDistributableGzip, ocispec.MediaTypeImageLayerNonDistributableZstd:
+-		return ocispec.MediaTypeImageLayerNonDistributable
+	case ocispec.MediaTypeImageLayerNonDistributableGzip, ocispec.MediaTypeImageLayerNonDistributableZstd: //nolint:staticcheck // deprecated
+		return ocispec.MediaTypeImageLayerNonDistributable //nolint:staticcheck // deprecated
+ 	default:
+ 		return mt
+ 	}
+diff --git a/images/diffid.go b/images/diffid.go
+index 1bd5256e2b37..c031f8e36377 100644
+--- a/images/diffid.go
+++ b/images/diffid.go
+@@ -36,7 +36,7 @@ func GetDiffID(ctx context.Context, cs c
+ 		MediaTypeDockerSchema2Layer,
+ 		ocispec.MediaTypeImageLayer,
+ 		MediaTypeDockerSchema2LayerForeign,
+-		ocispec.MediaTypeImageLayerNonDistributable:
+		ocispec.MediaTypeImageLayerNonDistributable: //nolint:staticcheck // deprecated
+ 		return desc.Digest, nil
+ 	}
+ 	info, err := cs.Info(ctx, desc.Digest)
+diff --git a/images/mediatypes.go b/images/mediatypes.go
+index 067963babba1..d3b28d42dc61 100644
+--- a/images/mediatypes.go
+++ b/images/mediatypes.go
+@@ -76,7 +76,7 @@ func DiffCompression(ctx context.Context
+ 			return "", nil
+ 		}
+ 		return "gzip", nil
+-	case ocispec.MediaTypeImageLayer, ocispec.MediaTypeImageLayerNonDistributable:
+	case ocispec.MediaTypeImageLayer, ocispec.MediaTypeImageLayerNonDistributable: //nolint:staticcheck // Non-distributable layers are deprecated
+ 		if len(ext) > 0 {
+ 			switch ext[len(ext)-1] {
+ 			case "gzip":
+diff --git a/integration/client/import_test.go b/integration/client/import_test.go
+index f2ba3db35f89..9f2cc46e624e 100644
+--- a/integration/client/import_test.go
+++ b/integration/client/import_test.go
+@@ -370,9 +370,11 @@ func createContent(size int64, seed int6
+
+ func createConfig(osName, archName string) ([]byte, digest.Digest) {
+ 	image := ocispec.Image{
+-		OS:           osName,
+-		Architecture: archName,
+-		Author:       "test",
+		Platform: ocispec.Platform{
+			OS:           osName,
+			Architecture: archName,
+		},
+		Author: author,
+ 	}
+ 	b, _ := json.Marshal(image)
+
+diff --git a/oci/spec_opts.go b/oci/spec_opts.go
+index f38828988577..8c4abd0bd876 100644
+--- a/oci/spec_opts.go
+++ b/oci/spec_opts.go
+@@ -446,6 +446,7 @@ func WithImageConfigArgs(image Image, ar
+ 				return errors.New("no arguments specified")
+ 			}
+
+			//nolint:staticcheck // ArgsEscaped is deprecated
+ 			if config.ArgsEscaped && (len(config.Entrypoint) > 0 || cmdFromImage) {
+ 				s.Process.Args = nil
+ 				s.Process.CommandLine = cmd[0]
+diff --git a/pkg/cri/opts/spec_windows.go b/pkg/cri/opts/spec_windows.go
+index 0964084ca107..0f7307bd0a6f 100644
+--- a/pkg/cri/opts/spec_windows.go
+++ b/pkg/cri/opts/spec_windows.go
+@@ -260,7 +260,7 @@ func escapeAndCombineArgsWindows(args []
+ // If image.ArgsEscaped field is set, this function sets the process command line and if not, it sets the
+ // process args field
+ func WithProcessCommandLineOrArgsForWindows(config *runtime.ContainerConfig, image *imagespec.ImageConfig) oci.SpecOpts {
+-	if image.ArgsEscaped {
+	if image.ArgsEscaped { //nolint:staticcheck // ArgsEscaped is deprecated
+ 		return func(ctx context.Context, client oci.Client, c *containers.Container, s *runtimespec.Spec) (err error) {
+ 			// firstArgFromImg is a flag that is returned to indicate that the first arg in the slice comes from either the
+ 			// image Entrypoint or Cmd. If the first arg instead comes from the container config (e.g. overriding the image values),
+@@ -273,7 +273,7 @@ func WithProcessCommandLineOrArgsForWind
+ 			}
+
+ 			var cmdLine string
+-			if image.ArgsEscaped && firstArgFromImg {
+			if image.ArgsEscaped && firstArgFromImg { //nolint:staticcheck // ArgsEscaped is deprecated
+ 				cmdLine = args[0]
+ 				if len(args) > 1 {
+ 					cmdLine += " " + escapeAndCombineArgsWindows(args[1:])
+diff --git a/remotes/handlers_test.go b/remotes/handlers_test.go
+index c0446e1a52e6..9acf54680bf3 100644
+--- a/remotes/handlers_test.go
+++ b/remotes/handlers_test.go
+@@ -78,6 +78,7 @@ func TestContextCustomKeyPrefix(t *testi
+ 	})
+ }
+
+//nolint:staticcheck // Non-distributable layers are deprecated
+ func TestSkipNonDistributableBlobs(t *testing.T) {
+ 	ctx := context.Background()
+
@@ -0,0 +1,24 @@
+diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go
+index a8498116d..3682be668 100644
+--- a/pkg/cri/server/helpers.go
+++ b/pkg/cri/server/helpers.go
+@@ -40,7 +40,7 @@ import (
+ 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
+ 	"github.com/sirupsen/logrus"
+ 
+-	runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
+	// runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
+ 	imagedigest "github.com/opencontainers/go-digest"
+ 	"github.com/pelletier/go-toml"
+ 	"golang.org/x/net/context"
+@@ -366,8 +366,8 @@ func getRuntimeOptionsType(t string) interface{} {
+ 		return &runcoptions.Options{}
+ 	case plugin.RuntimeLinuxV1:
+ 		return &runctypes.RuncOptions{}
+-	case runtimeRunhcsV1:
+-		return &runhcsoptions.Options{}
+	// case runtimeRunhcsV1:
+	//	return &runhcsoptions.Options{}
+ 	default:
+ 		return &runtimeoptions.Options{}
+ 	}
@@ -0,0 +1,5 @@
+project "pkg" {
+    rpm {
+        spec = "containerd.spec"
+    }
+}
@@ -0,0 +1,167 @@
+* Mon Jun 06 2022 Maxwell G <gotmax@e.email> 1.6.6-1
+- Update to 1.6.6.
+- Mitigates GHSA-5ffw-gxpp-mxpf / CVE-2022-31030.
+
+* Sun Jun 05 2022 Maxwell G <gotmax@e.email> 1.6.5-2
+- Bump release
+
+* Sat Jun 04 2022 Maxwell G <gotmax@e.email> 1.6.5-1
+- Update to 1.6.5. Fixes rhbz#2093608.
+
+* Wed May 11 2022 Maxwell G <gotmax@e.email> 1.6.4-1
+- Update to 1.6.4. Fixes rhbz#079050 and rhbz#2079779.
+
+* Sat Apr 16 2022 Fabio Alessandro Locati <me@fale.io> 1.6.2-2
+- Rebuilt for CVE-2022-27191
+
+* Sun Apr 03 2022 Maxwell G <gotmax@e.email> 1.6.2-1
+- Update to 1.6.2 (rhbz#2068277). Mitigates CVE-2022-24769 /
+  GHSA-c9cp-9c75-9v8c.
+
+* Sat Mar 12 2022 Maxwell G <gotmax@e.email> 1.6.1-1
+- Update to 1.6.1 (rhbz#2060228). Mitigates CVE-2022-23648.
+
+* Thu Feb 17 2022 Maxwell G <gotmax@e.email> 1.6.0-1
+- Update to 1.6.0 (rhbz#2054935). Use unbundled deps.
+
+* Sun Feb 06 2022 Robert-André Mauchin <zebob.m@gmail.com> 1.6.0~rc.2-2
+- Disable platform tests
+
+* Sat Feb 05 2022 Robert-André Mauchin <zebob.m@gmail.com> 1.6.0~rc.2-1
+- Update to 1.6.0~rc.2 Close: rhbz#1731597 Close: rhbz#1798419
+
+* Mon Jan 31 2022 Maxwell G <gotmax@e.email> - 1.5.9-1
+- Update to 1.5.9. Fixes FTBFS. Closes rhbz#2045277.
+- Mitigates CVE-2021-43816. Closes rhbz#2044434. Closes rhbz#2044436.
+- Temporarily build using vendored dependencies.
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Nov 22 2021 Olivier Lemasle <o.lemasle@gmail.com> - 1.5.8-1
+- Update to upstream 1.5.8 (fixes rhbz#2013807)
+- Mitigate CVE-2021-41190 (fixes GHSA-5j5w-g665-5m35, fixes rhbz#2024941)
+
+* Sun Oct 10 2021 Olivier Lemasle <o.lemasle@gmail.com> - 1.5.7-1
+- Update to upstream 1.5.7 (fixes rhbz#2009149)
+- Fixes CVE-2021-41103 (fixes rhbz#2011014, rhbz#2011007)
+
+* Sun Aug 15 2021 Olivier Lemasle <o.lemasle@gmail.com> - 1.5.5-1
+- Update to upstream 1.5.5 (fixes rhbz#1983820)
+- Fixes CVE-2021-32760 (rhbz#1983932)
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jul 14 11:28:54 CEST 2021 Olivier Lemasle <o.lemasle@gmail.com> - 1.5.3-1
+- Update to upstream 1.5.3 (fixes rhbz#1956638)
+
+* Tue May 04 2021 Olivier Lemasle <o.lemasle@gmail.com> - 1.5.0-1
+- Update to upstream 1.5.0 (#1956638)
+
+* Mon Apr 19 2021 Olivier Lemasle <o.lemasle@gmail.com> - 1.5.0~rc.1-1
+- Update to 1.5.0~rc.1 (#1948041)
+
+* Wed Mar 17 2021 Olivier Lemasle <o.lemasle@gmail.com> - 1.5.0~beta.4-1
+- Update to upstream 1.5.0-beta.4
+
+* Sat Mar 06 2021 Olivier Lemasle <o.lemasle@gmail.com> - 1.5.0~beta.3-1
+- Update to upstream 1.5.0-beta.3
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.5.0~beta.0-2
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Thu Jan 28 2021 Olivier Lemasle <o.lemasle@gmail.com> 1.5.0~beta.0-1
+- Update to 1.5.0~beta.0 (#1918993)
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Dec 01 2020 Olivier Lemasle <o.lemasle@gmail.com> - 1.4.3-1
+- Fix CVE-2020-15257 (#1903050)
+- Update to latest upstream - 1.4.3 (#1901908)
+
+* Mon Nov  2 23:23:57 CET 2020 Olivier Lemasle <o.lemasle@gmail.com> - 1.4.1-2
+- Fix man pages
+
+* Wed Sep 30 2020 Robert-André Mauchin <zebob.m@gmail.com> - 1.4.1-1
+- Update to 1.4.1
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Apr 01 2020 Olivier Lemasle <o.lemasle@gmail.com> - 1.3.3-1
+- Update to 1.3.3
+
+* Sun Mar 22 2020 Olivier Lemasle <o.lemasle@gmail.com> - 1.2.13-2
+- Remove version requirement on golang-github-containerd-cri
+
+* Sun Mar 22 2020 Olivier Lemasle <o.lemasle@gmail.com> - 1.2.13-1
+- Exclude failing integration tests
+- Update to containerd 1.2.13
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed May 01 15:33:19 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 1.2.6-1.20190501gitd68b593
+- Release 1.2.6, commit d68b593de4ab10bb8b4fd64560e10d43c7156db2
+
+* Tue Feb 26 2019 Carl George <carl@george.computer> - 1.2.4-1
+- Latest upstream
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 03 2019 Carl George <carl@george.computer> - 1.2.1-1
+- Latest upstream
+- Run test suite (except on el7 or %%arm)
+
+* Thu Oct 25 2018 Carl George <carl@george.computer> - 1.2.0-1
+- Latest upstream
+
+* Mon Aug 13 2018 Carl George <carl@george.computer> - 1.1.2-1
+- Latest upstream
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Apr 26 2018 Carl George <carl@george.computer> - 1.1.0-1
+- Latest upstream
+- Build and include man pages
+
+* Wed Apr 04 2018 Carl George <carl@george.computer> - 1.0.3-1
+- Latest upstream
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Jan 22 2018 Carl George <carl@george.computer> - 1.0.1-1
+- Latest upstream
+
+* Wed Dec 06 2017 Carl George <carl@george.computer> - 1.0.0-1
+- Latest upstream
+
+* Fri Nov 10 2017 Carl George <carl@george.computer> - 1.0.0-0.5.beta.3
+- Latest upstream
+
+* Thu Oct 19 2017 Carl George <carl@george.computer> - 1.0.0-0.4.beta.2
+- Own /etc/containerd
+
+* Thu Oct 12 2017 Carl George <carl@george.computer> - 1.0.0-0.3.beta.2
+- Latest upstream
+- Require runc 1.0.0 https://github.com/containerd/containerd/issues/1508#issuecomment-335566293
+
+* Mon Oct 09 2017 Carl George <carl@george.computer> - 1.0.0-0.2.beta.1
+- Add provides for vendored dependencies
+- Add ctr command
+
+* Wed Oct 04 2017 Carl George <carl@george.computer> - 1.0.0-0.1.beta.1
+- Initial package
@@ -0,0 +1,127 @@
+# This is a simplified version of the containerd.spec file from Fedora
+# designed to build from upstream containerd, not Fedora
+
+# Created due to https://bugzilla.redhat.com/show_bug.cgi?id=2237396
+
+%global debug_package %{nil}
+
+# https://github.com/containerd/containerd
+%global goipath         github.com/containerd/containerd
+Version:                2.0.2
+
+%gometa
+
+%global goname          containerd
+%global godevelname     containerd-devel
+
+%global common_description %{expand:
+Containerd is an industry-standard container runtime with an emphasis on
+simplicity, robustness and portability. It is available as a daemon for Linux
+and Windows, which can manage the complete container lifecycle of its host
+system: image transfer and storage, container execution and supervision,
+low-level storage and network attachments, etc.}
+
+%global golicenses      LICENSE NOTICE
+%global godocs          docs ROADMAP.md SCOPE.md code-of-conduct.md\\\
+                        BUILDING.md README.md RELEASES.md
+
+Name:           %{goname}
+Release:        1%?dist
+Summary:        Open and reliable container runtime
+
+License:        Apache-2.0
+URL:            https://github.com/containerd/containerd
+Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz#/containerd-%{version}.tar.gz
+Source2:        containerd.toml
+# Carve out code requiring github.com/Microsoft/hcsshim
+#Patch0:         0001-Revert-commit-for-Windows-metrics.patch
+#Patch1:         0002-Remove-windows-only-dep.patch
+# Backport for github.com/containerd/typeurl update
+#Patch2:         0001-Use-typeurl.Any-instead-of-github.com-gogo-protobuf-.patch
+# To use with latest go-runc
+#Patch3:         0001-Add-reaper-StartLocked.patch
+# To use with latest opencontainers/image-spec
+#Patch4:         0001-opencontainers-image-spec-v1.1.0-rc3.patch
+
+BuildRequires:  btrfs-progs-devel
+BuildRequires:  go-md2man
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  git-core
+
+Requires:       runc
+
+%description
+%{common_description}
+
+%package devel
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+
+%description devel
+%{common_description}
+
+This package contains library source intended for
+building other packages which use import path with
+%{goname} prefix.
+
+%prep
+%autosetup -p1 -n %{goname}-%{version}
+# Used only for generation:
+#rm -rf cmd/protoc-gen-gogoctrd
+# Replace default bin directory
+sed -i "s|/usr/local/bin/containerd|/usr/bin/containerd|" containerd.service
+
+%build
+#pushd containerd
+export GOFLAGS="-buildmode=pie -v -x"
+%make_build
+mkdir _man
+go-md2man -in docs/man/containerd-config.8.md -out _man/containerd-config.8
+go-md2man -in docs/man/containerd-config.toml.5.md -out _man/containerd-config.toml.5
+go run cmd/gen-manpages/main.go containerd.8 _man
+go run cmd/gen-manpages/main.go ctr.8 _man
+
+%install
+export GOFLAGS="-buildmode=pie -v -x"
+%make_install PREFIX=%{_prefix} DESTDIR=%{buildroot}
+
+	
+	
+install -D -p -m 0644 _man/containerd.8 %{buildroot}%{_mandir}/man8/containerd.8	
+install -D -p -m 0644 _man/containerd-config.8 %{buildroot}%{_mandir}/man8/containerd-config.8
+install -D -p -m 0644 _man/ctr.8 %{buildroot}%{_mandir}/man8/ctr.8
+install -D -p -m 0644 _man/containerd-config.toml.5 %{buildroot}%{_mandir}/man5/containerd-config.toml.5
+install -D -p -m 0644 containerd.service %{buildroot}%{_unitdir}/containerd.service
+install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml
+mkdir -p %{buildroot}%{_sharedstatedir}/containerd/opt
+
+%post
+%systemd_post containerd.service
+
+%preun
+%systemd_preun containerd.service
+
+%postun
+%systemd_postun_with_restart containerd.service
+
+
+
+%files
+%license LICENSE NOTICE
+%doc docs ROADMAP.md SCOPE.md code-of-conduct.md BUILDING.md
+%doc README.md RELEASES.md
+%{_bindir}/*
+%{_mandir}/man8/containerd.8*
+%{_mandir}/man8/containerd-config.8*
+%{_mandir}/man8/ctr.8*
+%{_mandir}/man5/containerd-config.toml.5*
+%{_unitdir}/containerd.service
+%dir %{_sysconfdir}/containerd
+%config(noreplace) %{_sysconfdir}/containerd/config.toml
+%dir %{_sharedstatedir}/containerd
+%dir %{_sharedstatedir}/containerd/opt
+
+
+%changelog
+%autochangelog
@@ -0,0 +1,9 @@
+version = 2
+
+[plugins]
+  [plugins."io.containerd.grpc.v1.cri"]
+    [plugins."io.containerd.grpc.v1.cri".cni]
+      bin_dir = "/usr/libexec/cni/"
+      conf_dir = "/etc/cni/net.d"
+  [plugins."io.containerd.internal.v1.opt"]
+    path = "/var/lib/containerd/opt"
@@ -0,0 +1 @@
+rpm.version(gh("containerd/containerd"));
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "moby-buildx.spec"
+	}
+}
@@ -0,0 +1,46 @@
+%define debug_package %nil
+
+Name:           moby-buildx
+Version:        0.19.3
+Release:        1%?dist
+Summary:        Docker CLI plugin for extended build capabilities with BuildKit
+
+License:        Apache-2.0
+URL:            https://github.com/docker/buildx
+Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz
+
+BuildRequires:  go-rpm-macros
+BuildRequires:  git-core
+BuildRequires:  gcc
+BuildRequires:  anda-srpm-macros
+
+Provides:       docker-buildx = %{version}-%{release}
+Provides:       docker-buildx-cli = %{version}-%{release}
+
+
+%description
+buildx is a Docker CLI plugin for extended build capabilities with BuildKit.
+
+
+%prep
+%autosetup -n buildx-%{version}
+
+
+%build
+export CGO_ENABLED=1
+%go_build_online ./cmd/buildx
+
+
+%install
+install -D -m 0755 build/bin/cmd/buildx %{buildroot}%{_libexecdir}/docker/cli-plugins/docker-buildx
+
+
+%files
+%license LICENSE
+%doc docs
+%{_libexecdir}/docker/cli-plugins/docker-buildx
+
+
+%changelog
+* Wed Oct 05 2022 Cappy Ishihara <cappy@cappuchino.xyz> - 0.9.1-1
+- Initial Release
@@ -0,0 +1 @@
+rpm.version(gh("docker/buildx"));
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "moby-compose.spec"
+	}
+}
@@ -0,0 +1,46 @@
+%define debug_package %{nil}
+
+Name:           moby-compose
+Version:        2.32.4
+Release:        1%?dist
+Summary:        Define and run multi-container applications with Docker
+
+License:        Apache-2.0
+URL:            https://github.com/docker/compose/
+Source0:        %{url}archive/refs/tags/v%{version}.tar.gz
+# Source1:        https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-amd64
+
+BuildRequires:  go-rpm-macros
+BuildRequires:  git-core
+BuildRequires:  docker
+Provides:       docker-compose = %{version}-%{release}
+Provides:       docker-compose-cli = %{version}-%{release}
+
+%description
+A tool for running multi-container applications using the Compose file format.
+
+
+%prep
+%autosetup -n compose-%{version}
+
+
+%build
+%make_build
+
+
+%install
+mkdir -p %{buildroot}%{_libexecdir}/docker/cli-plugins
+install -m 0755 bin/build/docker-compose %{buildroot}%{_libexecdir}/docker/cli-plugins/docker-compose
+
+%files
+%license LICENSE
+%doc docs
+
+%{_libexecdir}/docker/cli-plugins/docker-compose
+
+%changelog
+* Tue Dec 06 2022 root - 2.14.0-1
+- new version
+
+* Tue Oct 04 2022 Cappy Ishihara <cappy@cappuchino.xyz>
+- Initial Release
@@ -0,0 +1 @@
+rpm.version(gh("docker/compose"));
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
-<fontconfig>
-  <description>Set Thai font preferences</description>
-
-  <match target="pattern">
-    <test qual="any" name="family" compare="eq">
-        <string>Sarabun</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>TH Sarabun New</string>
-    </edit>
-  </match>
-  <match target="pattern">
-    <test qual="any" name="family" compare="eq">
-        <string>TH Sarabun</string>
-    </test>
-    <edit name="family" mode="prepend" binding="same">
-      <string>TH Sarabun New</string>
-    </edit>
-  </match>
-</fontconfig>
@@ -2,29 +2,20 @@

 Name:			sipa-fonts
 Version:		20200217
-Release:		3%?dist
+Release:		2%?dist
 Summary:		Thai National Fonts collection
-URL:			https://www.nstda.or.th/home/news_post/thai-font/
-License:		LicenseRef-DIP-SIPA AND OFL-1.1-RFN
+URL:			https://www.f0nt.com/release/13-free-fonts-from-sipa/
+License:		OFL-1.1
 Source0:		https://waa.inter.nstda.or.th/stks/pub/%(x=%version;echo ${x:0:4})/%version-13Fonts.zip
-Source1:        15-supercede-sarabun.conf
 BuildRequires:	unzip
-Supplements:    (default-fonts-th)
 BuildArch:		noarch
-# Sarabun has very tiny latin alphanumeric glyphs, so it's not suitable for general use.
-# And this causes legibility issues in many applications that defer to it.
-# So let's have Laksaman synthesize it instead.
-# TH Sarabun has also been superceded by Google Fonts' Sarabun/TH Sarabun New by the same foundry. (#2482)
-
 Recommends:		%{lua:
 local x = ""
 local ver = rpm.expand("%version-%release")
 for variant in (rpm.expand("%variants")):gmatch("[^ ]+") do
 	local v = string.gsub(variant, "_", " ")
 	local name = "th-"..string.gsub(v:lower(), " ", "-").."-fonts"
-	if name ~= "th-sarabun-fonts" then
-		x = x .. name .. " = "..ver.." "
-	end
+	x = x .. name .. " = "..ver.." "
 end
 print(x)
 }
@@ -51,70 +42,11 @@ end

 # copied from https://www.f0nt.com/about/license/
 cat <<EOF > LICENSE
-สัญญาอนุญาตให้ใช้โปรแกรมคอมพิวเตอร์ฟอนต์
-
-ชื่อที่สงวนไว้สำหรับโปรแกรมคอมพิวเตอร์ฟอนต์นี้
-TH Krub, TH Krub Italic, TH Krub Bold, TH Krub Bold Italic,
-TH Niramit AS, TH Niramit AS Italic, TH Niramit AS Bold, TH Niramit AS Bold Italic,
-TH Kodchasal, TH Kodchasal Italic, TH Kodchasal Bold, TH Kodchasal Bold Italic,
-TH Sarabun PSK, TH Sarabun PSK Italic, TH Sarabun PSK Bold, TH Sarabun PSK Bold Italic,
-TH K2D July8, TH K2D July8 Italic, TH K2D July8 Bold, TH K2D July8 Bold Italic,
-TH Mali Grade 6, TH Mali Grade 6 Italic, TH Mali Grade 6 Bold, TH Mali Grade 6 Bold Italic,
-TH Chakra Petch, TH Chakra Petch Italic, TH Chakra Petch Bold, TH Chakra Petch Bold Italic,
-TH Baijam, TH Baijam Italic, TH Baijam Bold, TH Baijam Bold Italic,
-TH KoHo, TH KoHo Italic, TH KoHo Bold, TH KoHo Bold Italic,
-TH Fah Kwang, TH Fah Kwang Italic, TH Fah Kwang Bold, TH Fah Kwang Bold Italic.
-
-โปรแกรมคอมพิวเตอร์ฟอนต์นี้ เป็นลิขสิทธิ์ร่วมกันของกรมทรัพย์สินทางปัญญา กระทรวงพาณิชย์ และสำนักงานส่งเสริมอุตสาหกรรมซอฟต์แวร์แห่งชาติ (องค์การมหาชน)
-
-สัญญาอนุญาตให้ใช้โปรแกรมคอมพิวเตอร์ฟอนต์นี้ มีวัตถุประสงค์เพื่อก่อให้เกิดความร่วมมือในการสร้างสรรค์ฟอนต์ในวงกว้าง รวมทั้งเพื่อประโยชน์ทางด้านการศึกษาและการแบ่งปันความรู้และพัฒนาโปรแกรมคอมพิวเตอร์ฟอนต์นี้
-
-ข้อกำหนดและเงื่อนไขของสัญญาอนุญาตให้ใช้โปรแกรมคอมพิวเตอร์ฟอนต์นี้
-
-(1)  อนุญาตให้ใช้ได้โดยไม่คิดค่าใช้จ่ายและอนุญาตให้ทำซ้ำโปรแกรมคอมพิวเตอร์ฟอนต์นี้ได้ รวมทั้งอนุญาตให้ได้ศึกษา ดัดแปลง และแจกจ่ายให้แก่ผู้อื่นได้ ทั้งนี้จะต้องไม่นำโปรแกรมคอมพิวเตอร์ฟอนต์นี้และโปรแกรมคอมพิวเตอร์ฟอนต์ที่ดัดแปลงออกจำหน่าย เว้นแต่เป็นการจำหน่ายรวมติดไปกับโปรแกรมคอมพิวเตอร์อื่น
-
-(2)  ก่อนดำเนินการดัดแปลงโปรแกรมคอมพิวเตอร์ฟอนต์ จะต้องแจ้งให้เจ้าของลิขสิทธิ์ทราบเป็นลายลักษณ์อักษร
-
-(3)  เมื่อดัดแปลงโปรแกรมคอมพิวเตอร์ฟอนต์นี้แล้ว ห้ามผู้ดัดแปลงใช้ชื่อฟอนต์เดิม รวมทั้งห้ามใช้ชื่อเจ้าของลิขสิทธิ์และผู้สร้างสรรค์โปรแกรมคอมพิวเตอร์ฟอนต์นี้ ในการโฆษณาโปรแกรมคอมพิวเตอร์ฟอนต์ที่ได้ดัดแปลง เว้นแต่ได้รับอนุญาตเป็นลายลักษณ์อักษรจากเจ้าของลิขสิทธิ์
-
-(4)  ผู้ดัดแปลงโปรแกรมคอมพิวเตอร์นี้จะต้องยินยอมให้โปรแกรมคอมพิวเตอร์ฟอนต์ ที่ดัดแปลงขึ้นใหม่มีข้อกำหนดและเงื่อนไขสัญญาอนุญาตให้ใช้โปรแกรมเช่นเดียวกันกับข้อกำหนด และเงื่อนไขของสัญญาอนุญาตนี้เช่นกัน
-
-ข้อถือสิทธิ
-เจ้าของลิขสิทธิ์ไม่รับประกันการใช้งานโปรแกรมคอมพิวเตอร์ฟอนต์และไฟล์ที่เกี่ยวข้องนี้แต่อย่างใด  ไม่มีการรับรองว่าโปรแกรมคอมพิวเตอร์ฟอนต์นี้จะทำงานได้อย่างที่ควรจะเป็น และไม่มีการรับรองว่าจะมีการพัฒนาต่อยอดในอนาคต ไม่มีและไม่รับรองว่าจะมีการให้คำแนะนำทางเทคนิคสำหรับโปรแกรมคอมพิวเตอร์ฟอนต์นี้
-
-
-Font Computer Program License Agreement
-
-Reserved Font Names for this Font Computer Program:
-TH Krub, TH Krub Italic, TH Krub Bold, TH Krub Bold Italic,
-TH Niramit AS, TH Niramit AS Italic, TH Niramit AS Bold, TH Niramit AS Bold Italic,
-TH Kodchasal, TH Kodchasal Italic, TH Kodchasal Bold, TH Kodchasal Bold Italic,
-TH Sarabun PSK, TH Sarabun PSK Italic, TH Sarabun PSK Bold, TH Sarabun PSK Bold Italic,
-TH K2D July8, TH K2D July8 Italic, TH K2D July8 Bold, TH K2D July8 Bold Italic,
-TH Mali Grade 6, TH Mali Grade 6 Italic, TH Mali Grade 6 Bold, TH Mali Grade 6 Bold Italic,
-TH Chakra Petch, TH Chakra Petch Italic, TH Chakra Petch Bold, TH Chakra Petch Bold Italic,
-TH Baijam, TH Baijam Italic, TH Baijam Bold, TH Baijam Bold Italic,
-TH KoHo, TH KoHo Italic, TH KoHo Bold, TH KoHo Bold Italic,
-TH Fah Kwang, TH Fah Kwang Italic, TH Fah Kwang Bold, TH Fah Kwang Bold Italic.
-
-This Font Computer Program is the copyright of the Department of Intellectual Property (DIP), Ministry of Commerce and the Software Industry Promotion Agency (Public Organization) (SIPA)
-
-The purposes of this Font Computer Program License are to stimulate worldwide development of cooperative font creation, to benefit for academic, to share and to develop in partnership with others.
-
-Terms and Conditions of the Font Computer Program
-
-(1) Allow to use without any charges and allow to reproduce, study, adapt and distribute this Font Computer Program. Neither the original version nor adapted version of Font Computer Program may be sold by itself, except bundled and/or sold with any computer program.
-
-(2) If you wish to adapt this Font Computer Program, you must notify copyright owners (DIP & SIPA) in writing.
-
-(3) No adapted version of Font Computer Program may use the Reserved Font Name(s), the name(s) of the copyright owners and the author(s) of the Font Computer Program must not be used to promote or advertise any adapted version, except obtaining written permission from copyright owners and the author(s).
-
-(4) The adapted version of Font Computer Program must be released under the term and condition of this license.
-
-DISCLAIMER
-THE FONT COMPUTER PROGRAM AND RELATED FILES ARE PROVIDED “AS IS” AND WITHOUT WARRANTY OF ANY KIND.  NO GUARANTEES ARE MADE THAT THIS FONT COMPUTER PROGRAM WILL WORK AS EXPECTED OR WILL BE DEVELOPED FURTHUR IN ANY SPECIFIC WAY.  THERE IS NO OFFER OR GUARANTEE OF TECHNICAL SUPPORT.
-
-
+1. คุณสามารถดาวน์โหลดฟอนต์ไปใช้งานได้ฟรี ไม่ต้องเสียค่าใช้จ่ายแต่อย่างใด
+2. แต่ถ้ามีการระบุข้อตกลงอื่นใดจากเจ้าของฟอนต์ ดังที่แสดงไว้ในหน้าดาวน์โหลดฟอนต์ หรือเป็นไฟล์เอกสารแสดงข้อตกลงที่แนบไปกับฟอนต์นั้นๆ ให้ยึดข้อตกลงดังกล่าวเป็นสำคัญ
+3. คุณสามารถคัดลอกรายละเอียดอธิบายข้อมูล, ภาพตัวอย่างฟอนต์ ไปเผยแพร่ แจกจ่ายในเว็บไซต์หรือสื่ออื่นๆ ได้ โดยต้องระบุที่มา และทำลิงก์กลับมายังหน้าแสดงรายละเอียดฟอนต์
+4. ไม่อนุญาตให้นำ “ไฟล์ฟอนต์” ไปขาย เว้นแต่จะเป็นการแนบไฟล์ติดไปกับสื่อ โปรแกรม เพื่อความสะดวกในการใช้งาน แต่ไม่ใช่เพื่อการขายฟอนต์เป็นหลัก
+5. หากคุณต้องการดัดแปลงฟอนต์เพื่อใช้งานเป็นการส่วนตัว สามารถทำได้ แต่ถ้าทำเพื่อขายหรือรับจ้างผลิต คุณจะต้องได้รับอนุญาตจากเจ้าของฟอนต์ก่อนเท่านั้น
 EOF

 %build
@@ -133,13 +65,9 @@ mv "THSarabunNew BoldItalic.ttf"	"TH SarabunNew BoldItalic.ttf"
 mv "THSarabunNew Italic.ttf"		"TH SarabunNew Italic.ttf"
 mv "THSarabunNew.ttf"				"TH SarabunNew.ttf"

-install -Dm644 %{SOURCE1} %buildroot/%{_sysconfdir}/fonts/conf.d/15-supercede-sarabun.conf
-

 %files
 %license LICENSE
-%dir %{_datadir}/fonts/sipa/
-

 %{lua:
 for variant in (rpm.expand("%variants")):gmatch("[^ ]+") do
@@ -148,13 +76,9 @@ for variant in (rpm.expand("%variants")):gmatch("[^ ]+") do
 	print("%files -n "..name.."\n")
 	print("%license LICENSE\n")
 	print("/usr/share/fonts/sipa/TH?"..v:gsub(" ", "?").."*\n")
-	if name == "th-sarabunnew-fonts" then
-        print("/etc/fonts/conf.d/15-supercede-sarabun.conf\n")
-    end
 end
 }

-
 %changelog
 * Sun Jun 11 2023 windowsboy111 <windowsboy111@fyralabs.com> - 20200217-1
 - Initial package
@@ -0,0 +1,36 @@
+From 5529e8ac8f3232ec6233e33286834548e1d8018d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Sun, 8 Oct 2023 22:10:33 +0200
+Subject: [PATCH] <cstdint>
+
+---
+ src/reshade/source/effect_parser_stmt.cpp | 1 +
+ src/reshade/source/effect_token.hpp       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/reshade/source/effect_parser_stmt.cpp b/src/reshade/source/effect_parser_stmt.cpp
+index 7829729..f126be2 100644
+--- a/src/reshade/source/effect_parser_stmt.cpp
+++ b/src/reshade/source/effect_parser_stmt.cpp
+@@ -9,6 +9,7 @@
+ #include <cctype> // std::toupper
+ #include <cassert>
+ #include <functional>
+#include <limits>
+ #include <string_view>
+ 
+ struct on_scope_exit
+diff --git a/src/reshade/source/effect_token.hpp b/src/reshade/source/effect_token.hpp
+index 072d439..e4bb633 100644
+--- a/src/reshade/source/effect_token.hpp
+++ b/src/reshade/source/effect_token.hpp
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
+#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+-- 
+2.41.0
@@ -0,0 +1,7 @@
+project pkg {
+    arches = ["x86_64", "aarch64", "i386"]
+    rpm {
+        spec = "gamescope-legacy.spec"
+        mock = 1
+    }
+}
@@ -0,0 +1,129 @@
+%global libliftoff_minver 0.4.1
+%global reshade_commit 4245743a8c41abbe3dc73980c1810fe449359bf1
+%global reshade_shortcommit %(c=%{reshade_commit}; echo ${c:0:7})
+%global _default_patch_fuzz 2
+
+
+# =============================================================================
+# IMPORTANT: This package should *not* have an update script, at least not one that
+# tracks upstream Gamescope from Valve. This package is intended to be a legacy
+# build for Polaris and older GPUs from AMD, and should not be updated to the
+# latest version.
+# 
+# This package however, should be obsoleted once https://github.com/ValveSoftware/gamescope/issues/1218
+# is finally resolved, and Gamescope's Wayland backend has a fallback for GPUs without Vulkan DRM modifiers.
+# =============================================================================
+
+
+Name:           gamescope-legacy
+Version:        3.14.2
+Release:        1%{?dist}
+Summary:        Legacy builds of gamescope, a micro-compositor for video games on Wayland
+Packager:       Cappy Ishihara <cappy@fyralabs.com>
+License:        BSD
+URL:            https://github.com/ValveSoftware/gamescope
+Source0:        %{url}/archive/%{version}/gamescope-%{version}.tar.gz
+# Create stb.pc to satisfy dependency('stb')
+Source1:        stb.pc
+Source2:        https://github.com/Joshua-Ashton/reshade/archive/%{reshade_commit}/reshade-%{reshade_shortcommit}.tar.gz
+
+Patch0:         0001-cstdint.patch
+
+# https://hhd.dev/
+Patch1:         v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch
+
+# ChimeraOS
+Patch2:         legacy-720p.patch
+
+BuildRequires:  meson >= 0.54.0
+BuildRequires:  ninja-build
+BuildRequires:  cmake
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  glm-devel
+BuildRequires:  google-benchmark-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXcursor-devel
+BuildRequires:  pkgconfig(libdisplay-info)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xdamage)
+BuildRequires:  pkgconfig(xcomposite)
+BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xxf86vm)
+BuildRequires:  pkgconfig(xtst)
+BuildRequires:  pkgconfig(xres)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(vulkan)
+BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(wayland-protocols) >= 1.17
+BuildRequires:  pkgconfig(xkbcommon)
+BuildRequires:  pkgconfig(sdl2)
+BuildRequires:  pkgconfig(libpipewire-0.3)
+BuildRequires:  pkgconfig(libavif)
+BuildRequires:  (pkgconfig(wlroots) >= 0.17.0 with pkgconfig(wlroots) < 0.18)
+BuildRequires:  (pkgconfig(libliftoff) >= 0.4.1 with pkgconfig(libliftoff) < 0.5)
+BuildRequires:  pkgconfig(libcap)
+BuildRequires:  pkgconfig(hwdata)
+BuildRequires:  spirv-headers-devel
+# Enforce the the minimum EVR to contain fixes for all of:
+# CVE-2021-28021 CVE-2021-42715 CVE-2021-42716 CVE-2022-28041 CVE-2023-43898
+# CVE-2023-45661 CVE-2023-45662 CVE-2023-45663 CVE-2023-45664 CVE-2023-45666
+# CVE-2023-45667
+BuildRequires:  stb_image-devel >= 2.28^20231011gitbeebb24-12
+# Header-only library: -static is for tracking per guidelines
+BuildRequires:  stb_image-static
+BuildRequires:  stb_image_resize-devel
+BuildRequires:  stb_image_resize-static
+BuildRequires:  stb_image_write-devel
+BuildRequires:  stb_image_write-static
+BuildRequires:  vkroots-devel
+BuildRequires:  /usr/bin/glslangValidator
+
+# libliftoff hasn't bumped soname, but API/ABI has changed for 0.2.0 release
+Requires:       libliftoff%{?_isa} >= %{libliftoff_minver}
+Requires:       xorg-x11-server-Xwayland
+
+Requires:       terra-gamescope-libs
+Requires:       terra-gamescope-libs(x86-32)
+
+Recommends:     mesa-dri-drivers
+Recommends:     mesa-vulkan-drivers
+
+%description
+%{name} is the micro-compositor optimized for running video games on Wayland. This is a legacy build primarily intended for use by Polaris GPUs.
+
+%prep
+%autosetup -p1 -a2 -N -n gamescope-%{version}
+# Install stub pkgconfig file
+mkdir -p pkgconfig
+cp %{SOURCE1} pkgconfig/stb.pc
+
+# Replace spirv-headers include with the system directory
+sed -i 's^../thirdparty/SPIRV-Headers/include/spirv/^/usr/include/spirv/^' src/meson.build
+
+# Push in reshade from sources instead of submodule
+rm -rf src/reshade && mv reshade-%{reshade_commit} src/reshade
+
+%autopatch -p1
+
+%build
+export PKG_CONFIG_PATH=pkgconfig
+%meson -Dpipewire=enabled -Denable_gamescope_wsi_layer=false -Denable_openvr_support=false -Dforce_fallback_for=[]
+%meson_build
+
+%install
+%meson_install
+# Rename to not conflict with the base package
+mv %{buildroot}%{_bindir}/gamescope %{buildroot}%{_bindir}/gamescope-legacy
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/gamescope-legacy
+
+%changelog
+%autochangelog
+
@@ -0,0 +1,33 @@
+From 072ebb67cd4a88fd0f5db22a92a46f8316f28a46 Mon Sep 17 00:00:00 2001
+From: Matthew Anderson <ruinairas1992@gmail.com>
+Date: Tue, 25 Jul 2023 18:05:05 -0500
+Subject: [PATCH] Set default to native resolution of display if Steam tries to
+ force 720p/800p
+
+You can select 720p/800p still in game or via Steam's resolution setting
+Steam > Settings > Display > Resolution
+
+This effectively reverts the changes Valve made a year ago forcing us to
+720p.
+---
+ src/steamcompmgr.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
+index 52dd8d1cf..5b0fa6e52 100644
+--- a/src/steamcompmgr.cpp
+++ b/src/steamcompmgr.cpp
+@@ -5202,6 +5202,13 @@ handle_property_notify(xwayland_ctx_t *ctx, XPropertyEvent *ev)
+ 			size_t server_idx = size_t{ xwayland_mode_ctl[ 0 ] };
+ 			int width = xwayland_mode_ctl[ 1 ];
+ 			int height = xwayland_mode_ctl[ 2 ];
+
+			if ( g_nOutputWidth != 1280 && width == 1280 )
+			{
+				width = g_nOutputWidth;
+				height = g_nOutputHeight;
+			}
+
+ 			bool allowSuperRes = !!xwayland_mode_ctl[ 3 ];
+ 
+ 			if ( !allowSuperRes )
@@ -0,0 +1,7 @@
+prefix=/usr
+includedir=${prefix}/include/stb
+
+Name: stb
+Description: Single-file public domain libraries for C/C++
+Version: 0.1.0
+Cflags: -I${includedir}
@@ -0,0 +1,39 @@
+From 35e001dc59a44227d670c667a85a6ef5472eee58 Mon Sep 17 00:00:00 2001
+From: antheas <git@antheas.dev>
+Date: Sat, 20 Jul 2024 01:23:19 +0300
+Subject: [PATCH v2] always send ctrl+1/2 to steam's wayland session
+
+---
+ src/wlserver.cpp | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/wlserver.cpp b/src/wlserver.cpp
+index 1852be9..7de737d 100644
+--- a/src/wlserver.cpp
+++ b/src/wlserver.cpp
+@@ -369,7 +369,12 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data)
+ 		keysym == XKB_KEY_XF86AudioLowerVolume ||
+ 		keysym == XKB_KEY_XF86AudioRaiseVolume ||
+ 		keysym == XKB_KEY_XF86PowerOff;
+-	if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && forbidden_key )
+
+	// Check for steam keys (ctrl + 1/2)
+	bool is_steamshortcut = (keyboard->wlr->modifiers.depressed & WLR_MODIFIER_CTRL) && (keysym == XKB_KEY_1 ||
+																						 keysym == XKB_KEY_2);
+
+	if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && (forbidden_key || is_steamshortcut) )
+ 	{
+ 		// Always send volume+/- to root server only, to avoid it reaching the game.
+ 		struct wlr_surface *old_kb_surf = wlserver.kb_focus_surface;
+@@ -378,6 +383,9 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data)
+ 		{
+ 			wlserver_keyboardfocus( new_kb_surf, false );
+ 			wlr_seat_set_keyboard( wlserver.wlr.seat, keyboard->wlr );
+			// Send modifiers to steam for it to work
+			if (is_steamshortcut)
+				wlr_seat_keyboard_notify_modifiers(wlserver.wlr.seat, &keyboard->wlr->modifiers);
+ 			wlr_seat_keyboard_notify_key( wlserver.wlr.seat, event->time_msec, event->keycode, event->state );
+ 			wlserver_keyboardfocus( old_kb_surf, false );
+ 			return;
+-- 
+2.45.2
@@ -1,8 +1,8 @@
 %define debug_package %nil

-%global commit 5ff18afa7e4a9a0cce772663f1faf5ca8f92626e
+%global commit 2b9525daff0a28a17bc99d3a54998306584f6a86
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250120
+%global commit_date 20250105

 Name:           gamescope-session
 Version:        %commit_date.%shortcommit
@@ -30,9 +30,7 @@ cp -r usr %buildroot/
 %license LICENSE
 %_bindir/export-gpu
 %_bindir/gamescope-session-plus
+%_libexecdir/gamescope-sdl-workaround
 %_userunitdir/gamescope-session-plus@.service
 %_datadir/gamescope-session-plus/device-quirks
 %_datadir/gamescope-session-plus/gamescope-session-plus
-
-%changelog
-%autochangelog
@@ -1,5 +1,5 @@
 Name:           inputplumber
-Version:        0.42.0
+Version:        0.40.1
 Release:        1%?dist
 Summary:        Open source input router and remapper daemon for Linux
 License:        GPL-3.0-or-later
@@ -1,5 +1,5 @@
 Name:           opengamepadui
-Version:        0.35.8
+Version:        0.35.7
 Release:        1%?dist
 Summary:        Open source gamepad-native game launcher and overlay

@@ -3,7 +3,7 @@
 %define __strip /bin/true

 Name:			osu-lazer
-Version:		2025.118.2
+Version:		2025.101.0
 Release:		1%?dist
 Summary:		The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
 ExclusiveArch:	x86_64
@@ -1,11 +1,11 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit fdb4159f2aec55d09830289e5eec6b74c1bfde4b
+%global commit f17599c8b870072e2da759c85df060f7088bf388
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit 23b955121b8217c1c348a9ed2483167a6f3ff4ad

-%global commit_date 20250122
+%global commit_date 20250118
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit d6d28a9c79b1f7d700458ee3aa56a38e1216bb41
+%global commit 2af9ddc286b4f0c6d467fb7a95a60a1e10437744
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.3.1
-%global commit_date 20250124
+%global commit_date 20250118
 %global debug_package %nil

 Name:			nim-nightly
@@ -2,7 +2,4 @@ project pkg {
 	rpm {
 	  spec = "python3-protobuf.spec"
 	}
-        labels {
-          subrepo = "extras"
-     }
 }
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "python3-ruff.spec"
+	}
+}
@@ -0,0 +1,45 @@
+%define debug_package %{nil}
+
+Name:			python3-ruff
+Version:		0.9.2
+Release:		1%?dist
+Summary:		An extremely fast Python linter, written in Rust
+License:		MIT
+URL:			https://beta.ruff.rs/
+Source0:		https://github.com/astral-sh/ruff/archive/refs/tags/%{version}.tar.gz
+BuildRequires:	python3-installer python3-pip maturin cargo
+Provides:		python3.11dist(ruff) = %{version}
+
+%description
+Ruff aims to be orders of magnitude faster than alternative tools while
+integrating more functionality behind a single, common interface.
+
+%prep
+%autosetup -n ruff-%{version}
+
+%build
+maturin build --release --strip --all-features # --locked
+
+%install
+pip3 install --root=%{buildroot} target/wheels/*.whl
+rm -rf %{python3_sitelib}/ruff/__pycache__
+
+%files
+%doc README.md
+%license LICENSE
+/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/METADATA
+/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/RECORD
+/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/WHEEL
+/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/INSTALLER
+/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/REQUESTED
+/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/direct_url.json
+/usr/lib64/python*/site-packages/ruff-%{version}.dist-info/licenses/LICENSE
+/usr/lib64/python*/site-packages/ruff/__init__.py
+/usr/lib64/python*/site-packages/ruff/__main__.py
+/usr/lib64/python*/site-packages/ruff/__pycache__/*.cpython-*.pyc
+/usr/bin/ruff
+
+%changelog
+* Mon Jan 23 2023 windowsboy111 <wboy111@outlook.com> - 0.0.229
+- Initial package.
+
@@ -0,0 +1 @@
+rpm.version(pypi("ruff"));
@@ -7,7 +7,7 @@ Summary:        Bash scripts that integrate bat with various command line tools

 License:        MIT
 URL:            https://github.com/eth-p/bat-extras
-Source0:        %{url}/archive/v%{version}.tar.gz
+Source0:        https://github.com/eth-p/bat-extras/archive/refs/tags/v%{version}.tar.gz

 BuildRequires:  bash
 Requires:       bash
@@ -17,23 +17,25 @@ BuildArch:      noarch
 %{summary}.

 %prep
-%autosetup
+%autosetup -n bat-extras-%{version}


 %build
+# ./build.sh --no-verify


 %install
-./build.sh --install --prefix=%{buildroot}%{_prefix} --no-verify
+./build.sh --install --prefix=%{buildroot}%{_prefix}

 mkdir -p %{buildroot}%{_mandir}/man1/
 cp -v man/* %{buildroot}%{_mandir}/man1/

-chmod -x %{buildroot}%{_mandir}/man1/*
+chmod -x %_mandir/man1/*


 %files
 %license LICENSE.md
+%doc doc/
 %{_bindir}/bat*
 %{_bindir}/prettybat
 %{_mandir}/man1/*
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "rust-terra-maturin.spec"
+	}
+}
@@ -0,0 +1,401 @@
+# Generated by rust2rpm 26
+#bcond_without check
+
+%global crate maturin
+# Don't mangle shebangs
+%global __brp_mangle_shebangs %{nil}
+
+# Exclude input files from mangling
+%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
+
+Name:           rust-terra-maturin
+Version:        1.8.1
+Release:        1%?dist
+Summary:        Build and publish Rust crates as Python packages
+
+License:        MIT OR Apache-2.0
+URL:            https://crates.io/crates/maturin
+Source:         %{crates_source}
+
+BuildRequires:  anda-srpm-macros cargo-rpm-macros >= 24 mold
+
+%global _description %{expand:
+Build and publish crates with pyo3, cffi and uniffi bindings as well as
+rust binaries as python packages.}
+
+%description %{_description}
+
+%package     -n terra-%{crate}
+Summary:        %{summary}
+License:        ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND 0BSD AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSD-2-Clause) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND BSD-3-Clause AND BSL-1.0 AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR LGPL-3.0-or-later) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND Unicode-3.0 AND (Unlicense OR MIT) AND (Zlib OR Apache-2.0 OR MIT)
+# LICENSE.dependencies contains a full license breakdown
+
+%description -n terra-%{crate} %{_description}
+
+%files       -n terra-%{crate}
+%license license-apache
+%license license-mit
+%license LICENSE.dependencies
+%doc Changelog.md
+%doc README.md
+%{_bindir}/maturin
+
+%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-apache
+%license %{crate_instdir}/license-mit
+%doc %{crate_instdir}/Changelog.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
+
+%package     -n %{name}+default-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+bytesize-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+bytesize-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "bytesize" feature of the "%{crate}" crate.
+
+%files       -n %{name}+bytesize-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+cargo-xwin-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+cargo-xwin-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "cargo-xwin" feature of the "%{crate}" crate.
+
+%files       -n %{name}+cargo-xwin-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+cargo-zigbuild-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+cargo-zigbuild-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "cargo-zigbuild" feature of the "%{crate}" crate.
+
+%files       -n %{name}+cargo-zigbuild-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+cli-completion-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+cli-completion-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "cli-completion" feature of the "%{crate}" crate.
+
+%files       -n %{name}+cli-completion-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+configparser-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+configparser-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "configparser" feature of the "%{crate}" crate.
+
+%files       -n %{name}+configparser-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+console-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+console-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "console" feature of the "%{crate}" crate.
+
+%files       -n %{name}+console-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+cross-compile-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+cross-compile-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "cross-compile" feature of the "%{crate}" crate.
+
+%files       -n %{name}+cross-compile-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+dialoguer-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+dialoguer-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "dialoguer" feature of the "%{crate}" crate.
+
+%files       -n %{name}+dialoguer-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+faster-tests-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+faster-tests-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "faster-tests" feature of the "%{crate}" crate.
+
+%files       -n %{name}+faster-tests-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+full-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+full-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "full" feature of the "%{crate}" crate.
+
+%files       -n %{name}+full-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+human-panic-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+human-panic-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "human-panic" feature of the "%{crate}" crate.
+
+%files       -n %{name}+human-panic-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+keyring-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+keyring-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "keyring" feature of the "%{crate}" crate.
+
+%files       -n %{name}+keyring-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+log-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+log-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "log" feature of the "%{crate}" crate.
+
+%files       -n %{name}+log-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+minijinja-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+minijinja-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "minijinja" feature of the "%{crate}" crate.
+
+%files       -n %{name}+minijinja-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+multipart-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+multipart-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "multipart" feature of the "%{crate}" crate.
+
+%files       -n %{name}+multipart-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+native-tls-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+native-tls-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "native-tls" feature of the "%{crate}" crate.
+
+%files       -n %{name}+native-tls-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+password-storage-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+password-storage-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "password-storage" feature of the "%{crate}" crate.
+
+%files       -n %{name}+password-storage-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+rustls-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+rustls-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "rustls" feature of the "%{crate}" crate.
+
+%files       -n %{name}+rustls-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+scaffolding-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+scaffolding-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "scaffolding" feature of the "%{crate}" crate.
+
+%files       -n %{name}+scaffolding-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+schemars-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+schemars-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "schemars" feature of the "%{crate}" crate.
+
+%files       -n %{name}+schemars-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+unicode-xid-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+unicode-xid-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "unicode-xid" feature of the "%{crate}" crate.
+
+%files       -n %{name}+unicode-xid-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+upload-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+upload-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "upload" feature of the "%{crate}" crate.
+
+%files       -n %{name}+upload-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+ureq-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+ureq-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "ureq" feature of the "%{crate}" crate.
+
+%files       -n %{name}+ureq-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+wild-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+wild-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "wild" feature of the "%{crate}" crate.
+
+%files       -n %{name}+wild-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+xwin-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+xwin-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "xwin" feature of the "%{crate}" crate.
+
+%files       -n %{name}+xwin-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+zig-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+zig-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "zig" feature of the "%{crate}" crate.
+
+%files       -n %{name}+zig-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep_online
+
+%build
+#cargo_build
+%{cargo_license_summary_online}
+%{cargo_license_online} > LICENSE.dependencies
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(gh("PyO3/maturin"));
@@ -1,9 +1,5 @@
 project pkg {
-    arches = ["x86_64", "aarch64", "i386"]
  rpm {
    spec = "davs2.spec"
  }
-  labels {
-   mock = 1
-   }
 }
@@ -55,7 +55,7 @@ cd build/linux
 %configure \
    --bit-depth='8' \
    --chroma-format='all' \
-%ifarch aarch64 %ix86
+%ifarch aarch64
    --disable-asm \
 %endif
    --disable-static \
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "dbus-test-runner.spec"
+	}
+}
@@ -0,0 +1,77 @@
+Name:           dbus-test-runner
+Version:        19.04.0
+Release:        2%?dist
+Summary:        A small utility to run executables under a new DBus session for testing
+License:        GPL-3.0
+URL:            https://launchpad.net/dbus-test-runner
+Source0:        %{url}/19.04/%{version}/+download/dbus-test-runner-%{version}.tar.gz
+Source1:        https://salsa.debian.org/debian/dbus-test-runner/-/raw/debian/sid/debian/man/dbus-test-runner.1
+Source2:        https://salsa.debian.org/debian/dbus-test-runner/-/archive/debian/sid/dbus-test-runner-debian-sid.tar.gz
+
+BuildRequires: automake libtool mate-common
+BuildRequires: pkgconfig
+BuildRequires: make
+BuildRequires: g++
+BuildRequires: gcc
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(gio-unix-2.0)
+BuildRequires: pkgconfig(dbus-glib-1)
+
+%description
+A small little utility to run a couple of executables under a new DBus session
+for testing.
+
+%package devel
+Summary:  Development files for dbus-test-runner
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Development files and headers for dbus-test-runner.
+
+%prep
+%autosetup -n dbus-test-runner-%{version}
+
+# Apply patch fixes from Debian
+tar -xf '%{SOURCE2}'
+for i in dbus-test-runner-debian-sid/debian/patches/*.patch; do patch -p1 < $i; done
+
+%build
+NOCONFIGURE=1 autoreconf -fi
+
+%configure
+%make_build
+
+%install
+%make_install
+
+# Don't package static files
+rm -rf %{buildroot}%{_libdir}/libdbustest.a
+
+# Install manpage
+install -dm755 %{buildroot}%{_mandir}/man1/
+install -Dm644 %{SOURCE1} %{buildroot}%{_mandir}/man1/
+
+%files
+%doc README
+%license COPYING
+%{_libdir}/libdbustest.so.*
+%dir %{_libexecdir}/dbus-test-runner
+%{_libexecdir}/dbus-test-runner/dbus-test-watchdog
+%{_bindir}/dbus-test-runner
+%{_mandir}/man1/dbus-test-runner.1.gz
+%dir %{_datadir}/dbus-test-runner
+%{_datadir}/dbus-test-runner/*.conf
+%{_datadir}/dbus-test-runner/dbus-test-bustle-handler
+
+%files devel
+%doc README
+%license COPYING
+%dir %{_includedir}/libdbustest-1
+%dir %{_includedir}/libdbustest-1/libdbustest
+%{_includedir}/libdbustest-1/libdbustest/*.h
+%{_libdir}/libdbustest.so
+%{_libdir}/pkgconfig/dbustest-1.pc
+
+%changelog
+%autochangelog
@@ -0,0 +1,3 @@
+let html = get("https://launchpad.net/dbus-test-runner");
+let v = find("Latest version is ([\\d.]+)", html, 1);
+rpm.version(v);
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "gtk4-layer-shell.spec"
+	}
+}
@@ -0,0 +1,77 @@
+Name:			gtk4-layer-shell
+Version:		1.0.4
+Release:		1%?dist
+Summary:		Library to build desktop components using Layer Shell Wayland protocol and GTK4
+License:		MIT
+URL:			https://github.com/wmww/gtk4-layer-shell
+Source0:		%url/archive/refs/tags/v%version.tar.gz
+BuildRequires:	meson ninja-build python3.11 vala
+BuildRequires:	libwayland-client gtk4-devel gobject-introspection gtk-doc
+BuildRequires:  pkgconfig(wayland-protocols)
+Recommends:		gtk4-layer-shell-devel
+
+%description
+A library for using the Layer Shell Wayland protocol with GTK4. With this
+library you can build desktop shell components such as panels, notifications
+and wallpapers. You can use it to anchor your windows to a corner or edge of
+the output, or stretch them across the entire output. This Library is
+compatible with C, C++ and any language that supports GObject introspection
+files (Python, Vala, etc).
+
+
+%package doc
+Summary: Documentation files for gtk4-layer-shell generated by gtk-doc
+
+%description doc
+%summary.
+
+
+%package vapi
+Summary: Vapi data for gtk4-layer-shell
+
+%description vapi
+%summary.
+
+
+%package devel
+Summary: Development files for gtk4-layer-shell
+Requires: gtk4-layer-shell
+
+%description devel
+%summary.
+
+
+%prep
+%autosetup
+
+%build
+%meson -Ddocs=true
+%meson_build
+
+%install
+%meson_install
+
+
+%files
+%doc README.md
+%license LICENSE
+/usr/lib64/girepository-1.0/Gtk4LayerShell-1.0.typelib
+
+%files devel
+/usr/include/gtk4-layer-shell/gtk4-layer-shell.h
+/usr/lib64/libgtk4-layer-shell.so*
+/usr/lib64/pkgconfig/gtk4-layer-shell-0.pc
+/usr/share/gir-1.0/Gtk4LayerShell-1.0.gir
+
+%files doc
+/usr/share/gtk-doc/html/gtk4-layer-shell/
+
+
+%files vapi
+/usr/share/vala/vapi/gtk4-layer-shell-0.deps
+/usr/share/vala/vapi/gtk4-layer-shell-0.vapi
+
+
+%changelog
+* Fri Apr 28 2023 windowsboy111 <windowsboy111@fyralabs.com>
+- Initial package.
@@ -0,0 +1 @@
+rpm.version(gh("wmww/gtk4-layer-shell"));
--- a/Show More
+++ b/Show More