Overview
Request 1168009 accepted
- Remove patches used as sources and replace them with direct
ln -s and sed commands:
* lookandfeel.diff, sddmtheme.diff, lookandfeel_jpg.diff,
sddmtheme_jpg.diff
- Use %require_ge for wallpaper-branding-openSUSE
- Use lookandfeel_jpg.diff and sddmtheme_jpg.diff on Leap <=15.5
TW and Leap 15.6+ use png for the default wallpaper
- Modify lookandfeel.diff and sddmtheme.diff to support
branding-openSUSE 84.87.20240405 which replaces jpg wallpapers
with png ones.
- Require at least wallpaper-branding-openSUSE 84.87.20240405
to make sure the png wallpapers exist.
The test build against 15.6 with the new png wallpaper can be found here https://build.opensuse.org/request/show/1167844 It's expected that 15.6 will fail in the devproject before the branding itself gets accepted.
Conditional patches are really evil, at this point it's better to use ln -s + sed on the files IMO
Then the BuildRequires on the wallpaper can also be used to test for file existence instead of version checks and %requires_eq wallpaper-branding-openSUSE is enough -> no version checks.
I agree on the ln + sed. I'll change that. About using %requires_eq, I don't really agree. I used a similar solution in plasma6-openSUSE and I regret doing that (I actually plan to modify it to use >= 84.87.20240405) since plasma6-openSUSE just changes the path inside a configuration file, so the package builds fine with any branding-openSUSE version and all we really require is that wallpaper-branding-openSUSE contains a png file, so checking for at least the specific version where the png file was introduced is what should be checked, not exactly the version used when building. This actually broke Slowroll yesterday because the package updates where not synchronized as in TW and we didn't enforce it with a %requires_eq-like solution.
ok, I don't think it's worth spending more time on this, so if that allows this SR to move on, let's do that.
Request History
alarrosa created request
- Remove patches used as sources and replace them with direct
ln -s and sed commands:
* lookandfeel.diff, sddmtheme.diff, lookandfeel_jpg.diff,
sddmtheme_jpg.diff
- Use %require_ge for wallpaper-branding-openSUSE
- Use lookandfeel_jpg.diff and sddmtheme_jpg.diff on Leap <=15.5
TW and Leap 15.6+ use png for the default wallpaper
- Modify lookandfeel.diff and sddmtheme.diff to support
branding-openSUSE 84.87.20240405 which replaces jpg wallpapers
with png ones.
- Require at least wallpaper-branding-openSUSE 84.87.20240405
to make sure the png wallpapers exist.
Vogtinator accepted request
Just nitpicks left, will remove the echo and double space and forward to 15.6
I think line 55 is not necessary - not sure why that is in sddmtheme.diff. There's no svg that needs fixing