From fe10321efa23e649ac1dbc0b1724e57f6323bc4c5b6c8f45d3024e0f3402f5fc Mon Sep 17 00:00:00 2001
From: Denis Kondratenko <denis.kondratenko@suse.com>
Date: Tue, 14 Jul 2020 12:25:48 +0000
Subject: [PATCH] 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 <denis.kondratenko@suse.com>
+
+- 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 <denis.kondratenko@suse.com>
 
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