From 8bcf56f924fb042f1fba93c4c9007f9d4d67b8087716fad219a063dca34c2991 Mon Sep 17 00:00:00 2001
From: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
Date: Mon, 5 Dec 2022 22:34:00 +0000
Subject: [PATCH] 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 @@
+<services>
+  <service name="obs_scm" mode="manual">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/Alexays/Waybar.git</param>
+    <param name="revision">0.9.16</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="versionrewrite-pattern">(.*)</param>
+    <param name="changesgenerate">enable</param>
+    <param name="filename">waybar</param>
+  </service>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
+  </service>
+  <service name="set_version" mode="manual"/>
+</services>
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..ca22057
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://github.com/Alexays/Waybar.git</param>
+              <param name="changesrevision">9eb6c4e296d5736565c0434514b709d2bbb3bebe</param></service></servicedata>
\ 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 <filippo.bonazzi@suse.com>
+
+- 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 <socvirnyl.estela@gmail.com>
 
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