From d4418562d617865f889f8103f233e7b6d1c353b1fddfa39f370a555d13331cd4 Mon Sep 17 00:00:00 2001 From: Denis Kondratenko Date: Fri, 11 Sep 2020 14:37:53 +0000 Subject: [PATCH 1/2] Accepting request 833814 from home:dkondratenko - 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 OBS-URL: https://build.opensuse.org/request/show/833814 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/openSUSEway?expand=0&rev=19 --- openSUSEway-0.10.tar.gz | 3 --- openSUSEway-0.11.tar.gz | 3 +++ openSUSEway.changes | 14 +++++++++++ openSUSEway.spec | 53 +++++++++++++++++++++++++++++++++++------ 4 files changed, 63 insertions(+), 10 deletions(-) delete mode 100644 openSUSEway-0.10.tar.gz create mode 100644 openSUSEway-0.11.tar.gz diff --git a/openSUSEway-0.10.tar.gz b/openSUSEway-0.10.tar.gz deleted file mode 100644 index c2e3fa1..0000000 --- a/openSUSEway-0.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6292c68850b3948da7f901fed986c61aca6e292e0d2ad7a0cc8b11df30d04171 -size 6846 diff --git a/openSUSEway-0.11.tar.gz b/openSUSEway-0.11.tar.gz new file mode 100644 index 0000000..d0aebe4 --- /dev/null +++ b/openSUSEway-0.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6503204004d17cc0c664d2ea05e7b9333859c7eb0c28936d7f4aac0397d9691 +size 7674 diff --git a/openSUSEway.changes b/openSUSEway.changes index afdef82..f73c72b 100644 --- a/openSUSEway.changes +++ b/openSUSEway.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Sep 11 09:43:40 UTC 2020 - Denis Kondratenko + +- 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 + +- Add gfxboot and gfxboot-branding-openSUSE to have better boot experience + ------------------------------------------------------------------- Sun Aug 30 09:13:29 UTC 2020 - Denis Kondratenko diff --git a/openSUSEway.spec b/openSUSEway.spec index 52b47d3..e5ed6c1 100644 --- a/openSUSEway.spec +++ b/openSUSEway.spec @@ -19,7 +19,7 @@ %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 Group: Metapackages @@ -58,6 +58,9 @@ Requires: adwaita-qt5 Requires: wob Requires: pamixer Requires: command-not-found +Requires: gfxboot-branding-openSUSE +Requires: greetd +Requires: gtkgreet %description This meta package aggregates openSUSEway desktop enviroment packages. @@ -125,20 +128,27 @@ This package provides the openSUSE look and feel for waybar. %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 +163,36 @@ sed -i -e "s|wofi --show.*|wofi --conf=%{_sysconfdir}/wofi/config --style=%{_sys 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 +204,10 @@ install -D -p -m 644 .config/waybar/style.css %{buildroot}%{_sysconfdir}/xdg/way %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 From 963a2fb6d20ad84cc95d7a2d542f9565aceaa960009389602fad66ee30b19bd1 Mon Sep 17 00:00:00 2001 From: Denis Kondratenko Date: Tue, 15 Sep 2020 08:33:02 +0000 Subject: [PATCH 2/2] Accepting request 834542 from home:favogt:branches:X11:Wayland - Make patterns-openSUSEway properly behaved: * Use proper description (it's very user visible!) * Don't overwrite the category (set by %pattern_graphicalenvironments) OBS-URL: https://build.opensuse.org/request/show/834542 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/openSUSEway?expand=0&rev=20 --- openSUSEway.changes | 7 +++++ openSUSEway.spec | 72 +++++++++++++++++++++------------------------ 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/openSUSEway.changes b/openSUSEway.changes index f73c72b..ca007f7 100644 --- a/openSUSEway.changes +++ b/openSUSEway.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 15 08:23:01 UTC 2020 - Fabian Vogt + +- 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 diff --git a/openSUSEway.spec b/openSUSEway.spec index e5ed6c1..9f63248 100644 --- a/openSUSEway.spec +++ b/openSUSEway.spec @@ -15,6 +15,7 @@ # 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) @@ -22,45 +23,45 @@ Name: openSUSEway 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: 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: bzip2 -Requires: less -Requires: grep -Requires: vifm -Requires: imv -Requires: firefox Requires: NetworkManager -Requires: mpv +Requires: aaa_base +Requires: adwaita-qt5 +Requires: bzip2 +Requires: command-not-found +Requires: curl +Requires: firefox +Requires: gfxboot-branding-openSUSE +Requires: git +Requires: greetd +Requires: grep +Requires: gtkgreet +Requires: gzip +Requires: imv +Requires: jq +Requires: less Requires: libqt5-qtwayland +Requires: mpv +Requires: pamixer Requires: pipewire -Requires: xdg-utils +Requires: qt5ct +Requires: sudo +Requires: sway-branding-openSUSE +Requires: tar +Requires: vifm +Requires: vim +Requires: waybar-branding-openSUSE +Requires: wget +Requires: wob Requires: xdg-desktop-portal Requires: xdg-desktop-portal-wlr -Requires: qt5ct -Requires: adwaita-qt5 -Requires: wob -Requires: pamixer -Requires: command-not-found -Requires: gfxboot-branding-openSUSE -Requires: greetd -Requires: gtkgreet +Requires: xdg-utils %description This meta package aggregates openSUSEway desktop enviroment packages. @@ -69,10 +70,8 @@ This meta package aggregates openSUSEway desktop enviroment packages. %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() @@ -81,21 +80,19 @@ BuildRequires: patterns-rpm-macros 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 +BuildRequires: sway 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) @@ -222,4 +219,3 @@ test -e %{_datadir}/wayland-sessions/sway.desktop.orig && \ %config(noreplace) %{_sysconfdir}/xdg/waybar/style.css %changelog -