From 72a094d9d0fab50d37b08fdc9134fb35ab7dfcf1 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sat, 20 Jul 2024 11:40:53 +0700 Subject: [PATCH 1/4] feat: require hydrogen icon theme --- anda/lib/libhelium/libhelium.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index bbbccc9c46..72d52ad999 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -21,6 +21,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 From 882b68e76d4bafb59a3a057bc5a4c90d5f202114 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sat, 20 Jul 2024 11:52:22 +0700 Subject: [PATCH 2/4] fix: versioning --- anda/lib/libhelium/libhelium.spec | 10 ++++++---- anda/lib/libhelium/update.rhai | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 72d52ad999..7423843b29 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 's/-/~/g') Summary: The Application Framework for tauOS apps Name: libhelium -Version: 1.8.12.10 -Release: 1%?dist +Version: %{sanitized_ver} +Release: 2%?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 @@ -35,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")); From 6b0d328ca0a65db6c528ac28db33a1b70abbe38a Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sat, 20 Jul 2024 11:53:32 +0700 Subject: [PATCH 3/4] dont bump release beacuse it didnt build --- anda/lib/libhelium/libhelium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 7423843b29..933949374e 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -3,7 +3,7 @@ Summary: The Application Framework for tauOS apps Name: libhelium Version: %{sanitized_ver} -Release: 2%?dist +Release: 1%?dist License: GPL-3.0 URL: https://github.com/tau-OS/libhelium Source0: https://github.com/tau-OS/libhelium/archive/refs/tags/%{ver}.tar.gz From 4d58682348acaa66d7e228c519803e4bac5ca4ce Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sat, 20 Jul 2024 11:59:21 +0700 Subject: [PATCH 4/4] fix: sanitize libhelium version macro --- anda/lib/libhelium/libhelium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 933949374e..9a0c4b9938 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,5 +1,5 @@ %global ver 1.8.12-10 -%global sanitized_ver $(echo %{ver} | sed 's/-/~/g') +%global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g') Summary: The Application Framework for tauOS apps Name: libhelium Version: %{sanitized_ver}