public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-tree-sitter-cli] f44: Update to version 0.26.9; Fixes RHBZ#2420886
@ 2026-06-03  8:05 Aleksei Bavshin
  0 siblings, 0 replies; only message in thread
From: Aleksei Bavshin @ 2026-06-03  8:05 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/rust-tree-sitter-cli
Branch : f44
Commit : c035e8d14d9cb0087a5ae95f868a09f9c2cbb075
Author : Aleksei Bavshin <alebastr@fedoraproject.org>
Date   : 2026-05-29T00:36:16-07:00
Stats  : +25/-74 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-tree-sitter-cli/c/c035e8d14d9cb0087a5ae95f868a09f9c2cbb075?branch=f44

Log:
Update to version 0.26.9; Fixes RHBZ#2420886

---
diff --git a/.gitignore b/.gitignore
index bc5aa3f..a9f3c40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ results_*/
 /tree-sitter-cli-0.25.5.crate
 /tree-sitter-cli-0.25.8.crate
 /tree-sitter-cli-0.25.10.crate
+/tree-sitter-cli-0.26.9.crate

diff --git a/LICENSE.upstream b/LICENSE.upstream
deleted file mode 100644
index 451fe1d..0000000
--- a/LICENSE.upstream
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018-2024 Max Brunsfeld
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

diff --git a/rust-tree-sitter-cli.spec b/rust-tree-sitter-cli.spec
index 120f707..63bdbd3 100644
--- a/rust-tree-sitter-cli.spec
+++ b/rust-tree-sitter-cli.spec
@@ -1,22 +1,19 @@
-# Generated by rust2rpm 27
+# Generated by rust2rpm 28
 # * Requires unpublished crate tree-sitter-tests-proc-macro
 %bcond check 0
 
 %global crate tree-sitter-cli
 
 Name:           rust-tree-sitter-cli
-Version:        0.25.10
+Version:        0.26.9
 Release:        %autorelease
 Summary:        CLI tool for developing, testing, and using Tree-sitter parsers
 
 License:        MIT
 URL:            https://crates.io/crates/tree-sitter-cli
 Source:         %{crates_source}
-# * Upstream license file - tree-sitter/tree-sitter#1520
-Source2:        https://github.com/tree-sitter/tree-sitter/raw/v%{version}/LICENSE#/LICENSE.upstream
 # Manually created patch for downstream crate metadata changes
-# * Disable feature 'wasm'
-# * Downgrade 'similar' to the version available in Fedora
+# * Disable features 'wasm' and 'qjs-rt'
 Patch:          tree-sitter-cli-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
@@ -30,7 +27,6 @@ CLI tool for developing, testing, and using Tree-sitter parsers.}
 Summary:        %{summary}
 # (MIT OR Apache-2.0) AND Unicode-DFS-2016
 # Apache-2.0
-# Apache-2.0 OR BSL-1.0
 # Apache-2.0 OR MIT
 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
 # BSD-2-Clause OR Apache-2.0 OR MIT
@@ -39,6 +35,7 @@ Summary:        %{summary}
 # MIT
 # MIT AND Unicode-DFS-2016 AND BSD-2-Clause AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain
 # MIT OR Apache-2.0
+# MIT-0 OR Apache-2.0
 # Unicode-3.0
 # Unlicense OR MIT
 # Zlib
@@ -47,7 +44,6 @@ License:        %{shrink:
                 MIT
                 AND (MIT OR Apache-2.0)
                 AND Apache-2.0
-                AND (Apache-2.0 OR BSL-1.0)
                 AND (Apache-2.0 OR MIT)
                 AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT)
                 AND (BSD-2-Clause OR Apache-2.0 OR MIT)
