From 7d55107cf247b97a18594b0b795e3eb0df8e3dbcd73af5f9999c51f1d1bb7780 Mon Sep 17 00:00:00 2001
From: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
Date: Thu, 1 Dec 2022 22:45:41 +0000
Subject: [PATCH] - 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 @@
-<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>
-  </service>
-  <service name="tar" mode="buildtime"/>
-  <service name="recompress" mode="buildtime">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service name="set_version" mode="manual"/>
-</services>
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index ca22057..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,4 +0,0 @@
-<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.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 <socvirnyl.estela@gmail.com>
+
+- 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 <filippo.bonazzi@suse.com>
 
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