Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -13,3 +13,22 @@
 /yaru-theme-20.10.6.1.tar.gz
 /yaru-theme-20.04.11.tar.gz
 /yaru-theme-21.04.1.tar.gz
+/yaru-theme-21.10.2.tar.gz
+/yaru-theme-22.04.1.tar.gz
+/yaru-theme-22.04.2.tar.gz
+/yaru-theme-22.04.4.tar.gz
+/yaru-theme-22.10.1.tar.gz
+/yaru-theme-22.10.2.tar.gz
+/yaru-theme-22.10.3.tar.gz
+/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

@@ -0,0 +1,21 @@
+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

changelog

@@ -0,0 +1,92 @@
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 22.04.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Apr 25 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 22.04.4-2
+- build: Add Requires gnome-shell-extension-user-theme
+
+* Mon Apr 25 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 22.04.4-1
+- chore(update): 22.04.4
+
+* Fri Feb 25 2022 Artem Polishchuk <ego.cordatus@gmail.com> - 22.04.1-1
+- chore(update): 22.04.1
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.10.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Sep 27 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 21.10.2-1
+- build(update): 21.10.2
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.04.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Apr 08 2021 Artem Polishchuk <ego.cordatus@gmail.com> - 21.04.1-2
+- build: Fixes
+
+* Tue Apr 06 2021 Artem Polishchuk <ego.cordatus@gmail.com> - 21.04.1-1
+- build(update): 21.04.1
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.10.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sun Oct 11 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.10.6.1-1
+- build(update): 20.10.6.1
+
+* Tue Oct  6 19:52:37 EEST 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.10.6-1
+- build(update): 20.10.6
+
+* Thu Sep 24 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.10.4-1
+- Update to 20.10.4
+
+* Fri Sep 11 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.10.3-1
+- Update to 20.10.3
+- Don't build yaru-unity-theme
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.04.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Apr 21 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.6-3
+- Workaround for replace directory with symlink which was added in Yaru | Thanks for tip @zawertun
+
+* Sat Apr 18 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.6-2
+- Add new 'yaru-unity-theme' subpackage
+
+* Fri Apr 17 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.6-1
+- Update to 20.04.6
+
+* Thu Apr 16 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.5-1
+- Update to 20.04.5
+
+* Tue Mar 24 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.4-1
+- Update to 20.04.4
+
+* Fri Feb 07 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.1-1
+- Update to 20.04.1
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.10.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jan 08 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 19.10.5-1
+- Update to 19.10.5
+
+* Thu Nov 21 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 19.10.4-1.20191118git1937b28
+- Update to latest git snapshot which contain broken gnome-shell theme fix
+
+* Fri Sep 27 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 19.10.3-1
+- Update to 19.10.3
+- Add new light variant
+- Drop fdupes
+
+* Tue Sep 10 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 19.10.1-2
+- Update to 19.10.1
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19.04.1-3.20190425git0ddb244
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Apr 26 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 19.04.1-2.20190425git0ddb244
+- Adapt for Fedora
+
+* Fri Jan 18 10:30:30 UTC 2019 - dead_mozay@opensuse.org
+- Update to version 19.04+20190117.f36189f4
+
+* Wed Jan 02 11:51:35 UTC 2019 - dead_mozay@opensuse.org
+- Update to version 18.10.7+20190101.1db0abb5

sources

@@ -1 +1 @@
-SHA512 (yaru-theme-21.04.1.tar.gz) = 0509567e72b9d01a309fb890b5ba1dc74fa167f4e2d4bc49e1e2bc72304addf516007d2d0b527bb0253b1f258621b28f37561f60189302bae30553db5214ee68
+SHA512 (yaru-25.10.3-0ubuntu1.tar.gz) = 2ff3874ab1efa48554146d0fbacf7bd89a29c5cb79bfbd95522e54c024d431b4c5d7eb308ba4995519639a096380208b59ea8e2cf9b3a7cb615198355fcf4743

yaru-theme.spec

