From 1f89e0ab89d4b3e066a1ae4f0b2433f89b06337782c57dd5b9e2701a60401eb7 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Mon, 20 Jun 2022 06:25:26 +0000
Subject: [PATCH] Accepting request 983682 from
 home:uncomfyhalomacro:branches:editors

- Update to version 0.20.6:
  * 0.20.6
  * libs: 0.20.6
  * Properly incorporate lookahead bytes when recovering via missing token
  * Improve randomized testing setup
  * Run cargo test directly on CI
  * Set CLI as default workspace member
  * Don't generate primary states array if it will be unused due to abi version setting
  * tags: 0.20.2
  * 0.20.5
  * libs: 0.20.5

OBS-URL: https://build.opensuse.org/request/show/983682
OBS-URL: https://build.opensuse.org/package/show/editors/tree-sitter?expand=0&rev=6
---
 _service                  | 23 +++++++++++++++++++++++
 cargo_config              |  5 +++++
 tree-sitter-0.20.4.tar.gz |  3 ---
 tree-sitter-0.20.6.tar.xz |  3 +++
 tree-sitter-vendor.tar.xz |  3 ---
 tree-sitter.changes       | 15 +++++++++++++++
 tree-sitter.spec          | 30 ++++++++++--------------------
 vendor.tar.xz             |  3 +++
 8 files changed, 59 insertions(+), 26 deletions(-)
 create mode 100644 cargo_config
 delete mode 100644 tree-sitter-0.20.4.tar.gz
 create mode 100644 tree-sitter-0.20.6.tar.xz
 delete mode 100644 tree-sitter-vendor.tar.xz
 create mode 100644 vendor.tar.xz

diff --git a/_service b/_service
index 02841b3..73abacd 100644
--- a/_service
+++ b/_service
@@ -1,4 +1,27 @@
 <services>
+  <service mode="disabled" name="obs_scm">
+    <param name="url">https://github.com/tree-sitter/tree-sitter</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="scm">git</param>
+    <param name="revision">ccd6bf554d922596ce905730d98a77af368bba5c</param>
+    <param name="match-tag">*</param>
+    <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
+    <param name="versionrewrite-replacement">\1</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">xz</param>
+  </service>
+  <service mode="disabled" name="set_version"/>
+  <service name="cargo_vendor" mode="disabled">
+     <param name="srcdir">tree-sitter</param>
+     <param name="compression">xz</param>
+     <param name="update">true</param>
+  </service>
   <service name="cargo_audit" mode="disabled">
+     <param name="srcdir">tree-sitter</param>
   </service>
 </services>
diff --git a/cargo_config b/cargo_config
new file mode 100644
index 0000000..6fb4ff4
--- /dev/null
+++ b/cargo_config
@@ -0,0 +1,5 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
\ No newline at end of file
diff --git a/tree-sitter-0.20.4.tar.gz b/tree-sitter-0.20.4.tar.gz
deleted file mode 100644
index 49edd48..0000000
--- a/tree-sitter-0.20.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:979ad0b36eb90975baf0c65d155d106276cac08afb1c2fe0ad54d4b7d498ce39
-size 2909707
diff --git a/tree-sitter-0.20.6.tar.xz b/tree-sitter-0.20.6.tar.xz
new file mode 100644
index 0000000..6ca008a
--- /dev/null
+++ b/tree-sitter-0.20.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29bb3cf7aad8a958e82fdda71d152ee0e4877515eb48fba9aa2a7e7357898e89
+size 524176
diff --git a/tree-sitter-vendor.tar.xz b/tree-sitter-vendor.tar.xz
deleted file mode 100644
index d1e32c9..0000000
--- a/tree-sitter-vendor.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5652d52a933a8f86dde61f74ddb90fa76104bea9af1601d36fb2ec2625b0d972
-size 8100748
diff --git a/tree-sitter.changes b/tree-sitter.changes
index e87c773..6bfd633 100644
--- a/tree-sitter.changes
+++ b/tree-sitter.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun Jun 19 09:12:46 UTC 2022 - socvirnyl.estela@gmail.com
+
+- Update to version 0.20.6:
+  * 0.20.6
+  * libs: 0.20.6
+  * Properly incorporate lookahead bytes when recovering via missing token
+  * Improve randomized testing setup
+  * Run cargo test directly on CI
+  * Set CLI as default workspace member
+  * Don't generate primary states array if it will be unused due to abi version setting
+  * tags: 0.20.2
+  * 0.20.5
+  * libs: 0.20.5
+
 -------------------------------------------------------------------
 Tue Feb 22 16:46:36 UTC 2022 - Matej Cepl <mcepl@suse.com>
 
diff --git a/tree-sitter.spec b/tree-sitter.spec
index 894d2b4..709c057 100644
--- a/tree-sitter.spec
+++ b/tree-sitter.spec
@@ -19,17 +19,16 @@
 %define somajor 0
 %define libdirname tree_sitter
 Name:           tree-sitter
-Version:        0.20.4
+Version:        0.20.6
 Release:        0
 Summary:        An incremental parsing system for programming tools
 License:        MIT
 URL:            https://tree-sitter.github.io/
-Source0:        https://github.com/tree-sitter/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source1:        tree-sitter-vendor.tar.xz
-BuildRequires:  nodejs
-BuildRequires:  npm
-# because of gh#meta-rust/cargo-bitbake#13
-BuildRequires:  cargo > 1.40
+Source0:        https://github.com/tree-sitter/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.xz
+Source1:        vendor.tar.xz
+Source2:        cargo_config
+BuildRequires:  cargo-packaging
+BuildRequires:  rust > 1.40
 Requires:       lib%{name}%{somajor} = %{version}
 
 %description
@@ -64,20 +63,11 @@ developing applications that use %{name}.
 
 %prep
 %autosetup -p1 -a1
-
-rm -v docs/.gitignore
-
-mkdir .cargo
-cat >.cargo/config <<EOF
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "./vendor"
-EOF
+mkdir -p .cargo
+cp %{SOURCE2} .cargo/config
 
 %build
-cargo build --release
+%{cargo_build}
 export CFLAGS='%{optflags}'
 export PREFIX='%{_prefix}' LIBDIR='%{_libdir}'
 %make_build
@@ -85,7 +75,7 @@ export PREFIX='%{_prefix}' LIBDIR='%{_libdir}'
 %install
 export PREFIX='%{_prefix}' LIBDIR='%{_libdir}' INCLUDEDIR='%{_includedir}'
 %make_install
-install -p -m 0755 -D target/release/tree-sitter \
+install -p -m 0755 -D %{_builddir}/%{name}-%{version}/target/release/tree-sitter \
     %{buildroot}%{_bindir}/tree-sitter
 
 find %{buildroot} -type f \( -name "*.la" -o -name "*.a" \) -delete -print
diff --git a/vendor.tar.xz b/vendor.tar.xz
new file mode 100644
index 0000000..57d7140
--- /dev/null
+++ b/vendor.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a826a40e897b3a158752fdeeffb10a533768b469e79fdf417c90f039eedb053
+size 8102032