From dee18e660032fe16a1b5fbf0a284f3e0311bd9f957554fbb9c6c856d5e62264d Mon Sep 17 00:00:00 2001
From: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
Date: Thu, 15 Jun 2023 13:15:10 +0000
Subject: [PATCH] - Use upstream tarball. - Add global dashed_version since
 upstream uses dashses instead of periods. - Update vendored dependencies.

OBS-URL: https://build.opensuse.org/package/show/X11:terminals/wezterm?expand=0&rev=70
---
 _service                                 | 24 +++---------------------
 vendor.tar.zst                           |  4 ++--
 wezterm-20230408.112425.69ae8472.tar.gz  |  3 +++
 wezterm-20230408.112425.69ae8472.tar.zst |  3 ---
 wezterm.changes                          |  7 +++++++
 wezterm.spec                             |  5 +++--
 6 files changed, 18 insertions(+), 28 deletions(-)
 create mode 100644 wezterm-20230408.112425.69ae8472.tar.gz
 delete mode 100644 wezterm-20230408.112425.69ae8472.tar.zst

diff --git a/_service b/_service
index 565995e..b293c8a 100644
--- a/_service
+++ b/_service
@@ -1,23 +1,7 @@
 <services>
-  <service mode="disabled" name="obs_scm">
-    <param name="url">https://github.com/wez/wezterm.git</param>
-    <param name="versionformat">@PARENT_TAG@</param>
-    <param name="scm">git</param>
-    <param name="revision">69ae847</param>
-    <param name="match-tag">*</param>
-    <param name="versionrewrite-pattern">(\d+)-(\d+)-(\w+)</param>
-    <param name="versionrewrite-replacement">\1.\2.\3</param>
-    <param name="changesgenerate">enable</param>
-    <param name="changesauthor">socvirnyl.estela@gmail.com</param>
-  </service>
-  <service mode="disabled" name="tar" />
-  <service mode="disabled" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">zstd</param>
-  </service>
-  <service mode="disabled" name="set_version"/>
+  <service mode="disabled" name="download_files" />
   <service name="cargo_vendor" mode="disabled">
-     <param name="srcdir">wezterm</param>
+     <param name="srctar">wezterm-20230408.112425.69ae8472.tar.gz</param>
      <param name="compression">zst</param>
      <param name="update">true</param>
 	 <param name="cargotoml">wezterm/Cargo.toml</param>
@@ -35,8 +19,6 @@
 	 <param name="cargotoml">wezterm-ssh/Cargo.toml</param>
 	 <param name="cargotoml">wezterm-toast-notification/Cargo.toml</param>
   </service>
-  <service name="cargo_audit" mode="disabled">
-     <param name="srcdir">wezterm</param>
-  </service>
+  <service name="cargo_audit" mode="disabled" />
 </services>
 
diff --git a/vendor.tar.zst b/vendor.tar.zst
index 7466124..0af6c8f 100644
--- a/vendor.tar.zst
+++ b/vendor.tar.zst
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cca49c4020717e5a454d9f44aaa415798558757e9ea86b7406763a2c6eb7cf55
-size 110557220
+oid sha256:640e6d607da311841d4b65b67a2aa09baa3a1d4bb5afe141ccab6a5ce07567f5
+size 110033666
diff --git a/wezterm-20230408.112425.69ae8472.tar.gz b/wezterm-20230408.112425.69ae8472.tar.gz
new file mode 100644
index 0000000..4fceafa
--- /dev/null
+++ b/wezterm-20230408.112425.69ae8472.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:52f457c32891cbd8258cb408b4db04f1de47ddf3872f448584375e8e8103d772
+size 86436383
diff --git a/wezterm-20230408.112425.69ae8472.tar.zst b/wezterm-20230408.112425.69ae8472.tar.zst
deleted file mode 100644
index 7ed3e9a..0000000
--- a/wezterm-20230408.112425.69ae8472.tar.zst
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8259974c96784eb1aa8d014e3f45bf4031c633be42f3218c77a19accb14de939
-size 105691139
diff --git a/wezterm.changes b/wezterm.changes
index f910cac..84d6d28 100644
--- a/wezterm.changes
+++ b/wezterm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun 15 13:10:46 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>
+
+- Use upstream tarball.
+- Add global dashed_version since upstream uses dashses instead of periods.
+- Update vendored dependencies.
+
 -------------------------------------------------------------------
 Wed Jun  7 22:44:44 UTC 2023 - Soc Virnyl Estela <socvirnyl.estela@gmail.com>
 
diff --git a/wezterm.spec b/wezterm.spec
index 879526d..2b26313 100644
--- a/wezterm.spec
+++ b/wezterm.spec
@@ -17,6 +17,7 @@
 
 
 %global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2
+%global _dashed_version 20230408-112425-69ae8472
 
 Name:           wezterm
 Version:        20230408.112425.69ae8472
@@ -24,7 +25,7 @@ Release:        0
 Summary:        GPU-accelerated cross-platform terminal emulator and multiplexer
 URL:            https://github.com/wez/wezterm
 License:        (Apache-2.0 OR MIT) AND BSD-3-Clause AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR BSL-1.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT OR BSD-2-Clause) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND ISC AND LGPL-2.1-only AND MIT AND MPL-2.0 AND WTFPL AND Zlib AND MIT
-Source0:        %{name}-%{version}.tar.zst
+Source0:        https://github.com/wez/wezterm/archive/refs/tags/%{_dashed_version}tar.gz#/%{name}-%{version}.tar.gz
 Source1:        vendor.tar.zst
 Source2:        cargo_config
 Requires:       terminfo
@@ -96,7 +97,7 @@ BuildArch:      noarch
 Zsh completion script for %{name}.
 
 %prep
-%autosetup -a1
+%autosetup -a1 -n %{name}-%{_dashed_version}
 mkdir -p .cargo
 cp %{SOURCE2} .cargo/config
 tic -vvv -x -o terminfo termwiz/data/%{name}.terminfo