diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index 417200ba..49abbd27 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -3,7 +3,7 @@ Name: ultramarine-backgrounds Version: %(echo %ver | sed 's/-/~/g') -Release: 1%{?dist} +Release: 6%{?dist} BuildArch: noarch # details for the artworks' licenses can be seen in the COPYING file License: CC-BY-SA 4.0 and CC0 @@ -11,7 +11,7 @@ Summary: Ultramarine Linux backgrounds Provides: desktop-backgrounds = %{version}-%{release} Requires: /usr/bin/ln Recommends: ultramarine-backgrounds-compat = %{version}-%{release} -BuildRequires: make +BuildRequires: make ImageMagick # licensing information Source0: https://github.com/Ultramarine-Linux/backgrounds/archive/refs/tags/%ver.tar.gz #Source1: 30_default_backgrounds.gschema.override @@ -54,10 +54,9 @@ The desktop-backgrounds-kde package sets default background in the KDE Plasma de %package compat Summary: Compatibility package for ultramarine-backgrounds Requires: ultramarine-backgrounds-common = %{version}-%{release} -Provides: desktop-backgrounds-compat = %{version}-%{release} +Provides: system-backgrounds-compat = %{version}-%{release} +Provides: desktop-backgrounds-compat = %{version}-%{release} License: CC0 -Obsoletes: desktop-backgrounds-compat = 40.0.0-1 -Conflicts: desktop-backgrounds-compat %description compat The desktop-backgrounds-compat package contains compatibility symlinks for other desktop environments. @@ -155,6 +154,25 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-5_4.png compat_link $DEFAULT_DARK_WALL images/default-dark-16_9.png compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png +# HACK(42): Remove in 43 once we make JXL the new default format for wallpapers +# We need JXL for the default wallpaper, for now, for XFCE +# see: https://src.fedoraproject.org/rpms/desktop-backgrounds/blob/rawhide/f/desktop-backgrounds.spec#_214 +(cd %{buildroot}%{_datadir}/backgrounds/images; + convert default.png \ + -alpha off default.jxl + convert default-5_4.png \ + -alpha off default-5_4.jxl + convert default-16_9.png \ + -alpha off default-16_9.jxl + convert default-16_10.png \ + -alpha off default-16_10.jxl +) + +# Hopefully no XML required for the JXL variant +ln -rsf "%{buildroot}%{_datadir}/backgrounds/images/default.jxl" "%{buildroot}%{_datadir}/backgrounds/default.jxl" +ln -rsf "%{buildroot}%{_datadir}/backgrounds/images/default-dark.jxl" "%{buildroot}%{_datadir}/backgrounds/default-dark.jxl" +# END HACK + %files %license COPYING @@ -177,6 +195,8 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png %{_datadir}/backgrounds/default.png %{_datadir}/backgrounds/default-dark.png %{_datadir}/backgrounds/default.xml +%{_datadir}/backgrounds/default.jxl +%{_datadir}/backgrounds/default-dark.jxl %changelog diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 000821d0..26128b44 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -5,7 +5,7 @@ %global codename heart_of_gold %define dist_version 42 -%define xfce_conf_commit d2ecec2c00250224d7762c6a2b7e15fbc8621783 +%define xfce_conf_commit 0406ea1b394c825e4eeceded407ff51e535cd72e %define anywhere_conf_commit 240cd1e95d5abb7bbea4cefbe19d328fd6bacac7 @@ -52,7 +52,7 @@ Summary: Ultramarine Linux release files Name: ultramarine-release Version: %{dist_version} -Release: 16%{?dist} +Release: 18%{?dist} License: MIT Source0: LICENSE URL: https://ultramarine-linux.org diff --git a/ultramarine/taidan/taidan.spec b/ultramarine/taidan/taidan.spec index cf871000..9e406aa0 100644 --- a/ultramarine/taidan/taidan.spec +++ b/ultramarine/taidan/taidan.spec @@ -1,5 +1,5 @@ Name: taidan -Version: 0.1.28 +Version: 0.1.29 Release: 1%?dist Summary: Out-Of-Box-Experience (OOBE) and Welcome App SourceLicense: GPL-3.0-or-later AND GPL-2.0-or-later