From 1179b9d9c85c051c34a699d32c65ee799a3e007baea6dfb3aafec6b74b5cc0bb Mon Sep 17 00:00:00 2001 From: Filippo Bonazzi Date: Wed, 31 May 2023 14:38:41 +0000 Subject: [PATCH] Accepting request 1090023 from home:stdden:branches:X11:Wayland - 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 OBS-URL: https://build.opensuse.org/request/show/1090023 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/openSUSEway?expand=0&rev=43 --- _service | 2 +- openSUSEway-0.15.1.obscpio | 3 --- openSUSEway-0.15.2.obscpio | 3 +++ openSUSEway.changes | 12 ++++++++++++ openSUSEway.obsinfo | 6 +++--- openSUSEway.spec | 32 +++++++++++++++++++++++--------- 6 files changed, 42 insertions(+), 16 deletions(-) delete mode 100644 openSUSEway-0.15.1.obscpio create mode 100644 openSUSEway-0.15.2.obscpio diff --git a/_service b/_service index 46acec4..fbe0847 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/openSUSE/openSUSEway.git - 0.15.1 + 0.15.2 @PARENT_TAG@ (.*) openSUSEway.spec diff --git a/openSUSEway-0.15.1.obscpio b/openSUSEway-0.15.1.obscpio deleted file mode 100644 index 0654d45..0000000 --- a/openSUSEway-0.15.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29bc3b8f5279fdf701422f5084a7f7dd514175147400ad8c57c26bf2e2139cb4 -size 1093644 diff --git a/openSUSEway-0.15.2.obscpio b/openSUSEway-0.15.2.obscpio new file mode 100644 index 0000000..a0cba56 --- /dev/null +++ b/openSUSEway-0.15.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee4791c94f324b006f98b82a78688ca6ab0493d8d47cb366f6b312ce764b58ee +size 1094668 diff --git a/openSUSEway.changes b/openSUSEway.changes index e435f2c..15fb119 100644 --- a/openSUSEway.changes +++ b/openSUSEway.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed May 31 10:06:20 UTC 2023 - Denys Kondratenko + +- 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 + ------------------------------------------------------------------- Wed Feb 22 15:04:17 UTC 2023 - Filippo Bonazzi diff --git a/openSUSEway.obsinfo b/openSUSEway.obsinfo index fb5510d..d711eb5 100644 --- a/openSUSEway.obsinfo +++ b/openSUSEway.obsinfo @@ -1,4 +1,4 @@ name: openSUSEway -version: 0.15.1 -mtime: 1676450276 -commit: b97287433d717e559c71267e5394fc1cfe7b7738 +version: 0.15.2 +mtime: 1684933275 +commit: ce14428babe8a2d3cefcf0bb140111338392377a diff --git a/openSUSEway.spec b/openSUSEway.spec index 05472d3..5a734d1 100644 --- a/openSUSEway.spec +++ b/openSUSEway.spec @@ -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: sway 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 @@ Summary: openSUSE branding of waybar 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 qt5ct.conf %{buildroot}%{_sysconfdir}/xdg/qt5ct/qt5ct.conf 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/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-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 @@ sed -i -e "s|wofi --show.*|wofi --conf=%{_sysconfdir}/wofi/config --style=%{_sys ## 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 @@ cp %{_sysconfdir}/greetd/config.toml.way %{_sysconfdir}/greetd/config.toml 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 @@ test -e %{_datadir}/wayland-sessions/sway.desktop.orig && \ %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 @@ test -e %{_datadir}/wayland-sessions/sway.desktop.orig && \ %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 @@ test -e %{_datadir}/wayland-sessions/sway.desktop.orig && \ %dir %{_sysconfdir}/xdg/waybar %config(noreplace) %{_sysconfdir}/xdg/waybar/config %config(noreplace) %{_sysconfdir}/xdg/waybar/style.css +%{_datadir}/openSUSEway/helpers/scratchpad-indicator.sh %changelog