Revert "chore: Update to 23.10.0 (rh#2235553)"

This reverts commit 893f89a2e4.

.gitignore

@@ -23,12 +23,3 @@
 /yaru-theme-23.04.1.tar.gz
 /yaru-theme-23.04.2.tar.gz
 /yaru-theme-23.04.4.tar.gz
-/yaru-theme-23.10.0.tar.gz
-/yaru-23.10.0.tar.gz
-/yaru-23.10.0-0ubuntu2.tar.gz
-/yaru-24.04.0.tar.gz
-/yaru-24.04.1-0ubuntu1.tar.gz
-/yaru-24.04.2-0ubuntu1.tar.gz
-/yaru-24.10.4-0ubuntu1.tar.gz
-/yaru-25.04.2-0ubuntu1.tar.gz
-/yaru-25.10.3-0ubuntu1.tar.gz

.packit.yaml

@@ -1,21 +0,0 @@
-copy_upstream_release_description: false
-upstream_package_name: yaru
-upstream_project_url: https://github.com/ubuntu/yaru
-
-jobs:
-  - job: pull_from_upstream
-    trigger: release
-    dist_git_branches:
-      - fedora-development
-
-  - job: koji_build
-    trigger: commit
-    allowed_pr_authors: ["atim"]
-    allowed_committers: ["atim"]
-    dist_git_branches:
-      - fedora-all
-
-  - job: bodhi_update
-    trigger: commit
-    dist_git_branches:
-      - fedora-branched

sources

@@ -1 +1 @@
-SHA512 (yaru-25.10.3-0ubuntu1.tar.gz) = 2ff3874ab1efa48554146d0fbacf7bd89a29c5cb79bfbd95522e54c024d431b4c5d7eb308ba4995519639a096380208b59ea8e2cf9b3a7cb615198355fcf4743
+SHA512 (yaru-theme-23.04.4.tar.gz) = 4fc83a9ddd6dfb41d94425b779fed9e448e437c444d52eb46642d8c2cdf46366e63c312150a9167850a02f9ceff062eb6f5fb6e22c75d792730bb3ca92523f31

yaru-theme.spec

@@ -1,23 +1,21 @@
-%global forgeurl https://github.com/ubuntu/yaru
-%global tag %{version}-0ubuntu1
 %global _license COPYING COPYING.LGPL-2.1 COPYING.LGPL-3.0 LICENSE_CCBYSA
 
 Name:       yaru-theme
-Version:    25.10.3
-%forgemeta
+Version:    23.04.4
 Release:    %autorelease
-Summary:    All Ubuntu Yaru GNOME themes
+Summary:    Ubuntu community theme "yaru"
 BuildArch:  noarch
 
-License:    GPL-3.0-or-later AND CC-BY-SA-4.0
+License:    GPLv3+ and CC-BY-SA
 URL:        https://community.ubuntu.com/c/desktop/theme-refresh
-Source0:    %{forgesource}
+Source0:    https://github.com/ubuntu/yaru/archive/%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires: meson
+BuildRequires: meson >= 0.59
 BuildRequires: sassc
 BuildRequires: pkgconfig(appstream-glib)
 
 Requires:   gnome-shell-theme-yaru = %{version}-%{release}
+Requires:   yaru-gtk2-theme = %{version}-%{release}
 Requires:   yaru-gtk3-theme = %{version}-%{release}
 Requires:   yaru-gtk4-theme = %{version}-%{release}
 Requires:   yaru-gtksourceview-theme = %{version}-%{release}
@@ -55,6 +53,19 @@ Suggests:       yaru-theme
 This package contains GNOME Shell Theme.
 
 
+%package     -n yaru-gtk2-theme
+Summary:        GTK+ 2 support for the Yaru GTK Theme
+
+Requires:       adwaita-gtk2-theme
+Requires:       gtk-murrine-engine
+
+Recommends:     yaru-gtk3-theme
+
+%description -n yaru-gtk2-theme %{_description}
+
+This package contains GTK+ 2 theme.
+
+
 %package     -n yaru-gtk3-theme
 Summary:        GTK+ 3 support for the Yaru GTK Theme
 
@@ -83,7 +94,7 @@ This package contains GTK 4 theme.
 
 %package     -n yaru-icon-theme
 Summary:        Yaru icon theme
-License:        CC-BY-SA-4.0
+License:        CC-BY-SA
 
 Requires:       hicolor-icon-theme
 
@@ -98,7 +109,7 @@ This package contains the icon theme.
 
 %package     -n yaru-sound-theme
 Summary:        Yaru sound theme
-License:        CC-BY-SA-4.0
+License:        CC-BY-SA
 
 %description -n yaru-sound-theme %{_description}
 
@@ -107,7 +118,7 @@ This package contains the sound theme following the XDG theming specification.
 
 %package     -n yaru-gtksourceview-theme
 Summary:        Yaru GtkSourceView theme
-License:        CC-BY-SA-4.0
+License:        CC-BY-SA
 
 %description -n yaru-gtksourceview-theme %{_description}
 
@@ -115,7 +126,7 @@ This package contains the GtkSourceView theme.
 
 
 %prep
-%forgeautosetup -p1
+%autosetup -n yaru-%{version}
 
 
 %build
@@ -125,10 +136,6 @@ This package contains the GtkSourceView theme.
 
 %install
 %meson_install
