From 5ed2abb1fed30680648d90049677d0d5f8bda255 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 6 Mar 2026 16:39:12 -0800 Subject: [PATCH] fix: noctalia-qs revision shows %{commit since %{commit} isn't defined (#10298) (#10352) * fix package obsoletes, add commit definition, fix spacing on prefix * add changelog and fix conflicts * actually don't wanna change noctalia-shell * change update.rhai so commit auto updates! (cherry picked from commit dbb6d7b80d26f8edb2dcf3e31264c0712f5be83d) Co-authored-by: Willow Reed --- anda/desktops/noctalia-qs/noctalia-qs.spec | 25 ++++++++++++++-------- anda/desktops/noctalia-qs/update.rhai | 8 ++++++- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/anda/desktops/noctalia-qs/noctalia-qs.spec b/anda/desktops/noctalia-qs/noctalia-qs.spec index 0c65533880..ca929be0e3 100644 --- a/anda/desktops/noctalia-qs/noctalia-qs.spec +++ b/anda/desktops/noctalia-qs/noctalia-qs.spec @@ -1,12 +1,14 @@ -Name: noctalia-qs -Version: 0.0.5 -Release: 1%?dist -Summary: Flexible QtQuick based desktop shell toolkit -License: LGPL-3.0-only AND GPL-3.0-only -URL: https://github.com/noctalia-dev/noctalia-qs -Source0: https://github.com/noctalia-dev/noctalia-qs/archive/refs/tags/v%{version}.tar.gz +%global commit 1a02ba2ee11b1afa8ec9a94f8b6b652bf4f14e1d -Packager: Willow C Reed (willow@willowidk.dev) +Name: noctalia-qs +Version: 0.0.5 +Release: 2%?dist +Summary: Flexible QtQuick based desktop shell toolkit +License: LGPL-3.0-only AND GPL-3.0-only +URL: https://github.com/noctalia-dev/noctalia-qs +Source0: https://github.com/noctalia-dev/noctalia-qs/archive/refs/tags/v%{version}.tar.gz + +Packager: Willow C Reed (willow@willowidk.dev) BuildRequires: cmake BuildRequires: cmake(Qt6Core) @@ -33,7 +35,8 @@ BuildRequires: pkgconfig(CLI11) BuildRequires: glib2-devel BuildRequires: polkit-devel -Obsoletes: quickshell +Conflicts: quickshell +Provides: quickshell %description Flexible QtQuick based desktop shell toolkit. @@ -67,5 +70,9 @@ Flexible QtQuick based desktop shell toolkit. %{_libdir}/qt6/qml/Quickshell %changelog +* Thu Mar 05 2026 Willow C Reed +- Fix reision to actually be defined as a specific git commit since it never gets initialized rn +- Also fix that noctalia-qs is replacing quickshell overall and not just for noctlaia users + * Fri Feb 27 2026 Willow C Reed - Initial commit based on quickshell spec \ No newline at end of file diff --git a/anda/desktops/noctalia-qs/update.rhai b/anda/desktops/noctalia-qs/update.rhai index 61bd35a0e8..7872e1741f 100644 --- a/anda/desktops/noctalia-qs/update.rhai +++ b/anda/desktops/noctalia-qs/update.rhai @@ -1 +1,7 @@ -rpm.version(gh("noctalia-dev/noctalia-qs")); \ No newline at end of file +let release = get(`https://api.github.com/repos/noctalia-dev/noctalia-qs/tags`).json_arr()[0]; + +rpm.version(release.name); + +if rpm.changed() { + rpm.global("commit", release.commit.sha); +} \ No newline at end of file