From fe10321efa23e649ac1dbc0b1724e57f6323bc4c5b6c8f45d3024e0f3402f5fc Mon Sep 17 00:00:00 2001 From: Denis Kondratenko Date: Tue, 14 Jul 2020 12:25:48 +0000 Subject: [PATCH 1/4] Accepting request 820880 from home:dkondratenko update openSUSEway to 0.6 OBS-URL: https://build.opensuse.org/request/show/820880 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/openSUSEway?expand=0&rev=6 --- openSUSEway-0.3.tar.gz | 3 --- openSUSEway-0.6.tar.gz | 3 +++ openSUSEway.changes | 9 +++++++++ openSUSEway.spec | 29 +++++++++++++++++++++++------ 4 files changed, 35 insertions(+), 9 deletions(-) delete mode 100644 openSUSEway-0.3.tar.gz create mode 100644 openSUSEway-0.6.tar.gz diff --git a/openSUSEway-0.3.tar.gz b/openSUSEway-0.3.tar.gz deleted file mode 100644 index 400c2be..0000000 --- a/openSUSEway-0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:997793743a1de6cc3734a3f6356bcf3f810f63acb26ad8dd0599ffb8c2c8cbdc -size 6211 diff --git a/openSUSEway-0.6.tar.gz b/openSUSEway-0.6.tar.gz new file mode 100644 index 0000000..492e858 --- /dev/null +++ b/openSUSEway-0.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92e133cc872ea35a0e675c56f57e135c6a955189e510cad954be0d8a7082b3b2 +size 6217 diff --git a/openSUSEway.changes b/openSUSEway.changes index 553ce00..99a1233 100644 --- a/openSUSEway.changes +++ b/openSUSEway.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jul 14 11:40:24 UTC 2020 - Denis Kondratenko + +- New 0.6 release + * Enforce tty branding in the branded sway + * Don't start mako explicitly + * Only include sway config files with .conf file extension +- Add initial requirements to the openSUSEway desktop meta package + ------------------------------------------------------------------- Mon Jun 22 16:02:30 UTC 2020 - Denis Kondratenko diff --git a/openSUSEway.spec b/openSUSEway.spec index 835956b..88e220f 100644 --- a/openSUSEway.spec +++ b/openSUSEway.spec @@ -19,7 +19,7 @@ %define waybar_version %(rpm -q --queryformat "%%{version}" waybar) Name: openSUSEway -Version: 0.3 +Version: 0.6 Release: 0 Summary: The openSUSEway desktop environment meta package Group: System/GUI/Other @@ -27,6 +27,24 @@ URL: https://github.com/openSUSE/openSUSEway Source0: https://github.com/openSUSE/openSUSEway/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz License: MIT BuildArch: noarch +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 %description This meta package aggregates openSUSEway desktop enviroment packages. @@ -41,6 +59,7 @@ Requires: brightnessctl Requires: pavucontrol Requires: fontawesome-fonts Requires: jq +Requires: sway Provides: sway-branding = %{version} Conflicts: otherproviders(sway-branding) Supplements: packageand(sway:branding-openSUSE) @@ -75,19 +94,17 @@ This package provides the openSUSE look and feel for waybar. ## 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 %{buildroot}%{_sysconfdir}/sway/config.d/50-openSUSE +install -D -p -m 644 .config/sway/config.d/50-openSUSE.conf %{buildroot}%{_sysconfdir}/sway/config.d/50-openSUSE.conf ### 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 -#set alacritty config to the system dir -sed -i -e "s|alacritty.*|alacritty --config-file %{_sysconfdir}/alacritty/alacritty.yml|g" %{buildroot}%{_sysconfdir}/sway/config.d/50-openSUSE ## wofi install -D -p -m 644 .config/wofi/config %{buildroot}%{_sysconfdir}/wofi/config install -D -p -m 644 .config/wofi/style.css %{buildroot}%{_sysconfdir}/wofi/style.css #set wofi config and style to the system dir -sed -i -e "s|wofi --show.*|wofi --conf=%{_sysconfdir}/wofi/config --style=%{_sysconfdir}/wofi/style.css|g" %{buildroot}%{_sysconfdir}/sway/config.d/50-openSUSE +sed -i -e "s|wofi --show.*|wofi --conf=%{_sysconfdir}/wofi/config --style=%{_sysconfdir}/wofi/style.css|g" %{buildroot}%{_sysconfdir}/sway/config.d/50-openSUSE.conf ## waybar install -D -p -m 644 .config/waybar/config %{buildroot}%{_sysconfdir}/xdg/waybar/config @@ -101,7 +118,7 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/sway/config %config(noreplace) %{_sysconfdir}/sway/env %dir %{_sysconfdir}/sway/config.d -%config(noreplace) %{_sysconfdir}/sway/config.d/50-openSUSE +%config(noreplace) %{_sysconfdir}/sway/config.d/50-openSUSE.conf %dir %{_sysconfdir}/alacritty %config(noreplace) %{_sysconfdir}/alacritty/alacritty.yml From fb55a5f33d3b1ea5421a8b1c8809d6c46f13ec551c7ca14f88370fcb5cbb9f95 Mon Sep 17 00:00:00 2001 From: Denis Kondratenko Date: Tue, 14 Jul 2020 13:08:30 +0000 Subject: [PATCH 2/4] Accepting request 820896 from home:dkondratenko update openSUSEway to 0.6 OBS-URL: https://build.opensuse.org/request/show/820896 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/openSUSEway?expand=0&rev=7 --- openSUSEway.changes | 3 ++- openSUSEway.spec | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/openSUSEway.changes b/openSUSEway.changes index 99a1233..a501736 100644 --- a/openSUSEway.changes +++ b/openSUSEway.changes @@ -5,7 +5,8 @@ Tue Jul 14 11:40:24 UTC 2020 - Denis Kondratenko * Enforce tty branding in the branded sway * Don't start mako explicitly * Only include sway config files with .conf file extension -- Add initial requirements to the openSUSEway desktop meta package +- Add initial requirements to the openSUSEway desktop meta package + * add openSUSEway pattern ------------------------------------------------------------------- Mon Jun 22 16:02:30 UTC 2020 - Denis Kondratenko diff --git a/openSUSEway.spec b/openSUSEway.spec index 88e220f..9128ce6 100644 --- a/openSUSEway.spec +++ b/openSUSEway.spec @@ -22,7 +22,12 @@ Name: openSUSEway Version: 0.6 Release: 0 Summary: The openSUSEway desktop environment meta package -Group: System/GUI/Other +Group: Metapackages +Provides: pattern() = openSUSEway +Provides: pattern-category() = openSUSEway +Provides: pattern-icon() = pattern-sway +Provides: pattern-order() = 1460 +Provides: pattern-visible() URL: https://github.com/openSUSE/openSUSEway Source0: https://github.com/openSUSE/openSUSEway/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz License: MIT @@ -91,6 +96,9 @@ This package provides the openSUSE look and feel for waybar. %install +mkdir -p %{buildroot}/%{_defaultdocdir}/patterns/ +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 @@ -110,8 +118,9 @@ 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 -%clean -rm -rf %{buildroot} +%files +%dir %{_defaultdocdir}/patterns +%{_defaultdocdir}/patterns/openSUSEway.txt %files -n sway-branding-openSUSE %dir %{_sysconfdir}/sway From 8fb4a15de33dca810eff9fdc3de782edec09bd7e77b97c8922d5e15185e8147b Mon Sep 17 00:00:00 2001 From: Denis Kondratenko Date: Wed, 15 Jul 2020 14:25:29 +0000 Subject: [PATCH 3/4] Accepting request 821111 from home:dkondratenko add pattern OBS-URL: https://build.opensuse.org/request/show/821111 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/openSUSEway?expand=0&rev=8 --- openSUSEway.spec | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/openSUSEway.spec b/openSUSEway.spec index 9128ce6..c589abf 100644 --- a/openSUSEway.spec +++ b/openSUSEway.spec @@ -23,11 +23,6 @@ Version: 0.6 Release: 0 Summary: The openSUSEway desktop environment meta package Group: Metapackages -Provides: pattern() = openSUSEway -Provides: pattern-category() = openSUSEway -Provides: pattern-icon() = pattern-sway -Provides: pattern-order() = 1460 -Provides: pattern-visible() URL: https://github.com/openSUSE/openSUSEway Source0: https://github.com/openSUSE/openSUSEway/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz License: MIT @@ -54,6 +49,26 @@ Requires: mpv %description This meta package aggregates openSUSEway desktop enviroment packages. +%bcond_with betatest +%pattern_graphicalenvironments +%package -n patterns-openSUSEway +Summary: Patterns for Installation (openSUSEway) +License: MIT +Group: Metapackages +Provides: pattern() = openSUSEway +Provides: pattern-category() = openSUSEway +Provides: pattern-icon() = pattern-sway +Provides: pattern-order() = 1460 +Provides: pattern-visible() +URL: https://github.com/openSUSE/openSUSEway +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. + %package -n sway-branding-openSUSE Summary: openSUSE branding of sway Group: System/GUI/Other @@ -119,6 +134,8 @@ install -D -p -m 644 .config/waybar/config %{buildroot}%{_sysconfdir}/xdg/waybar install -D -p -m 644 .config/waybar/style.css %{buildroot}%{_sysconfdir}/xdg/waybar/style.css %files + +%files -n patterns-openSUSEway %dir %{_defaultdocdir}/patterns %{_defaultdocdir}/patterns/openSUSEway.txt From 6e83929d306ac956ca11c274f0c8c368f49c5b4fb2ea210c4cf591ca4418f852 Mon Sep 17 00:00:00 2001 From: Denis Kondratenko Date: Thu, 16 Jul 2020 09:41:38 +0000 Subject: [PATCH 4/4] Accepting request 821260 from home:dkondratenko update pattern description OBS-URL: https://build.opensuse.org/request/show/821260 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/openSUSEway?expand=0&rev=9 --- openSUSEway.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openSUSEway.spec b/openSUSEway.spec index c589abf..582c7ed 100644 --- a/openSUSEway.spec +++ b/openSUSEway.spec @@ -52,7 +52,7 @@ This meta package aggregates openSUSEway desktop enviroment packages. %bcond_with betatest %pattern_graphicalenvironments %package -n patterns-openSUSEway -Summary: Patterns for Installation (openSUSEway) +Summary: The openSUSEway desktop environment pattern License: MIT Group: Metapackages Provides: pattern() = openSUSEway