Hello community, here is the log from the commit of package openSUSEway for openSUSE:Factory checked in at 2020-09-15 16:26:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSEway (Old) and /work/SRC/openSUSE:Factory/.openSUSEway.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSEway" Tue Sep 15 16:26:37 2020 rev:7 rq:834543 version:0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSEway/openSUSEway.changes 2020-08-31 16:50:55.400374002 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSEway.new.4249/openSUSEway.changes 2020-09-15 16:27:00.130522801 +0200 @@ -1,0 +2,21 @@ +Tue Sep 15 08:23:01 UTC 2020 - Fabian Vogt <fv...@suse.com> + +- Make patterns-openSUSEway properly behaved: + * Use proper description (it's very user visible!) + * Don't overwrite the category (set by %pattern_graphicalenvironments) + +------------------------------------------------------------------- +Fri Sep 11 09:43:40 UTC 2020 - Denis Kondratenko <denis.kondrate...@suse.com> + +- New in 0.11 release + * greetd support fixes #27 + * correct environment for sway session, fixes #28, bsc#1176195 +- Remove old files from environment enforcing, bsc#1176195 +- Add greetd support + +------------------------------------------------------------------- +Tue Sep 8 14:51:38 UTC 2020 - Denis Kondratenko <denis.kondrate...@suse.com> + +- Add gfxboot and gfxboot-branding-openSUSE to have better boot experience + +------------------------------------------------------------------- Old: ---- openSUSEway-0.10.tar.gz New: ---- openSUSEway-0.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSEway.spec ++++++ --- /var/tmp/diff_new_pack.ivBI6h/_old 2020-09-15 16:27:01.750524352 +0200 +++ /var/tmp/diff_new_pack.ivBI6h/_new 2020-09-15 16:27:01.754524356 +0200 @@ -15,49 +15,53 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define sway_version %(rpm -q --queryformat "%%{version}" sway) %define waybar_version %(rpm -q --queryformat "%%{version}" waybar) Name: openSUSEway -Version: 0.10 +Version: 0.11 Release: 0 Summary: The openSUSEway desktop environment meta package +License: MIT Group: Metapackages URL: https://github.com/openSUSE/openSUSEway Source0: https://github.com/openSUSE/openSUSEway/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -License: MIT BuildArch: noarch BuildRequires: aaa_base BuildRequires: systemd +Requires: NetworkManager Requires: aaa_base -Requires: sway-branding-openSUSE -Requires: waybar-branding-openSUSE -Requires: sudo -Requires: git -Requires: jq -Requires: wget -Requires: curl -Requires: vim -Requires: tar -Requires: gzip +Requires: adwaita-qt5 Requires: bzip2 -Requires: less +Requires: command-not-found +Requires: curl +Requires: firefox +Requires: gfxboot-branding-openSUSE +Requires: git +Requires: greetd Requires: grep -Requires: vifm +Requires: gtkgreet +Requires: gzip Requires: imv -Requires: firefox -Requires: NetworkManager -Requires: mpv +Requires: jq +Requires: less Requires: libqt5-qtwayland +Requires: mpv +Requires: pamixer Requires: pipewire -Requires: xdg-utils -Requires: xdg-desktop-portal -Requires: xdg-desktop-portal-wlr Requires: qt5ct -Requires: adwaita-qt5 +Requires: sudo +Requires: sway-branding-openSUSE +Requires: tar +Requires: vifm +Requires: vim +Requires: waybar-branding-openSUSE +Requires: wget Requires: wob -Requires: pamixer -Requires: command-not-found +Requires: xdg-desktop-portal +Requires: xdg-desktop-portal-wlr +Requires: xdg-utils %description This meta package aggregates openSUSEway desktop enviroment packages. @@ -66,10 +70,8 @@ %pattern_graphicalenvironments %package -n patterns-openSUSEway Summary: The openSUSEway desktop environment pattern -License: MIT Group: Metapackages Provides: pattern() = openSUSEway -Provides: pattern-category() = openSUSEway Provides: pattern-icon() = pattern-sway Provides: pattern-order() = 1460 Provides: pattern-visible() @@ -78,21 +80,19 @@ Requires: openSUSEway %description -n patterns-openSUSEway -This is an internal package that is used to create the patterns as part -of the installation source setup. Installation of this package does -not make sense. +This pattern installs the openSUSE look and feel for sway. %package -n sway-branding-openSUSE Summary: openSUSE branding of sway Group: System/GUI/Other BuildRequires: sway -Requires: patterns-sway-sway -Requires: wallpaper-branding-openSUSE Requires: brightnessctl -Requires: pavucontrol Requires: fontawesome-fonts Requires: jq +Requires: patterns-sway-sway +Requires: pavucontrol Requires: sway +Requires: wallpaper-branding-openSUSE Provides: sway-branding = %{version} Conflicts: otherproviders(sway-branding) Supplements: packageand(sway:branding-openSUSE) @@ -125,20 +125,27 @@ %install ## openSUSEway package -install -D -p -m 644 openSUSEway.sh %{buildroot}%{_sysconfdir}/profile.d/openSUSEway.sh -install -D -p -m 644 .config/sway/env %{buildroot}%{_prefix}/lib/environment.d/50-openSUSEway.conf ### qt5ct config to configure dark theme -install -D -p -m 644 qt5ct.conf %{buildroot}/%{_sysconfdir}/xdg/qt5ct/qt5ct.conf +install -D -p -m 644 qt5ct.conf %{buildroot}%{_sysconfdir}/xdg/qt5ct/qt5ct.conf +### greetd as a login manager +install -D -p -m 644 greetd/sway-config %{buildroot}%{_sysconfdir}/greetd/sway-config +install -D -p -m 644 greetd/config.toml %{buildroot}%{_sysconfdir}/greetd/config.toml.way +install -D -p -m 644 greetd/environments %{buildroot}%{_sysconfdir}/greetd/environments ## openSUSEway pattern package mkdir -p %{buildroot}/%{_defaultdocdir}/patterns/ -echo 'This file marks the pattern openSUSEway to be installed.' >%{buildroot}/%{_defaultdocdir}/patterns/openSUSEway.txt +echo 'This file marks the pattern openSUSEway to be installed.' >%{buildroot}%{_defaultdocdir}/patterns/openSUSEway.txt ## Sway install -D -p -m 644 .config/sway/config %{buildroot}%{_sysconfdir}/sway/config install -D -p -m 644 .config/sway/env %{buildroot}%{_sysconfdir}/sway/env install -D -p -m 644 .config/sway/config.d/50-openSUSE.conf %{buildroot}%{_sysconfdir}/sway/config.d/50-openSUSE.conf +install -D -p -m 644 sway/sway-session.target %{buildroot}%{_unitdir}/sway-session.target +install -D -p -m 644 sway/sway.service %{buildroot}%{_unitdir}/sway.service +install -D -p -m 644 sway/sway.desktop %{buildroot}%{_datadir}/wayland-sessions/sway.desktop.brand +install -D -p -m 755 sway/sway-run.sh %{buildroot}%{_bindir}/sway-run.sh + ### alacritty # so far doesn't have special branding package and it doesn't support system wide config install -D -p -m 644 .config/alacritty/alacritty.yml %{buildroot}%{_sysconfdir}/alacritty/alacritty.yml @@ -153,11 +160,36 @@ install -D -p -m 644 .config/waybar/config %{buildroot}%{_sysconfdir}/xdg/waybar/config install -D -p -m 644 .config/waybar/style.css %{buildroot}%{_sysconfdir}/xdg/waybar/style.css +%pre -n openSUSEway +# bug #1176195, don't force enviroment, cleaning up old installations +test -e %{_sysconfdir}/profile.d/openSUSEway.sh && rm %{_sysconfdir}/profile.d/openSUSEway.sh || true +test -e %{_prefix}/lib/environment.d/50-openSUSEway.conf && rm %{_prefix}/lib/environment.d/50-openSUSEway.conf || true + +%post -n openSUSEway +test -e %{_sysconfdir}/greetd/config.toml && \ + mv -n %{_sysconfdir}/greetd/config.toml %{_sysconfdir}/greetd/config.toml.orig || true +cp %{_sysconfdir}/greetd/config.toml.way %{_sysconfdir}/greetd/config.toml + +%postun -n openSUSEway +test -e %{_sysconfdir}/greetd/config.toml.orig && \ + mv %{_sysconfdir}/greetd/config.toml.orig %{_sysconfdir}/greetd/config.toml || true + +%post -n sway-branding-openSUSE +test -e %{_datadir}/wayland-sessions/sway.desktop && \ + mv -n %{_datadir}/wayland-sessions/sway.desktop %{_datadir}/wayland-sessions/sway.desktop.orig || true +cp %{_datadir}/wayland-sessions/sway.desktop.brand %{_datadir}/wayland-sessions/sway.desktop + +%postun -n sway-branding-openSUSE +test -e %{_datadir}/wayland-sessions/sway.desktop.orig && \ + mv %{_datadir}/wayland-sessions/sway.desktop.orig %{_datadir}/wayland-sessions/sway.desktop || true + %files -%config %{_sysconfdir}/profile.d/openSUSEway.sh -%config %{_prefix}/lib/environment.d/50-openSUSEway.conf %dir %{_sysconfdir}/xdg/qt5ct/ %config(noreplace) %{_sysconfdir}/xdg/qt5ct/qt5ct.conf +%dir %{_sysconfdir}/greetd/ +%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/config.toml.way +%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/sway-config +%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/environments %files -n patterns-openSUSEway %dir %{_defaultdocdir}/patterns @@ -169,6 +201,10 @@ %config %{_sysconfdir}/sway/env %dir %{_sysconfdir}/sway/config.d %config %{_sysconfdir}/sway/config.d/50-openSUSE.conf +%{_unitdir}/sway-session.target +%{_unitdir}/sway.service +%{_datadir}/wayland-sessions/sway.desktop.brand +%{_bindir}/sway-run.sh %dir %{_sysconfdir}/alacritty %config(noreplace) %{_sysconfdir}/alacritty/alacritty.yml ++++++ openSUSEway-0.10.tar.gz -> openSUSEway-0.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.10/README.md new/openSUSEway-0.11/README.md --- old/openSUSEway-0.10/README.md 2020-08-30 11:24:51.000000000 +0200 +++ new/openSUSEway-0.11/README.md 2020-09-11 11:39:47.000000000 +0200 @@ -8,7 +8,7 @@ sudo zypper in openSUSEway ``` -openSUSEway imports some recomended (optional) variables from `/etc/sway/env`, that is done by `/etc/profile.d/openSUSEway.sh` for text mode and by `/usr/lib/environment.d/50-openSUSE.conf` for systemd graphic environments. +openSUSEway imports some recomended (optional) variables from `/etc/sway/env`, that is done by `sway/sway-run.sh` for text mode and by `sway/sway.service` for systemd graphic environments. [openSUSEway desktop enviroment](https://en.opensuse.org/Portal:OpenSUSEway) for more details on complete desktop enviroment for openSUSE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.10/greetd/config.toml new/openSUSEway-0.11/greetd/config.toml --- old/openSUSEway-0.10/greetd/config.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.11/greetd/config.toml 2020-09-11 11:39:47.000000000 +0200 @@ -0,0 +1,17 @@ +[terminal] +# The VT to run the greeter on. Can be "next", "current" or a number +# designating the VT. +vt = 1 + +# The default session, also known as the greeter. +[default_session] + +# `agreety` is the bundled agetty/login-lookalike. You can replace `$SHELL` +# with whatever you want started, such as `sway`. +# +command = "sway --config /etc/greetd/sway-config" + +# The user to run the command as. The privileges this user must have depends +# on the greeter. A graphical greeter may for example require the user to be +# in the `video` group. +user = "greeter" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.10/greetd/environments new/openSUSEway-0.11/greetd/environments --- old/openSUSEway-0.10/greetd/environments 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.11/greetd/environments 2020-09-11 11:39:47.000000000 +0200 @@ -0,0 +1,2 @@ +sway-run.sh +bash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.10/greetd/sway-config new/openSUSEway-0.11/greetd/sway-config --- old/openSUSEway-0.10/greetd/sway-config 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.11/greetd/sway-config 2020-09-11 11:39:47.000000000 +0200 @@ -0,0 +1,9 @@ +exec "gtkgreet -l; swaymsg exit" + +bindsym Mod4+shift+e exec swaynag \ + -t warning \ + -m 'What do you want to do?' \ + -b 'Poweroff' 'systemctl poweroff' \ + -b 'Reboot' 'systemctl reboot' + +#include /etc/sway/config.d/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.10/openSUSEway.sh new/openSUSEway-0.11/openSUSEway.sh --- old/openSUSEway-0.10/openSUSEway.sh 2020-08-30 11:24:51.000000000 +0200 +++ new/openSUSEway-0.11/openSUSEway.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -# this file imports openSUSEway desktop enviroments -# should end up im /etc/profile.d/ -set -a -. /etc/sway/env -set +a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.10/sway/sway-run.sh new/openSUSEway-0.11/sway/sway-run.sh --- old/openSUSEway-0.10/sway/sway-run.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.11/sway/sway-run.sh 2020-09-11 11:39:47.000000000 +0200 @@ -0,0 +1,14 @@ +#!/bin/sh + +# Session +export XDG_SESSION_TYPE=wayland +export XDG_SESSION_DESKTOP=sway +export XDG_CURRENT_DESKTOP=sway + +# this file imports openSUSEway desktop enviroments +set -a +. /etc/sway/env +set +a + +systemd-cat --identifier=sway sway $@ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.10/sway/sway-session.target new/openSUSEway-0.11/sway/sway-session.target --- old/openSUSEway-0.10/sway/sway-session.target 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.11/sway/sway-session.target 2020-09-11 11:39:47.000000000 +0200 @@ -0,0 +1,5 @@ +[Unit] +Description=sway session +BindsTo=graphical-session.target +Wants=graphical-session-pre.target +After=graphical-session-pre.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.10/sway/sway.desktop new/openSUSEway-0.11/sway/sway.desktop --- old/openSUSEway-0.10/sway/sway.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.11/sway/sway.desktop 2020-09-11 11:39:47.000000000 +0200 @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=Sway +Comment=An i3-compatible Wayland compositor +Exec=sway-run.sh +Type=Application diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.10/sway/sway.service new/openSUSEway-0.11/sway/sway.service --- old/openSUSEway-0.10/sway/sway.service 1970-01-01 01:00:00.000000000 +0100 +++ new/openSUSEway-0.11/sway/sway.service 2020-09-11 11:39:47.000000000 +0200 @@ -0,0 +1,14 @@ +[Unit] +Description=sway - SirCmpwn's Wayland window manager +Documentation=man:sway(5) +BindsTo=graphical-session.target +Wants=graphical-session-pre.target +After=graphical-session-pre.target + +[Service] +Type=simple +EnvironmentFile=-/etc/sway/env +ExecStart=sway +Restart=on-failure +RestartSec=1 +TimeoutStopSec=10