-# Remove GTK 2 theme
-# https://github.com/ubuntu/yaru/issues/4356
-rm -rf %{buildroot}%{_datadir}/themes/Yaru-*/gtk-2.0/
-rm -rf %{buildroot}%{_datadir}/themes/Yaru/gtk-2.0/
 
 rm  %{buildroot}%{_datadir}/glib-2.0/schemas/99_Yaru.gschema.override \
     %{buildroot}%{_datadir}/xsessions/Yaru-xorg.desktop \
@@ -141,6 +148,24 @@ touch %{buildroot}%{_datadir}/icons/Yaru/icon-theme.cache
 gtk-update-icon-cache --force %{_datadir}/icons/Yaru &>/dev/null || :
 
 
+# Workaround for replace directory with symlink which was added in Yaru
+# * https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Replacement/#_scriptlet_to_replace_a_directory
+%pretrans -p <lua> -n gnome-shell-theme-yaru
+path = "%{_datadir}/themes/Yaru-dark/gnome-shell"
+st = posix.stat(path)
+if st and st.type == "directory" then
+  status = os.rename(path, path .. ".rpmmoved")
+  if not status then
+    suffix = 0
+    while not status do
+      suffix = suffix + 1
+      status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
+    end
+    os.rename(path, path .. ".rpmmoved")
+  end
+end
+
+
 %files
 %license %{_license}
 %doc AUTHORS CONTRIBUTING.md README.md
@@ -151,8 +176,55 @@ gtk-update-icon-cache --force %{_datadir}/icons/Yaru &>/dev/null || :
 %{_datadir}/gnome-shell/modes/yaru.json
 %{_datadir}/gnome-shell/theme/Yaru*/
 %{_datadir}/themes/Yaru-*/index.theme
-%{_datadir}/themes/Yaru*/gnome-shell
+%{_datadir}/themes/Yaru-bark-dark/gnome-shell
+%{_datadir}/themes/Yaru-bark/gnome-shell
+%{_datadir}/themes/Yaru-blue-dark/gnome-shell
+%{_datadir}/themes/Yaru-blue/gnome-shell
+%{_datadir}/themes/Yaru-dark/gnome-shell
+%{_datadir}/themes/Yaru-magenta-dark/gnome-shell
+%{_datadir}/themes/Yaru-magenta/gnome-shell
+%{_datadir}/themes/Yaru-olive-dark/gnome-shell
+%{_datadir}/themes/Yaru-olive/gnome-shell
+%{_datadir}/themes/Yaru-prussiangreen-dark/gnome-shell
+%{_datadir}/themes/Yaru-prussiangreen/gnome-shell
+%{_datadir}/themes/Yaru-purple-dark/gnome-shell
+%{_datadir}/themes/Yaru-purple/gnome-shell
+%{_datadir}/themes/Yaru-red-dark/gnome-shell
+%{_datadir}/themes/Yaru-red/gnome-shell
+%{_datadir}/themes/Yaru-sage-dark/gnome-shell
+%{_datadir}/themes/Yaru-sage/gnome-shell
+%{_datadir}/themes/Yaru-viridian-dark/gnome-shell
+%{_datadir}/themes/Yaru-viridian/gnome-shell
+%{_datadir}/themes/Yaru/gnome-shell
 %{_datadir}/themes/Yaru/index.theme
+%dir %{_datadir}/themes/Yaru
+%dir %{_datadir}/themes/Yaru-bark-dark
+%dir %{_datadir}/themes/Yaru-bark
+%dir %{_datadir}/themes/Yaru-blue-dark
+%dir %{_datadir}/themes/Yaru-blue
+%dir %{_datadir}/themes/Yaru-dark
+%dir %{_datadir}/themes/Yaru-magenta-dark
+%dir %{_datadir}/themes/Yaru-magenta
+%dir %{_datadir}/themes/Yaru-olive-dark
+%dir %{_datadir}/themes/Yaru-olive
+%dir %{_datadir}/themes/Yaru-prussiangreen-dark
+%dir %{_datadir}/themes/Yaru-prussiangreen
+%dir %{_datadir}/themes/Yaru-purple-dark
+%dir %{_datadir}/themes/Yaru-purple
+%dir %{_datadir}/themes/Yaru-red-dark
+%dir %{_datadir}/themes/Yaru-red
+%dir %{_datadir}/themes/Yaru-sage-dark
+%dir %{_datadir}/themes/Yaru-sage
+%dir %{_datadir}/themes/Yaru-viridian-dark
+%dir %{_datadir}/themes/Yaru-viridian
+%ghost %{_datadir}/themes/Yaru-dark/gnome-shell.rpmmoved/
+
+%files -n yaru-gtk2-theme
+%license %{_license}
+%{_datadir}/themes/Yaru-*/gtk-2.0/
+%{_datadir}/themes/Yaru/gtk-2.0/
+%dir %{_datadir}/themes/Yaru
+%dir %{_datadir}/themes/Yaru-dark
 
 %files -n yaru-gtk3-theme
 %license %{_license}
@@ -180,7 +252,6 @@ gtk-update-icon-cache --force %{_datadir}/icons/Yaru &>/dev/null || :
 %files -n yaru-gtksourceview-theme
 %license %{_license}
 %{_datadir}/gtksourceview-*/styles/Yaru*.xml
-%{_datadir}/libgedit-gtksourceview-300/styles/Yaru*.xml
 
 
 %changelog