public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-tree-sitter-scala] epel10: Update to version 0.26.0; Resolves RHBZ#2371018
@ 2026-06-30 20:06 Michel Lind
  0 siblings, 0 replies; only message in thread
From: Michel Lind @ 2026-06-30 20:06 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/rust-tree-sitter-scala
            Branch : epel10
            Commit : f19ffa50d0c7462f7a6004604424e28a25b01dfb
            Author : Michel Lind <salimma@fedoraproject.org>
            Date   : 2026-06-30T15:37:19+01:00
            Stats  : +12/-57 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/rust-tree-sitter-scala/c/f19ffa50d0c7462f7a6004604424e28a25b01dfb?branch=epel10

            Log:
            Update to version 0.26.0; Resolves RHBZ#2371018

Signed-off-by: Michel Lind <salimma@fedoraproject.org>

---
diff --git a/.gitignore b/.gitignore
index ff97fe9..69c582d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tree-sitter-scala-0.23.4.crate
+/tree-sitter-scala-0.26.0.crate

diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index bd0a4d6..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Max Brunsfeld and GitHub
-
-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-scala.spec b/rust-tree-sitter-scala.spec
index c17b594..b8a85f4 100644
--- a/rust-tree-sitter-scala.spec
+++ b/rust-tree-sitter-scala.spec
@@ -1,23 +1,17 @@
-# Generated by rust2rpm 27
+# Generated by rust2rpm 28
 %bcond check 1
 %global debug_package %{nil}
 
 %global crate tree-sitter-scala
 
 Name:           rust-tree-sitter-scala
-Version:        0.23.4
+Version:        0.26.0
 Release:        %autorelease
 Summary:        Scala grammar for tree-sitter
 
 License:        MIT
 URL:            https://crates.io/crates/tree-sitter-scala
 Source:         %{crates_source}
-# * include license file
-# * https://github.com/tree-sitter/tree-sitter-scala/pull/453
-Source1:        https://raw.githubusercontent.com/tree-sitter/%{crate}/refs/tags/v%{version}/LICENSE
-# Manually created patch for downstream crate metadata changes
-# * include LICENSE
-Patch:          tree-sitter-scala-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
 
@@ -54,9 +48,9 @@ use the "default" feature of the "%{crate}" crate.
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
+# make sure we're not using node_modules
+rm -rf node_modules
 %cargo_prep
-# copy in license file
-cp -p %{SOURCE1} .
 
 %generate_buildrequires
 %cargo_generate_buildrequires

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 8499d44..b5e193a 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,23 +1,14 @@
 [package]
-cargo-toml-patch-comments = [
-  "include LICENSE",
-]
+# don't detect node_modules/*/LICENSE
+# we are deleting them anyway
 license-files = [
   "LICENSE",
 ]
 
-[[package.extra-sources]]
-number = 1
-file = "https://raw.githubusercontent.com/tree-sitter/%{crate}/refs/tags/v%{version}/LICENSE"
-comments = [
-  "include license file",
-  "https://github.com/tree-sitter/tree-sitter-scala/pull/453",
-]
-
 [scripts.prep]
-post = [
+pre = [
   """\
-# copy in license file
-cp -p %{SOURCE1} .\
-""",
+# make sure we're not using node_modules
+rm -rf node_modules\
+  """,
 ]

diff --git a/sources b/sources
index f062e3a..845beea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tree-sitter-scala-0.23.4.crate) = 3c57a01db9651a4c5829524cca9999e4bbc106d8b4ffb8fd86dab66a16dd83a743e46b9aa0f1ed2bb6f832e097f131d1602a10db5758c80d93f269f4dfac05b8
+SHA512 (tree-sitter-scala-0.26.0.crate) = 407a1770ed5bc487b9e8e4a9a75d56237479467e674153c1c7faefef09e12471b7433cc40a987f6d08cd76c2c1dd5ff68befd80172f245c82415565ba6200839

diff --git a/tree-sitter-scala-fix-metadata.diff b/tree-sitter-scala-fix-metadata.diff
deleted file mode 100644
index 15f305b..0000000
--- a/tree-sitter-scala-fix-metadata.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- tree-sitter-scala-0.23.4/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ tree-sitter-scala-0.23.4/Cargo.toml	2025-03-01T03:43:19.855396+00:00
-@@ -16,6 +16,7 @@
- authors = ["Max Brunsfeld <maxbrunsfeld@gmail.com>"]
- build = "bindings/rust/build.rs"
- include = [
-+    "LICENSE",
-     "bindings/rust/*",
-     "grammar.js",
-     "queries/*",

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

only message in thread, other threads:[~2026-06-30 20:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-30 20:06 [rpms/rust-tree-sitter-scala] epel10: Update to version 0.26.0; Resolves RHBZ#2371018 Michel Lind

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