From b5f1f37b7852cab4045c08175999575398577d6e Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 11 Sep 2024 23:34:25 -0700 Subject: [PATCH] switch helium and hydrogen to proper naming (#2058) (#2066) (cherry picked from commit 15c4ad3494a0b2c7d790a6a5c423368e9308bd8a) Co-authored-by: Jaiden Riordan --- anda/lib/libhelium/libhelium.spec | 6 +++--- anda/themes/{tau-helium => helium-gtk-theme}/anda.hcl | 2 +- .../helium-gtk-theme.spec} | 6 ++++-- anda/themes/{tau-helium => helium-gtk-theme}/update.rhai | 0 anda/themes/{tau-hydrogen => hydrogen-icon-theme}/anda.hcl | 2 +- .../hydrogen-icon-theme.spec} | 6 ++++-- .../{tau-hydrogen => hydrogen-icon-theme}/update.rhai | 0 comps.xml | 4 ++-- 8 files changed, 15 insertions(+), 11 deletions(-) rename anda/themes/{tau-helium => helium-gtk-theme}/anda.hcl (58%) rename anda/themes/{tau-helium/tau-helium.spec => helium-gtk-theme/helium-gtk-theme.spec} (97%) rename anda/themes/{tau-helium => helium-gtk-theme}/update.rhai (100%) rename anda/themes/{tau-hydrogen => hydrogen-icon-theme}/anda.hcl (56%) rename anda/themes/{tau-hydrogen/tau-hydrogen.spec => hydrogen-icon-theme/hydrogen-icon-theme.spec} (85%) rename anda/themes/{tau-hydrogen => hydrogen-icon-theme}/update.rhai (100%) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 3db7f912f8..e82cdaea02 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: 1%?dist +Release: 2%?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 @@ -22,8 +22,8 @@ BuildRequires: pkgconfig(gtk4) >= 4.4 Requires: gtk4 >= 4.4 Requires: glib2 >= 2.66.0 Requires: libgee >= 0.20 -Requires: tau-helium >= 1.1.25 -Requires: tau-hydrogen +Requires: helium-gtk-theme +Requires: hydrogen-icon-theme %description The Application Framework for tauOS apps diff --git a/anda/themes/tau-helium/anda.hcl b/anda/themes/helium-gtk-theme/anda.hcl similarity index 58% rename from anda/themes/tau-helium/anda.hcl rename to anda/themes/helium-gtk-theme/anda.hcl index a415f2f5ef..92079f7601 100644 --- a/anda/themes/tau-helium/anda.hcl +++ b/anda/themes/helium-gtk-theme/anda.hcl @@ -1,6 +1,6 @@ project pkg { arches = ["x86_64"] rpm { - spec = "tau-helium.spec" + spec = "helium-gtk-theme.spec" } } diff --git a/anda/themes/tau-helium/tau-helium.spec b/anda/themes/helium-gtk-theme/helium-gtk-theme.spec similarity index 97% rename from anda/themes/tau-helium/tau-helium.spec rename to anda/themes/helium-gtk-theme/helium-gtk-theme.spec index ec964d20be..b532cd2af3 100644 --- a/anda/themes/tau-helium/tau-helium.spec +++ b/anda/themes/helium-gtk-theme/helium-gtk-theme.spec @@ -1,9 +1,9 @@ %global ver 1.8.23 Summary: tauOS GTK/GNOME Shell Themes -Name: tau-helium +Name: helium-gtk-theme Version: %(echo %ver | sed 's/-/./g') -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0 URL: https://github.com/tau-OS/tau-helium Source0: https://github.com/tau-OS/tau-helium/archive/refs/tags/%{ver}.tar.gz @@ -12,6 +12,8 @@ BuildRequires: sass BuildRequires: meson BuildRequires: ninja-build BuildRequires: fdupes +Provides: tau-helium = %{version}-%{release} +Obsoletes: tau-helium < 1.8.23-2 %description A set of GTK/GNOME Shell Themes for tauOS diff --git a/anda/themes/tau-helium/update.rhai b/anda/themes/helium-gtk-theme/update.rhai similarity index 100% rename from anda/themes/tau-helium/update.rhai rename to anda/themes/helium-gtk-theme/update.rhai diff --git a/anda/themes/tau-hydrogen/anda.hcl b/anda/themes/hydrogen-icon-theme/anda.hcl similarity index 56% rename from anda/themes/tau-hydrogen/anda.hcl rename to anda/themes/hydrogen-icon-theme/anda.hcl index 08b5fd16c9..90939b190b 100644 --- a/anda/themes/tau-hydrogen/anda.hcl +++ b/anda/themes/hydrogen-icon-theme/anda.hcl @@ -1,6 +1,6 @@ project pkg { arches = ["x86_64"] rpm { - spec = "tau-hydrogen.spec" + spec = "hydrogen-icon-theme.spec" } } diff --git a/anda/themes/tau-hydrogen/tau-hydrogen.spec b/anda/themes/hydrogen-icon-theme/hydrogen-icon-theme.spec similarity index 85% rename from anda/themes/tau-hydrogen/tau-hydrogen.spec rename to anda/themes/hydrogen-icon-theme/hydrogen-icon-theme.spec index 397cdc274b..f7ba7faa06 100644 --- a/anda/themes/tau-hydrogen/tau-hydrogen.spec +++ b/anda/themes/hydrogen-icon-theme/hydrogen-icon-theme.spec @@ -1,7 +1,7 @@ Summary: tauOS Icon Theme -Name: tau-hydrogen +Name: hydrogen-icon-theme Version: 1.0.16 -Release: 1%?dist +Release: 2%?dist License: GPL-3.0 URL: https://github.com/tau-OS/tau-hydrogen Source0: https://github.com/tau-OS/tau-hydrogen/archive/refs/tags/%{version}.tar.gz @@ -11,6 +11,8 @@ BuildRequires: ninja-build BuildRequires: librsvg2-tools BuildRequires: xcursorgen BuildRequires: fdupes +Provides: tau-hydrogen = %{version}-%{release} +Obsoletes: tau-hydrogen < 1.0.16-2 %description Hydrogen is the default icon theme in tauOS diff --git a/anda/themes/tau-hydrogen/update.rhai b/anda/themes/hydrogen-icon-theme/update.rhai similarity index 100% rename from anda/themes/tau-hydrogen/update.rhai rename to anda/themes/hydrogen-icon-theme/update.rhai diff --git a/comps.xml b/comps.xml index 58fc168b97..137a84b3cc 100644 --- a/comps.xml +++ b/comps.xml @@ -81,8 +81,8 @@ true libhelium - tau-helium - tau-hydrogen + helium-gtk-theme + hydrogen-icon-theme