From ca44747c986ec5924804e6953e337aa0c73a814a Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 19 Jul 2024 22:14:00 -0700 Subject: [PATCH] feat: require hydrogen icon theme (#1584) (#1586) * feat: require hydrogen icon theme * fix: versioning * dont bump release beacuse it didnt build * fix: sanitize libhelium version macro (cherry picked from commit 4a8ce403d0ca56666f99d889ec716a65f7a57c07) Co-authored-by: Cappy Ishihara --- anda/lib/libhelium/libhelium.spec | 9 ++++++--- anda/lib/libhelium/update.rhai | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index bbbccc9c46..9a0c4b9938 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,10 +1,12 @@ +%global ver 1.8.12-10 +%global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g') Summary: The Application Framework for tauOS apps Name: libhelium -Version: 1.8.12.10 +Version: %{sanitized_ver} Release: 1%?dist License: GPL-3.0 URL: https://github.com/tau-OS/libhelium -Source0: https://github.com/tau-OS/libhelium/archive/refs/tags/%{version}.tar.gz +Source0: https://github.com/tau-OS/libhelium/archive/refs/tags/%{ver}.tar.gz BuildRequires: sass BuildRequires: meson @@ -21,6 +23,7 @@ Requires: gtk4 >= 4.4 Requires: glib2 >= 2.66.0 Requires: libgee >= 0.20 Requires: tau-helium >= 1.1.25 +Requires: tau-hydrogen %description The Application Framework for tauOS apps @@ -34,7 +37,7 @@ This package contains the libraries and header files that are needed for writing applications with libhelium. %prep -%autosetup -n libhelium-%{version} +%autosetup -n libhelium-%{ver} %build %meson \ diff --git a/anda/lib/libhelium/update.rhai b/anda/lib/libhelium/update.rhai index 67592e6360..019b70b830 100644 --- a/anda/lib/libhelium/update.rhai +++ b/anda/lib/libhelium/update.rhai @@ -1 +1 @@ -rpm.version(gh("tau-OS/libhelium")); +rpm.global("ver",gh("tau-OS/libhelium"));