From 963a2fb6d20ad84cc95d7a2d542f9565aceaa960009389602fad66ee30b19bd1 Mon Sep 17 00:00:00 2001
From: Denis Kondratenko <denis.kondratenko@suse.com>
Date: Tue, 15 Sep 2020 08:33:02 +0000
Subject: [PATCH] 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 <fvogt@suse.com>
+
+- 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 <denis.kondratenko@suse.com>
 
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
-