#6 Unbreak default config
Merged 4 years ago by alebastr. Opened 4 years ago by alebastr.
rpms/ alebastr/sway fix-default-config  into  master

file modified
+7 -4
@@ -1,6 +1,6 @@ 

  Name:           sway

  Version:        1.4

- Release:        3%{?dist}

+ Release:        4%{?dist}

  Summary:        i3-compatible window manager for Wayland

  License:        MIT

  URL:            https://github.com/swaywm/sway
@@ -41,7 +41,7 @@ 

  

  Requires:       swaybg

  # By default the Fedora background is used

- Recommends:     f%{fedora}-backgrounds-base

+ Recommends:     desktop-backgrounds-compat

  

  # dmenu (as well as rxvt any many others) requires XWayland on Sway

  Requires:       xorg-x11-server-Xwayland
@@ -64,9 +64,9 @@ 

  %install

  %meson_install

  # Set default terminal to urxvt256c-ml

- sed -i 's/^set $term urxvt$/set \$term urxvt256c-ml/' %{buildroot}%{_sysconfdir}/sway/config

+ sed -i 's/^set $term .*/set \$term urxvt256c-ml/' %{buildroot}%{_sysconfdir}/sway/config

  # Set Fedora background as default background

- sed -i "s|^output \* bg .*|output * bg /usr/share/backgrounds/f%{fedora}/default/normalish/f%{fedora}.png fill|" %{buildroot}%{_sysconfdir}/sway/config

+ sed -i "s|^output \* bg .*|output * bg /usr/share/backgrounds/default.png fill|" %{buildroot}%{_sysconfdir}/sway/config

  

  %files

  %license LICENSE
@@ -95,6 +95,9 @@ 

  %{_datadir}/backgrounds/sway

  

  %changelog

+ * Wed Feb 26 2020 Aleksei Bavshin <alebastr89@gmail.com> - 1.4-4

+ - Fix default terminal and background

+ 

  * Sun Feb 09 2020 Till Hofmann <thofmann@fedoraproject.org> - 1.4-3

  - Add patch to fix strcmp on nullptr (upstream PR #4991)

  

  1. Upstream changed default $term to alacritty and sed pattern is no longer matching. It's probably not a good idea to have something not shipped in Fedora as a part of default config.

  2. There's no f3{2,3}-backgrounds-base; sway in f32 and rawhide is not displaying any background.
    My quick research has shown that nothing directly depends on f31-backgrounds-base. dnf repoquery --whatrequires desktop-backgrounds-compat is much more interesting.

2 new commits added

  • Also fix default background.
  • Fix default terminal
4 years ago

The terminal fix looks good. The background change currently shows a warning on rawhide because the /usr/share/backgrounds/default.png symlink is broken; it looks like f32-backgrounds-base doesn't have a tv-wide background.

rebased onto 6809e1a

4 years ago

To my shame, I almost forgot about this PR. If we want to have working default config for f32 release it's time to merge this and I'm going to proceed with that.

@thofmann, can you please publish the module update with this and new waybar version when I'm done?

Pull-Request has been merged by alebastr

4 years ago

Done, updates:

Thanks a lot!