@@ -1,21 +1,23 @@
+%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:    21.04.1
-Release:    2%{?dist}
-Summary:    Ubuntu community theme "yaru"
+Version:    25.10.3
+%forgemeta
+Release:    %autorelease
+Summary:    All Ubuntu Yaru GNOME themes
 BuildArch:  noarch
 
-License:    GPLv3+ and CC-BY-SA
+License:    GPL-3.0-or-later AND CC-BY-SA-4.0
 URL:        https://community.ubuntu.com/c/desktop/theme-refresh
-Source0:    https://github.com/ubuntu/yaru/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:    %{forgesource}
 
-BuildRequires: meson >= 0.51
+BuildRequires: meson
 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}
@@ -23,9 +25,16 @@ Requires:   yaru-icon-theme = %{version}-%{release}
 Requires:   yaru-sound-theme = %{version}-%{release}
 
 %global _description %{expand:
-Yaru theme is the default theme for Ubuntu, entirely backed by the community.
-This is the theme that is shaped by the community on the Ubuntu hub, turned into
-the default theme starting from Ubuntu 18.10 Cosmic Cuttlefish.}
+Yaru is the default theme for Ubuntu, backed by the community.
+
+It contains:
+  * a GNOME Shell theme based on the upstream GNOME shell theme
+  * a light and dark GTK theme (gtk2 and gtk3) based on the upstream Adwaita
+    Gtk theme
+  * an icon & cursor theme, derived from the Unity8 Suru icons and Suru icon
+    theme
+  * a sound theme, combining sounds from the WoodenBeaver and Touch-Remix
+    sound themes.}
 
 %description %{_description}
 
@@ -33,6 +42,8 @@ the default theme starting from Ubuntu 18.10 Cosmic Cuttlefish.}
 %package     -n gnome-shell-theme-yaru
 Summary:        Yaru GNOME Shell Theme
 
+Requires:       gnome-shell-extension-user-theme
+
 Recommends:     yaru-gtk3-theme
 Recommends:     yaru-icon-theme
 
@@ -44,19 +55,6 @@ 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
 
@@ -85,10 +83,9 @@ This package contains GTK 4 theme.
 
 %package     -n yaru-icon-theme
 Summary:        Yaru icon theme
-License:        CC-BY-SA
+License:        CC-BY-SA-4.0
 
 Requires:       hicolor-icon-theme
-Requires:       humanity-icon-theme
 
 Suggests:       gnome-shell-theme-yaru
 Suggests:       yaru-gtk3-theme
@@ -101,7 +98,7 @@ This package contains the icon theme.
 
 %package     -n yaru-sound-theme
 Summary:        Yaru sound theme
-License:        CC-BY-SA
+License:        CC-BY-SA-4.0
 
 %description -n yaru-sound-theme %{_description}
 
@@ -110,7 +107,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
+License:        CC-BY-SA-4.0
 
 %description -n yaru-gtksourceview-theme %{_description}
 
@@ -118,7 +115,7 @@ This package contains the GtkSourceView theme.
 
 
 %prep
-%autosetup -n yaru-%{version} -p1
+%forgeautosetup -p1
 
 
 %build
@@ -128,10 +125,14 @@ 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.desktop \
-    %{buildroot}%{_datadir}/wayland-sessions/Yaru-wayland.desktop \
+    %{buildroot}%{_datadir}/xsessions/Yaru-xorg.desktop \
+    %{buildroot}%{_datadir}/wayland-sessions/Yaru.desktop \
     %{buildroot}%{_datadir}/gnome-shell/extensions/ubuntu-dock@ubuntu.com/yaru.css
 
 touch %{buildroot}%{_datadir}/icons/Yaru/icon-theme.cache
@@ -140,24 +141,6 @@ 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
@@ -166,24 +149,10 @@ end
 %files -n gnome-shell-theme-yaru
 %license %{_license}
 %{_datadir}/gnome-shell/modes/yaru.json
-%{_datadir}/gnome-shell/theme/Yaru-light/
-%{_datadir}/gnome-shell/theme/Yaru/
+%{_datadir}/gnome-shell/theme/Yaru*/
 %{_datadir}/themes/Yaru-*/index.theme