@@ -56,6 +52,7 @@ License:        %{shrink:
                 AND BSD-3-Clause
                 AND LGPL-3.0-or-later
                 AND LicenseRef-Fedora-Public-Domain
+                AND (MIT-0 OR Apache-2.0)
                 AND Unicode-3.0
                 AND Unicode-DFS-2016
                 AND (Unlicense OR MIT)
@@ -107,9 +104,6 @@ use the "default" feature of the "%{crate}" crate.
 %prep
 %autosetup -n %{crate}-%{version} -p1
 %cargo_prep
-cp -pav %{SOURCE2} LICENSE
-# Delete unwanted files
-rm -rf npm
 
 %generate_buildrequires
 %cargo_generate_buildrequires

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 63a46cd..cdc381e 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,24 +1,17 @@
 [package]
-cargo-toml-patch-comments = [
-    "Disable feature 'wasm'",
-    "Downgrade 'similar' to the version available in Fedora",
-]
-license-files = { include = ["LICENSE"] }
+bin-package-extra = """
+# tree-sitter build wants a C compiler
+Recommends:     gcc
 
-[[package.extra-sources]]
-comments = ["Upstream license file - tree-sitter/tree-sitter#1520"]
-file = "https://github.com/tree-sitter/tree-sitter/raw/v%{version}/LICENSE#/LICENSE.upstream"
-number = 2
-
-[scripts.prep]
-post = [
-    "cp -pav %{SOURCE2} LICENSE",
-    "# Delete unwanted files",
-    "rm -rf npm",
+# tree-sitter generate runs JavaScript
+Recommends:     nodejs
+"""
+cargo-toml-patch-comments = [
+    "Disable features 'wasm' and 'qjs-rt'",
 ]
 
 [tests]
-run = ["none"]
+run = false
 comments = [
     "Requires unpublished crate tree-sitter-tests-proc-macro",
 ]

diff --git a/sources b/sources
index 01d81ee..4cb938e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tree-sitter-cli-0.25.10.crate) = be13ff570e8c763bf0e51bacef0ab0f4ce822bf4f903fa38736103bbf0a28b477844188a0daa239018b2b346c7f3bc8639e7c7fa5936e4d9309f33ee5468748b
+SHA512 (tree-sitter-cli-0.26.9.crate) = cdac5137163a7f04ce34e1bd83f5635ee8f84b0008b7fdc7edf04bcaf8558c16c7e638528f34c7701d8b767ae4032e4f46d40912a3ad011fa29754f0ca4acbc5

diff --git a/tree-sitter-cli-fix-metadata.diff b/tree-sitter-cli-fix-metadata.diff
index e98fd78..e4d0e6a 100644
--- a/tree-sitter-cli-fix-metadata.diff
+++ b/tree-sitter-cli-fix-metadata.diff
@@ -1,32 +1,16 @@
---- tree-sitter-cli-0.25.10/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ tree-sitter-cli-0.25.10/Cargo.toml	2025-09-28T18:29:54.692643+00:00
-@@ -21,6 +21,7 @@
- build = "build.rs"
- include = [
-     "build.rs",
-+    "LICENSE",
-     "README.md",
-     "benches/*",
-     "src/**",
-@@ -44,12 +45,6 @@
- license = "MIT"
- repository = "https://github.com/tree-sitter/tree-sitter"
+--- tree-sitter-cli-0.26.9/Cargo.toml	2006-07-24T01:21:28+00:00
++++ tree-sitter-cli-0.26.9/Cargo.toml	2026-05-29T06:42:48.541241+00:00
+@@ -80,12 +80,7 @@
+ pkg-url = "{ repo }/releases/download/v{ version }/{ name }-macos-x64{ archive-suffix }"
  
--[features]
+ [features]
+-default = ["qjs-rt"]
+-qjs-rt = ["tree-sitter-generate/qjs-rt"]
 -wasm = [
 -    "tree-sitter/wasm",
 -    "tree-sitter-loader/wasm",
 -]
--
++default = []
+ 
  [lib]
  name = "tree_sitter_cli"
- path = "src/lib.rs"
-@@ -156,7 +151,7 @@
- features = ["preserve_order"]
- 
- [dependencies.similar]
--version = "2.7.0"
-+version = "2.6.0"
- 
- [dependencies.smallbitvec]
- version = "2.5.3"

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-03  8:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-03  8:05 [rpms/rust-tree-sitter-cli] f44: Update to version 0.26.9; Fixes RHBZ#2420886 Aleksei Bavshin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox