From 7d55107cf247b97a18594b0b795e3eb0df8e3dbcd73af5f9999c51f1d1bb7780 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 1 Dec 2022 22:45:41 +0000 Subject: [PATCH 01/10] - Fix sources on spec file. - Remove service file that was overlooked - Add back the tarball containing the downloaded subprojects OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=86 --- Waybar-0.9.16.obscpio | 3 --- Waybar.obsinfo | 4 ---- _service | 16 ---------------- _servicedata | 4 ---- waybar-0.9.16.tar.gz | 3 +++ waybar.changes | 7 +++++++ waybar.spec | 14 ++++++++------ 7 files changed, 18 insertions(+), 33 deletions(-) delete mode 100644 Waybar-0.9.16.obscpio delete mode 100644 Waybar.obsinfo delete mode 100644 _service delete mode 100644 _servicedata create mode 100644 waybar-0.9.16.tar.gz diff --git a/Waybar-0.9.16.obscpio b/Waybar-0.9.16.obscpio deleted file mode 100644 index d016f89..0000000 --- a/Waybar-0.9.16.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:818b4469e6a5e19fc27f40a4aee555289c2d89e6dd4f6f0571039f0469b44981 -size 845836 diff --git a/Waybar.obsinfo b/Waybar.obsinfo deleted file mode 100644 index 87c7355..0000000 --- a/Waybar.obsinfo +++ /dev/null @@ -1,4 +0,0 @@ -name: Waybar -version: 0.9.16 -mtime: 1669318452 -commit: 9eb6c4e296d5736565c0434514b709d2bbb3bebe diff --git a/_service b/_service deleted file mode 100644 index 015dac4..0000000 --- a/_service +++ /dev/null @@ -1,16 +0,0 @@ - - - git - https://github.com/Alexays/Waybar.git - 0.9.16 - @PARENT_TAG@ - (.*) - enable - - - - *.tar - xz - - - diff --git a/_servicedata b/_servicedata deleted file mode 100644 index ca22057..0000000 --- a/_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - https://github.com/Alexays/Waybar.git - 9eb6c4e296d5736565c0434514b709d2bbb3bebe \ No newline at end of file diff --git a/waybar-0.9.16.tar.gz b/waybar-0.9.16.tar.gz new file mode 100644 index 0000000..81ed83a --- /dev/null +++ b/waybar-0.9.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc1608ebd7ecc194f121a704155ceda6e5f3c50173ebc7125bba45203c62c23a +size 23685120 diff --git a/waybar.changes b/waybar.changes index 17eb4cc..24a0168 100644 --- a/waybar.changes +++ b/waybar.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 1 22:42:29 UTC 2022 - Soc Virnyl Estela + +- Fix sources on spec file. +- Remove service file that was overlooked +- Add back the tarball containing the downloaded subprojects + ------------------------------------------------------------------- Tue Nov 29 19:15:28 UTC 2022 - Filippo Bonazzi diff --git a/waybar.spec b/waybar.spec index 4b512ae..3ea8af1 100644 --- a/waybar.spec +++ b/waybar.spec @@ -23,7 +23,10 @@ Summary: Customizable Wayland bar for Sway and Wlroots based compositors License: MIT Group: System/GUI/Other URL: https://github.com/Alexays/Waybar -Source: Waybar-%{version}.tar.xz +Source0: %{name}-%{version}.tar.gz +# use this to download tarball. then use `meson subprojects download` +# to get the `date` dependency. and create own tarball +# Source1: https://github.com/Alexays/Waybar/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake %if 0%{?sle_version} >= 150400 BuildRequires: gcc11-c++ @@ -63,10 +66,9 @@ BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) -BuildRequires: pkgconfig(wireplumber-0.4) BuildRequires: pkgconfig(xkbregistry) # requires branding -Requires: %{name}-branding = %{version} +Requires: %{name}-branding # optional: sway integration Recommends: sway @@ -77,8 +79,8 @@ Customizable Wayland bar for Sway and Wlroots based compositors. Summary: Upstream branding of %{name} Group: System/GUI/Other Requires: %{name} = %{version} -Supplements: (%{name} and branding-upstream) -Conflicts: %{name}-branding +Supplements: packageand(%{name}:branding-upstream) +Conflicts: otherproviders(%{name}-branding) Provides: %{name}-branding = %{version} BuildArch: noarch #BRAND: /etc/xdg/waybar/config contains upstream config @@ -88,7 +90,7 @@ BuildArch: noarch This package provides the upstream look and feel for sway. %prep -%autosetup -p1 -n Waybar-%{version} +%autosetup -n Waybar-%{version} %build %if 0%{?sle_version} >= 150400 From ee41afc373fc232372d0f9386fdd8be22a87fb029fc0bdad4561365127d8a20c Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Thu, 1 Dec 2022 22:48:48 +0000 Subject: [PATCH 02/10] - Add wireplumber dependency OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=87 --- waybar.changes | 1 + waybar.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/waybar.changes b/waybar.changes index 24a0168..84ba574 100644 --- a/waybar.changes +++ b/waybar.changes @@ -4,6 +4,7 @@ Thu Dec 1 22:42:29 UTC 2022 - Soc Virnyl Estela - Fix sources on spec file. - Remove service file that was overlooked - Add back the tarball containing the downloaded subprojects +- Add wireplumber dependency ------------------------------------------------------------------- Tue Nov 29 19:15:28 UTC 2022 - Filippo Bonazzi diff --git a/waybar.spec b/waybar.spec index 3ea8af1..efec59d 100644 --- a/waybar.spec +++ b/waybar.spec @@ -66,6 +66,7 @@ BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-protocols) +BuildRequires: pkgconfig(wireplumber-0.4) BuildRequires: pkgconfig(xkbregistry) # requires branding Requires: %{name}-branding From 2e564fc01d092eda4124df61616b7dae54035f2d407bc49520ca85a6a6746077 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Fri, 2 Dec 2022 00:35:50 +0000 Subject: [PATCH 03/10] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=88 --- waybar.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/waybar.spec b/waybar.spec index efec59d..6dfb4c8 100644 --- a/waybar.spec +++ b/waybar.spec @@ -79,10 +79,10 @@ Customizable Wayland bar for Sway and Wlroots based compositors. %package branding-upstream Summary: Upstream branding of %{name} Group: System/GUI/Other -Requires: %{name} = %{version} +Requires: %{name} Supplements: packageand(%{name}:branding-upstream) Conflicts: otherproviders(%{name}-branding) -Provides: %{name}-branding = %{version} +Provides: %{name}-branding BuildArch: noarch #BRAND: /etc/xdg/waybar/config contains upstream config #BRAND: /etc/xdg/waybar/style.css contains upstream style From 2300b99d11a8a7479187b43dd3c7ef495879444bcb63366745c569085899b239 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Fri, 2 Dec 2022 07:55:50 +0000 Subject: [PATCH 04/10] - Update specfile and remove deprecated functions. - Improve description to remove rpmlint warnings. OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=89 --- waybar.changes | 6 ++++++ waybar.spec | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/waybar.changes b/waybar.changes index 84ba574..7c95c5e 100644 --- a/waybar.changes +++ b/waybar.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 2 07:54:45 UTC 2022 - Soc Virnyl Estela + +- Update specfile and remove deprecated functions. +- Improve description to remove rpmlint warnings. + ------------------------------------------------------------------- Thu Dec 1 22:42:29 UTC 2022 - Soc Virnyl Estela diff --git a/waybar.spec b/waybar.spec index 6dfb4c8..049b54a 100644 --- a/waybar.spec +++ b/waybar.spec @@ -74,15 +74,17 @@ Requires: %{name}-branding Recommends: sway %description -Customizable Wayland bar for Sway and Wlroots based compositors. +A customizable Wayland bar for Sway and Wlroots based compositors. +It comes with modules for pipewire, alsa, backlight, and bluetooth. +Other modules can be found in the manpages of Waybar. %package branding-upstream Summary: Upstream branding of %{name} Group: System/GUI/Other -Requires: %{name} -Supplements: packageand(%{name}:branding-upstream) -Conflicts: otherproviders(%{name}-branding) -Provides: %{name}-branding +Requires: %{name} = %{version} +Supplements: (%{name} and branding-upstream) +Conflicts: %{name}-branding +Provides: %{name}-branding = %{version} BuildArch: noarch #BRAND: /etc/xdg/waybar/config contains upstream config #BRAND: /etc/xdg/waybar/style.css contains upstream style From a046f27ca08affb1e9064973ae2a39a2599483de95b2d5d2258ee0f12427e406 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Fri, 2 Dec 2022 08:03:31 +0000 Subject: [PATCH 05/10] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=90 --- waybar.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waybar.spec b/waybar.spec index 049b54a..93a52a9 100644 --- a/waybar.spec +++ b/waybar.spec @@ -69,7 +69,7 @@ BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(wireplumber-0.4) BuildRequires: pkgconfig(xkbregistry) # requires branding -Requires: %{name}-branding +Requires: %{name}-branding = %{version} # optional: sway integration Recommends: sway From 4b136a84520f5c26dd0b2b621a9bde4dcda9a9c35d0a6d1f4b1861e46bab854d Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Fri, 2 Dec 2022 13:53:54 +0000 Subject: [PATCH 06/10] - Add 0000-replace-gethostbyname-getaddrinfo.patch OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=91 --- 0000-replace-gethostbyname-getaddrinfo.patch | 27 ++++++++++++++++++++ waybar.changes | 5 ++++ waybar.spec | 3 ++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0000-replace-gethostbyname-getaddrinfo.patch diff --git a/0000-replace-gethostbyname-getaddrinfo.patch b/0000-replace-gethostbyname-getaddrinfo.patch new file mode 100644 index 0000000..321ad89 --- /dev/null +++ b/0000-replace-gethostbyname-getaddrinfo.patch @@ -0,0 +1,27 @@ +diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp +index 76c071c..f110825 100644 +--- a/src/modules/hyprland/backend.cpp ++++ b/src/modules/hyprland/backend.cpp +@@ -140,7 +140,7 @@ std::string IPC::getSocket1Reply(const std::string& rq) { + return ""; + } + +- const auto SERVER = gethostbyname("localhost"); ++ const auto SERVER = getaddrinfo("localhost", NULL, NULL, 0); + + if (!SERVER) { + spdlog::error("Hyprland IPC: Couldn't get host (2)"); +diff --git a/src/modules/sni/tray.cpp b/src/modules/sni/tray.cpp +index 87e5577..09d53e7 100644 +--- a/src/modules/sni/tray.cpp ++++ b/src/modules/sni/tray.cpp +@@ -10,9 +10,6 @@ Tray::Tray(const std::string& id, const Bar& bar, const Json::Value& config) + watcher_(SNI::Watcher::getInstance()), + host_(nb_hosts_, config, bar, std::bind(&Tray::onAdd, this, std::placeholders::_1), + std::bind(&Tray::onRemove, this, std::placeholders::_1)) { +- spdlog::warn( +- "For a functional tray you must have libappindicator-* installed and export " +- "XDG_CURRENT_DESKTOP=Unity"); + box_.set_name("tray"); + event_box_.add(box_); + if (!id.empty()) { diff --git a/waybar.changes b/waybar.changes index 7c95c5e..f6a8f25 100644 --- a/waybar.changes +++ b/waybar.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 2 13:52:41 UTC 2022 - Soc Virnyl Estela + +- Add 0000-replace-gethostbyname-getaddrinfo.patch + ------------------------------------------------------------------- Fri Dec 2 07:54:45 UTC 2022 - Soc Virnyl Estela diff --git a/waybar.spec b/waybar.spec index 93a52a9..11f5ba2 100644 --- a/waybar.spec +++ b/waybar.spec @@ -24,6 +24,7 @@ License: MIT Group: System/GUI/Other URL: https://github.com/Alexays/Waybar Source0: %{name}-%{version}.tar.gz +Patch0: 0000-replace-gethostbyname-getaddrinfo.patch # use this to download tarball. then use `meson subprojects download` # to get the `date` dependency. and create own tarball # Source1: https://github.com/Alexays/Waybar/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -93,7 +94,7 @@ BuildArch: noarch This package provides the upstream look and feel for sway. %prep -%autosetup -n Waybar-%{version} +%autosetup -p1 -n Waybar-%{version} %build %if 0%{?sle_version} >= 150400 From 4eb09c95a9b64c1983662026d6fbda02997c2f6e547cc058ec0c2bf6f5fc3887 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Fri, 2 Dec 2022 14:06:25 +0000 Subject: [PATCH 07/10] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=92 --- 0000-replace-gethostbyname-getaddrinfo.patch | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/0000-replace-gethostbyname-getaddrinfo.patch b/0000-replace-gethostbyname-getaddrinfo.patch index 321ad89..fd80e9b 100644 --- a/0000-replace-gethostbyname-getaddrinfo.patch +++ b/0000-replace-gethostbyname-getaddrinfo.patch @@ -11,17 +11,3 @@ index 76c071c..f110825 100644 if (!SERVER) { spdlog::error("Hyprland IPC: Couldn't get host (2)"); -diff --git a/src/modules/sni/tray.cpp b/src/modules/sni/tray.cpp -index 87e5577..09d53e7 100644 ---- a/src/modules/sni/tray.cpp -+++ b/src/modules/sni/tray.cpp -@@ -10,9 +10,6 @@ Tray::Tray(const std::string& id, const Bar& bar, const Json::Value& config) - watcher_(SNI::Watcher::getInstance()), - host_(nb_hosts_, config, bar, std::bind(&Tray::onAdd, this, std::placeholders::_1), - std::bind(&Tray::onRemove, this, std::placeholders::_1)) { -- spdlog::warn( -- "For a functional tray you must have libappindicator-* installed and export " -- "XDG_CURRENT_DESKTOP=Unity"); - box_.set_name("tray"); - event_box_.add(box_); - if (!id.empty()) { From dc9f8764462ec5bf4ca44e4a447fae05037f7dc5e134ae56794ab5e51ea633e5 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Fri, 2 Dec 2022 14:24:46 +0000 Subject: [PATCH 08/10] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=93 --- 0000-replace-gethostbyname-getaddrinfo.patch | 25 ++++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/0000-replace-gethostbyname-getaddrinfo.patch b/0000-replace-gethostbyname-getaddrinfo.patch index fd80e9b..b49ba66 100644 --- a/0000-replace-gethostbyname-getaddrinfo.patch +++ b/0000-replace-gethostbyname-getaddrinfo.patch @@ -1,13 +1,28 @@ diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp -index 76c071c..f110825 100644 +index f110825..33212c7 100644 --- a/src/modules/hyprland/backend.cpp +++ b/src/modules/hyprland/backend.cpp -@@ -140,7 +140,7 @@ std::string IPC::getSocket1Reply(const std::string& rq) { +@@ -132,15 +132,20 @@ void IPC::unregisterForIPC(EventHandler* ev_handler) { + + std::string IPC::getSocket1Reply(const std::string& rq) { + // basically hyprctl +- ++ ++ struct addrinfo ai_hints; ++ struct addrinfo *ai_res = NULL; + const auto SERVERSOCKET = socket(AF_UNIX, SOCK_STREAM, 0); + + if (SERVERSOCKET < 0) { + spdlog::error("Hyprland IPC: Couldn't open a socket (1)"); return ""; } - -- const auto SERVER = gethostbyname("localhost"); -+ const auto SERVER = getaddrinfo("localhost", NULL, NULL, 0); +- +- const auto SERVER = getaddrinfo("localhost", NULL, NULL, 0); ++ ++ memset(&ai_hints, 0, sizeof(struct addrinfo)); ++ ai_hints.ai_family = AF_UNSPEC; ++ ai_hints.ai_socktype = SOCK_STREAM; ++ const auto SERVER = getaddrinfo("localhost", NULL, &ai_hints, &ai_res); if (!SERVER) { spdlog::error("Hyprland IPC: Couldn't get host (2)"); From db38cd0b44a494b01957fb3a2778312c637a428d38d17e28db696699fa0ba66b Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Fri, 2 Dec 2022 21:02:50 +0000 Subject: [PATCH 09/10] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=94 --- 0000-replace-gethostbyname-getaddrinfo.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/0000-replace-gethostbyname-getaddrinfo.patch b/0000-replace-gethostbyname-getaddrinfo.patch index b49ba66..ebb3f7b 100644 --- a/0000-replace-gethostbyname-getaddrinfo.patch +++ b/0000-replace-gethostbyname-getaddrinfo.patch @@ -1,5 +1,5 @@ diff --git a/src/modules/hyprland/backend.cpp b/src/modules/hyprland/backend.cpp -index f110825..33212c7 100644 +index 76c071c..33212c7 100644 --- a/src/modules/hyprland/backend.cpp +++ b/src/modules/hyprland/backend.cpp @@ -132,15 +132,20 @@ void IPC::unregisterForIPC(EventHandler* ev_handler) { @@ -17,7 +17,7 @@ index f110825..33212c7 100644 return ""; } - -- const auto SERVER = getaddrinfo("localhost", NULL, NULL, 0); +- const auto SERVER = gethostbyname("localhost"); + + memset(&ai_hints, 0, sizeof(struct addrinfo)); + ai_hints.ai_family = AF_UNSPEC; From 8bcf56f924fb042f1fba93c4c9007f9d4d67b8087716fad219a063dca34c2991 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Mon, 5 Dec 2022 22:34:00 +0000 Subject: [PATCH 10/10] Accepting request 1040414 from home:fbonazzi:branches:X11:Wayland - Fix: do not require versioned branding (bsc#1205950) - Add dependency to hhdate library now in Factory - Add _service file back now that we don't need to modify the source tarball - Move to obscpio archive to save space OBS-URL: https://build.opensuse.org/request/show/1040414 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=95 --- _service | 17 +++++++++++++++++ _servicedata | 4 ++++ waybar-0.9.16.obscpio | 3 +++ waybar-0.9.16.tar.gz | 3 --- waybar.changes | 8 ++++++++ waybar.obsinfo | 4 ++++ waybar.spec | 10 +++++----- 7 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 _service create mode 100644 _servicedata create mode 100644 waybar-0.9.16.obscpio delete mode 100644 waybar-0.9.16.tar.gz create mode 100644 waybar.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..1c46dad --- /dev/null +++ b/_service @@ -0,0 +1,17 @@ + + + git + https://github.com/Alexays/Waybar.git + 0.9.16 + @PARENT_TAG@ + (.*) + enable + waybar + + + + *.tar + gz + + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..ca22057 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/Alexays/Waybar.git + 9eb6c4e296d5736565c0434514b709d2bbb3bebe \ No newline at end of file diff --git a/waybar-0.9.16.obscpio b/waybar-0.9.16.obscpio new file mode 100644 index 0000000..f679c01 --- /dev/null +++ b/waybar-0.9.16.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e62ce31638c135c779173b2e448dd390296c1ce03da6772360be179ba5d9e2b +size 845836 diff --git a/waybar-0.9.16.tar.gz b/waybar-0.9.16.tar.gz deleted file mode 100644 index 81ed83a..0000000 --- a/waybar-0.9.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc1608ebd7ecc194f121a704155ceda6e5f3c50173ebc7125bba45203c62c23a -size 23685120 diff --git a/waybar.changes b/waybar.changes index f6a8f25..c1ad22c 100644 --- a/waybar.changes +++ b/waybar.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Dec 5 19:10:20 UTC 2022 - Filippo Bonazzi + +- Fix: do not require versioned branding (bsc#1205950) +- Add dependency to hhdate library now in Factory +- Add _service file back now that we don't need to modify the source tarball +- Move to obscpio archive to save space + ------------------------------------------------------------------- Fri Dec 2 13:52:41 UTC 2022 - Soc Virnyl Estela diff --git a/waybar.obsinfo b/waybar.obsinfo new file mode 100644 index 0000000..f5024b7 --- /dev/null +++ b/waybar.obsinfo @@ -0,0 +1,4 @@ +name: waybar +version: 0.9.16 +mtime: 1669318452 +commit: 9eb6c4e296d5736565c0434514b709d2bbb3bebe diff --git a/waybar.spec b/waybar.spec index 11f5ba2..e96a995 100644 --- a/waybar.spec +++ b/waybar.spec @@ -25,9 +25,6 @@ Group: System/GUI/Other URL: https://github.com/Alexays/Waybar Source0: %{name}-%{version}.tar.gz Patch0: 0000-replace-gethostbyname-getaddrinfo.patch -# use this to download tarball. then use `meson subprojects download` -# to get the `date` dependency. and create own tarball -# Source1: https://github.com/Alexays/Waybar/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake %if 0%{?sle_version} >= 150400 BuildRequires: gcc11-c++ @@ -41,6 +38,8 @@ BuildRequires: pkgconfig # test dependency BuildRequires: pkgconfig(catch2) >= 3.0 BuildRequires: sndio-devel >= 1.7.0 +# date module +BuildRequires: hhdate-devel # optional: man pages BuildRequires: scdoc # optional: tray module @@ -70,7 +69,8 @@ BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(wireplumber-0.4) BuildRequires: pkgconfig(xkbregistry) # requires branding -Requires: %{name}-branding = %{version} +# NOTE: unversioned branding is required to avoid issues like bsc#1205950 +Requires: %{name}-branding # optional: sway integration Recommends: sway @@ -94,7 +94,7 @@ BuildArch: noarch This package provides the upstream look and feel for sway. %prep -%autosetup -p1 -n Waybar-%{version} +%autosetup -p1 -n waybar-%{version} %build %if 0%{?sle_version} >= 150400