-%{_datadir}/themes/Yaru-light/gnome-shell
-%{_datadir}/themes/Yaru/gnome-shell
+%{_datadir}/themes/Yaru*/gnome-shell
 %{_datadir}/themes/Yaru/index.theme
-%dir %{_datadir}/themes/Yaru
-%dir %{_datadir}/themes/Yaru-dark
-%dir %{_datadir}/themes/Yaru-light
-%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
-%dir %{_datadir}/themes/Yaru-light
 
 %files -n yaru-gtk3-theme
 %license %{_license}
@@ -191,7 +160,6 @@ end
 %{_datadir}/themes/Yaru/gtk-3.*/
 %dir %{_datadir}/themes/Yaru
 %dir %{_datadir}/themes/Yaru-dark
-%dir %{_datadir}/themes/Yaru-light
 
 %files -n yaru-gtk4-theme
 %license %{_license}
@@ -199,11 +167,10 @@ end
 %{_datadir}/themes/Yaru/gtk-4.*/
 %dir %{_datadir}/themes/Yaru
 %dir %{_datadir}/themes/Yaru-dark
-%dir %{_datadir}/themes/Yaru-light
 
 %files -n yaru-icon-theme
 %license %{_license}
-%{_datadir}/icons/Yaru/
+%{_datadir}/icons/Yaru*/
 %ghost %{_datadir}/icons/Yaru/icon-theme.cache
 
 %files -n yaru-sound-theme
@@ -212,78 +179,9 @@ end
 
 %files -n yaru-gtksourceview-theme
 %license %{_license}
-%{_datadir}/gtksourceview-*/styles/Yaru-*.xml
+%{_datadir}/gtksourceview-*/styles/Yaru*.xml
+%{_datadir}/libgedit-gtksourceview-300/styles/Yaru*.xml
 
 
 %changelog
-* Thu Apr 08 2021 Artem Polishchuk <ego.cordatus@gmail.com> - 21.04.1-2
-- build: Fixes
-
-* Tue Apr 06 2021 Artem Polishchuk <ego.cordatus@gmail.com> - 21.04.1-1
-- build(update): 21.04.1
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.10.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sun Oct 11 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.10.6.1-1
-- build(update): 20.10.6.1
-
-* Tue Oct  6 19:52:37 EEST 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.10.6-1
-- build(update): 20.10.6
-
-* Thu Sep 24 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.10.4-1
-- Update to 20.10.4
-
-* Fri Sep 11 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.10.3-1
-- Update to 20.10.3
-- Don't build yaru-unity-theme
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.04.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Apr 21 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.6-3
-- Workaround for replace directory with symlink which was added in Yaru | Thanks for tip @zawertun
-
-* Sat Apr 18 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.6-2
-- Add new 'yaru-unity-theme' subpackage
-
-* Fri Apr 17 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.6-1
-- Update to 20.04.6
-
-* Thu Apr 16 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.5-1
-- Update to 20.04.5
-
-* Tue Mar 24 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.4-1
-- Update to 20.04.4
-
-* Fri Feb 07 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 20.04.1-1
-- Update to 20.04.1
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.10.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 08 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 19.10.5-1
-- Update to 19.10.5
-
-* Thu Nov 21 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 19.10.4-1.20191118git1937b28
-- Update to latest git snapshot which contain broken gnome-shell theme fix
-
-* Fri Sep 27 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 19.10.3-1
-- Update to 19.10.3
-- Add new light variant
-- Drop fdupes
-
-* Tue Sep 10 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 19.10.1-2
-- Update to 19.10.1
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19.04.1-3.20190425git0ddb244
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Apr 26 2019 Artem Polishchuk <ego.cordatus@gmail.com> - 19.04.1-2.20190425git0ddb244
-- Adapt for Fedora
-
-* Fri Jan 18 10:30:30 UTC 2019 - dead_mozay@opensuse.org
-- Update to version 19.04+20190117.f36189f4
-
-* Wed Jan 02 11:51:35 UTC 2019 - dead_mozay@opensuse.org
-- Update to version 18.10.7+20190101.1db0abb5
+%autochangelog