Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openSUSEway for openSUSE:Factory checked in at 2023-05-31 21:55:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSEway (Old) and /work/SRC/openSUSE:Factory/.openSUSEway.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSEway" Wed May 31 21:55:16 2023 rev:19 rq:1090027 version:0.15.2 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSEway/openSUSEway.changes 2023-02-23 16:49:54.135916715 +0100 +++ /work/SRC/openSUSE:Factory/.openSUSEway.new.1533/openSUSEway.changes 2023-05-31 21:55:17.789288760 +0200 @@ -1,0 +2,12 @@ +Wed May 31 10:06:20 UTC 2023 - Denys Kondratenko <stdden@opensuse.org> + +- Update to version 0.15.2: + * Install sway systemd components to the correct directories by @FilippoBonazziSUSE in #98 + * Add SwayNotificationCenter icon to waybar by default by @FilippoBonazziSUSE in #107 + * Fix spec file errors by @FilippoBonazziSUSE in #100 + * Start sway-session systemd target when starting sway by @FilippoBonazziSUSE in #108 + * Package scratchpad-indicator helper by @FilippoBonazziSUSE in #109 + * Add style.css to the package by @denisok in #115 + * Allow sway to be run with proprietary drivers by @joantolo in #114 + +------------------------------------------------------------------- Old: ---- openSUSEway-0.15.1.obscpio New: ---- openSUSEway-0.15.2.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSEway.spec ++++++ --- /var/tmp/diff_new_pack.OvPdFm/_old 2023-05-31 21:55:18.345292046 +0200 +++ /var/tmp/diff_new_pack.OvPdFm/_new 2023-05-31 21:55:18.349292069 +0200 @@ -20,7 +20,7 @@ %define waybar_version %(rpm -q --queryformat "%%{version}" waybar) Name: openSUSEway -Version: 0.15.1 +Version: 0.15.2 Release: 0 Summary: The openSUSEway desktop environment meta package License: MIT @@ -103,8 +103,8 @@ Requires: wallpaper-branding-openSUSE Requires: wob Provides: sway-branding = %{version} -Conflicts: otherproviders(sway-branding) -Supplements: packageand(sway:branding-openSUSE) +Conflicts: sway-branding +Supplements: (sway and branding-openSUSE) #BRAND: /etc/sway/config and /etc/sway/config.d/ #BRAND: contain openSUSE config and branding @@ -117,8 +117,8 @@ Group: System/GUI/Other BuildRequires: waybar Provides: waybar-branding = %{version} -Conflicts: otherproviders(waybar-branding) -Supplements: packageand(waybar:branding-openSUSE) +Conflicts: waybar-branding +Supplements: (waybar and branding-openSUSE) #BRAND: /etc/xdg/waybar/config and /etc/xdg/waybar/style.css #BRAND: contain openSUSE config and branding @@ -140,6 +140,7 @@ 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 +install -D -p -m 644 greetd/style.css %{buildroot}%{_sysconfdir}/greetd/style.css ## openSUSEway pattern package mkdir -p %{buildroot}/%{_defaultdocdir}/patterns/ @@ -150,8 +151,8 @@ 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-session.target %{buildroot}%{_prefix}/lib/systemd/user/sway-session.target +install -D -p -m 644 sway/sway.service %{buildroot}%{_prefix}/lib/systemd/user/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 @@ -168,6 +169,7 @@ ## waybar 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 +install -D -p -m 755 .config/waybar/scratchpad-indicator.sh %{buildroot}%{_datadir}/openSUSEway/helpers/scratchpad-indicator.sh ## wob install -D -p -m 644 .config/wob/wob.ini %{buildroot}%{_sysconfdir}/sway/wob/wob.ini @@ -190,14 +192,22 @@ test -e %{_sysconfdir}/greetd/config.toml.orig && \ mv %{_sysconfdir}/greetd/config.toml.orig %{_sysconfdir}/greetd/config.toml || true +%pre -n sway-branding-openSUSE +%service_add_pre sway-session.target sway.service + %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 +%service_add_post sway-session.target sway.service + +%preun -n sway-branding-openSUSE +%service_del_preun sway-session.target sway.service %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 +%service_del_postun sway-session.target sway.service %files %dir %{_sysconfdir}/xdg/qt5ct/ @@ -206,6 +216,9 @@ %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 +%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/style.css +%dir %{_datadir}/openSUSEway/ +%dir %{_datadir}/openSUSEway/helpers/ %files -n patterns-openSUSEway %dir %{_defaultdocdir}/patterns @@ -217,8 +230,8 @@ %config %{_sysconfdir}/sway/env %dir %{_sysconfdir}/sway/config.d %config %{_sysconfdir}/sway/config.d/50-openSUSE.conf -%{_unitdir}/sway-session.target -%{_unitdir}/sway.service +%{_prefix}/lib/systemd/user/sway-session.target +%{_prefix}/lib/systemd/user/sway.service %{_datadir}/wayland-sessions/sway.desktop.brand %{_bindir}/sway-run.sh @@ -240,5 +253,6 @@ %dir %{_sysconfdir}/xdg/waybar %config(noreplace) %{_sysconfdir}/xdg/waybar/config %config(noreplace) %{_sysconfdir}/xdg/waybar/style.css +%{_datadir}/openSUSEway/helpers/scratchpad-indicator.sh %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.OvPdFm/_old 2023-05-31 21:55:18.393292330 +0200 +++ /var/tmp/diff_new_pack.OvPdFm/_new 2023-05-31 21:55:18.397292353 +0200 @@ -2,7 +2,7 @@ <service name="obs_scm" mode="manual"> <param name="scm">git</param> <param name="url">https://github.com/openSUSE/openSUSEway.git</param> - <param name="revision">0.15.1</param> + <param name="revision">0.15.2</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">(.*)</param> <param name="extract">openSUSEway.spec</param> ++++++ openSUSEway-0.15.1.obscpio -> openSUSEway-0.15.2.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.15.1/.config/waybar/config new/openSUSEway-0.15.2/.config/waybar/config --- old/openSUSEway-0.15.1/.config/waybar/config 2023-02-15 09:37:56.000000000 +0100 +++ new/openSUSEway-0.15.2/.config/waybar/config 2023-05-24 15:01:15.000000000 +0200 @@ -7,7 +7,7 @@ // Choose the order of the modules "modules-left": ["sway/workspaces", "custom/scratchpad", "sway/mode", "tray"], "modules-center": ["sway/window"], - "modules-right": ["custom/zypper", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "pulseaudio", "custom/layout", "clock"], + "modules-right": ["custom/zypper", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "pulseaudio", "custom/layout", "clock", "custom/notification"], "sway/mode": { "format": "������ {}" }, @@ -142,7 +142,7 @@ "format-text": "{}", "return-type": "json", "interval": 3, - "exec": "scratchpad-indicator.sh 2> /dev/null", + "exec": "/usr/share/openSUSEway/helpers/scratchpad-indicator.sh 2> /dev/null", "exec-if": "exit 0", "on-click": "swaymsg 'scratchpad show'", "on-click-right": "swaymsg 'move scratchpad'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.15.1/openSUSEway.spec new/openSUSEway-0.15.2/openSUSEway.spec --- old/openSUSEway-0.15.1/openSUSEway.spec 2023-02-15 09:37:56.000000000 +0100 +++ new/openSUSEway-0.15.2/openSUSEway.spec 2023-05-24 15:01:15.000000000 +0200 @@ -20,7 +20,7 @@ %define waybar_version %(rpm -q --queryformat "%%{version}" waybar) Name: openSUSEway -Version: 0.15 +Version: 0.15.2 Release: 0 Summary: The openSUSEway desktop environment meta package License: MIT @@ -103,8 +103,8 @@ Requires: wallpaper-branding-openSUSE Requires: wob Provides: sway-branding = %{version} -Conflicts: otherproviders(sway-branding) -Supplements: packageand(sway:branding-openSUSE) +Conflicts: sway-branding +Supplements: (sway and branding-openSUSE) #BRAND: /etc/sway/config and /etc/sway/config.d/ #BRAND: contain openSUSE config and branding @@ -117,8 +117,8 @@ Group: System/GUI/Other BuildRequires: waybar Provides: waybar-branding = %{version} -Conflicts: otherproviders(waybar-branding) -Supplements: packageand(waybar:branding-openSUSE) +Conflicts: waybar-branding +Supplements: (waybar and branding-openSUSE) #BRAND: /etc/xdg/waybar/config and /etc/xdg/waybar/style.css #BRAND: contain openSUSE config and branding @@ -140,6 +140,7 @@ 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 +install -D -p -m 644 greetd/style.css %{buildroot}%{_sysconfdir}/greetd/style.css ## openSUSEway pattern package mkdir -p %{buildroot}/%{_defaultdocdir}/patterns/ @@ -150,8 +151,8 @@ 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-session.target %{buildroot}%{_prefix}/lib/systemd/user/sway-session.target +install -D -p -m 644 sway/sway.service %{buildroot}%{_prefix}/lib/systemd/user/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 @@ -168,6 +169,7 @@ ## waybar 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 +install -D -p -m 755 .config/waybar/scratchpad-indicator.sh %{buildroot}%{_datadir}/openSUSEway/helpers/scratchpad-indicator.sh ## wob install -D -p -m 644 .config/wob/wob.ini %{buildroot}%{_sysconfdir}/sway/wob/wob.ini @@ -190,14 +192,22 @@ test -e %{_sysconfdir}/greetd/config.toml.orig && \ mv %{_sysconfdir}/greetd/config.toml.orig %{_sysconfdir}/greetd/config.toml || true +%pre -n sway-branding-openSUSE +%service_add_pre sway-session.target sway.service + %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 +%service_add_post sway-session.target sway.service + +%preun -n sway-branding-openSUSE +%service_del_preun sway-session.target sway.service %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 +%service_del_postun sway-session.target sway.service %files %dir %{_sysconfdir}/xdg/qt5ct/ @@ -206,6 +216,9 @@ %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 +%attr(644,greeter,greeter) %config %{_sysconfdir}/greetd/style.css +%dir %{_datadir}/openSUSEway/ +%dir %{_datadir}/openSUSEway/helpers/ %files -n patterns-openSUSEway %dir %{_defaultdocdir}/patterns @@ -217,8 +230,8 @@ %config %{_sysconfdir}/sway/env %dir %{_sysconfdir}/sway/config.d %config %{_sysconfdir}/sway/config.d/50-openSUSE.conf -%{_unitdir}/sway-session.target -%{_unitdir}/sway.service +%{_prefix}/lib/systemd/user/sway-session.target +%{_prefix}/lib/systemd/user/sway.service %{_datadir}/wayland-sessions/sway.desktop.brand %{_bindir}/sway-run.sh @@ -240,5 +253,6 @@ %dir %{_sysconfdir}/xdg/waybar %config(noreplace) %{_sysconfdir}/xdg/waybar/config %config(noreplace) %{_sysconfdir}/xdg/waybar/style.css +%{_datadir}/openSUSEway/helpers/scratchpad-indicator.sh %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSEway-0.15.1/sway/sway-run.sh new/openSUSEway-0.15.2/sway/sway-run.sh --- old/openSUSEway-0.15.1/sway/sway-run.sh 2023-02-15 09:37:56.000000000 +0100 +++ new/openSUSEway-0.15.2/sway/sway-run.sh 2023-05-24 15:01:15.000000000 +0200 @@ -12,4 +12,15 @@ eval "$(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)" set +a -systemd-cat --identifier=sway sway $@ +# Set dependencies to run with proprietary drivers +if grep -qE "nvidia|fglrx" /proc/modules; then + export WLR_NO_HARDWARE_CURSORS=1 + unsupported_gpu="--unsupported-gpu" +else + unsupported_gpu="" +fi + +# Start the Sway session +systemctl --user start sway-session.target + +systemd-cat --identifier=sway sway $unsupported_gpu $@ ++++++ openSUSEway.obsinfo ++++++ --- /var/tmp/diff_new_pack.OvPdFm/_old 2023-05-31 21:55:18.541293204 +0200 +++ /var/tmp/diff_new_pack.OvPdFm/_new 2023-05-31 21:55:18.545293229 +0200 @@ -1,5 +1,5 @@ name: openSUSEway -version: 0.15.1 -mtime: 1676450276 -commit: b97287433d717e559c71267e5394fc1cfe7b7738 +version: 0.15.2 +mtime: 1684933275 +commit: ce14428babe8a2d3cefcf0bb140111338392377a