switch helium and hydrogen to proper naming (#2058) (#2066)

(cherry picked from commit 15c4ad3)

Co-authored-by: Jaiden Riordan <[email protected]>

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

anda/themes/tau-helium/anda.hcl → 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"
 	}
 }

anda/themes/tau-helium/tau-helium.spec → 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

anda/themes/tau-hydrogen/anda.hcl → 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"
 	}
 }

anda/themes/tau-hydrogen/tau-hydrogen.spec → 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

comps.xml

@@ -81,8 +81,8 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">libhelium</packagereq>
-      <packagereq type="default">tau-helium</packagereq>
-      <packagereq type="default">tau-hydrogen</packagereq>
+      <packagereq type="default">helium-gtk-theme</packagereq>
+      <packagereq type="default">hydrogen-icon-theme</packagereq>
     </packagelist>
   </group>
 </comps>