Accepting request 1201370 from editors

OBS-URL: https://build.opensuse.org/request/show/1201370
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tree-sitter?expand=0&rev=13

_service

@@ -1,8 +1,7 @@
 <services>
   <service name="download_files" mode="manual" />
   <service name="cargo_vendor" mode="manual">
-     <param name="srctar">tree-sitter-*.tar.xz</param>
+     <param name="srctar">tree-sitter-*.tar.gz</param>
      <param name="update">true</param>
   </service>
-  <service name="cargo_audit" mode="manual" />
 </services>

baselibs.conf

@@ -1 +1 @@
-libtree-sitter0
+libtree-sitter0_23

tree-sitter-0.23.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6403b361b0014999e96f61b9c84d6950d42f0c7d6e806be79382e0232e48a11b
+size 2977346

tree-sitter.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Aug 26 16:33:54 UTC 2024 - Richard Rahl <rrahl0@opensuse.org>
+
+- update to 0.23.0:
+  * test: modernize scanner files
+  * fix: always reset to the first language when iterating over language
+  * feat(zig): update outdated path syntax
+  * feat(bindings): add query constants to python
+  * style(bindings): fix indent & line endings
+  * feat(dsl)!: support other JS runtimes
+  * feat(bindings): add node, python, swift tests 
+  * introduce tree-sitter-language crate for grammar crates to depend on
+  * refactor: remove ansi_term dependency
+  * refactor: remove difference dependency
+  * feat: add fuzz subcommand
+  * fix(wasm): update test
+  * feat(lib): add ts_query_end_byte_for_pattern
+  * fix(rust): fix new clippy warnings
+  * feat(lib): support no_std
+  * Reset language when resetting wasm store
+  * docs: clean up binding & parser lists
+  * clone wasm store engine
+  * fix(cli): dedup preceding_auxiliary_symbols
+- use of ldconfig_scriptlets, and removal of the duplicate setting of buildflags
+
 -------------------------------------------------------------------
 Fri Jun 21 20:32:46 UTC 2024 - Richard Rahl <rrahl0@disroot.org>
 

tree-sitter.spec

@@ -16,15 +16,14 @@
 #
 
 
-%define somajor 0
-%define libdirname tree_sitter
+%define         somajor 0_23
 Name:           tree-sitter
-Version:        0.22.6
+Version:        0.23.0
 Release:        0
 Summary:        An incremental parsing system for programming tools
 License:        GPL-2.0-only AND MIT
 URL:            https://tree-sitter.github.io/
-Source0:        https://github.com/tree-sitter/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.xz
+Source0:        https://github.com/tree-sitter/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        vendor.tar.zst
 Source11:       baselibs.conf
 Source20:       tree-sitter-target.py
@@ -35,7 +34,7 @@ Source24:       compile-macros.sh
 Source25:       treesitter_grammar.attr
 Source26:       treesitter_grammar.req
 BuildRequires:  cargo-packaging
-BuildRequires:  rust > 1.40
+BuildRequires:  rust > 1.74.1
 Requires:       lib%{name}%{somajor} = %{version}
 Requires:       nodejs
 %{?suse_build_hwcaps_libs}
@@ -55,6 +54,7 @@ edited. Tree-sitter aims to be:
 
 %package     -n lib%{name}%{somajor}
 Summary:        Asychronous I/O support library
+Obsoletes:      lib%{name}0 < %{version}
 
 %description -n lib%{name}%{somajor}
 Tree-sitter is a parser generator tool and an incremental parsing
@@ -85,19 +85,14 @@ sed -i -e '/^VERSION/s/:= .*$/:= %{version}/' Makefile
 
 %build
 %{cargo_build}
-export CFLAGS='%{optflags}'
-export PREFIX='%{_prefix}' LIBDIR='%{_libdir}'
-%make_build
+%make_build PREFIX=%{_prefix} LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}
 
 sh %{SOURCE24}
 
 %install
-export PREFIX='%{_prefix}' LIBDIR='%{_libdir}' INCLUDEDIR='%{_includedir}'
-%make_install
-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
+%make_install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}
+install -p -m 0755 -D %{_builddir}/%{name}-%{version}/target/release/%{name} \
+    %{buildroot}%{_bindir}/%{name}
 
 install -Dm644 macros.treesitter %{buildroot}%{_rpmmacrodir}/macros.treesitter
 install -Dm755 %{SOURCE20} %{buildroot}%{_rpmconfigdir}/$(basename %{SOURCE20})
@@ -105,28 +100,32 @@ install -Dm755 %{SOURCE20} %{buildroot}%{_rpmconfigdir}/$(basename %{SOURCE20})
 install -Dm644 %{SOURCE25} %{buildroot}%{_fileattrsdir}/$(basename %{SOURCE25})
 install -Dm755 %{SOURCE26} %{buildroot}%{_rpmconfigdir}/$(basename %{SOURCE26})
 
-%post -n lib%{name}%{somajor} -p /sbin/ldconfig
+#remove .a/.la files
+find %{buildroot} -type f \( -name "*.la" -o -name "*.a" \) -delete -print
 
-%postun -n lib%{name}%{somajor} -p /sbin/ldconfig
+# stupid workaround for "integrating" the grammars into neovim
+install -d %{buildroot}%{_libdir}/tree_sitter
+
+%ldconfig_scriptlets -n lib%{name}%{somajor}
 
 %files
 %license LICENSE
 %doc README.md CONTRIBUTING.md
-%{_bindir}/tree-sitter
-%{_rpmconfigdir}/tree-sitter-target.py
+%{_bindir}/%{name}
+%{_rpmconfigdir}/%{name}-target.py
 %{_rpmmacrodir}/macros.treesitter
 %{_rpmconfigdir}/treesitter_grammar.req
 %{_fileattrsdir}/treesitter_grammar.attr
 
 %files -n lib%{name}%{somajor}
 %license LICENSE
-%{_libdir}/*.so.*
+%{_libdir}/lib%{name}.so.*
+%dir %{_libdir}/tree_sitter
 
 %files devel
 %doc docs/
-%dir %{_includedir}/%{libdirname}/
-%{_includedir}/%{libdirname}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%{_includedir}/tree_sitter
+%{_libdir}/lib%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
 
 %changelog