[packages/lnav] add support for prql

atler atler at pld-linux.org
Mon Apr 13 01:08:33 CEST 2026


commit d053718fcf4ac2f2b62a0fceca2e58413bd27466
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Apr 13 00:28:33 2026 +0200

    add support for prql

 lnav.spec | 45 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)
---
diff --git a/lnav.spec b/lnav.spec
index a865a69..783bc0b 100644
--- a/lnav.spec
+++ b/lnav.spec
@@ -1,3 +1,5 @@
+%define		crates_ver	0.14.0
+
 Summary:	Log file navigator
 Name:		lnav
 Version:	0.14.0
@@ -6,10 +8,13 @@ License:	BSD
 Group:		Applications
 Source0:	https://github.com/tstack/lnav/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5:	4d6a97ff06250410e697dd340c983a78
+Source1:	%{name}-crates-%{crates_ver}.tar.xz
+# Source1-md5:	839d5ceb03a0ec93d257f5d2aebe16c1
 URL:		https://lnav.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
+BuildRequires:	cargo
 BuildRequires:	curl-devel >= 7.23.0
 BuildRequires:	jemalloc-devel
 BuildRequires:	libarchive-devel
@@ -18,8 +23,13 @@ BuildRequires:	libstdc++-devel >= 6:8
 BuildRequires:	libunistring-devel
 BuildRequires:	pcre2-8-devel
 BuildRequires:	re2c
+BuildRequires:	rpmbuild(macros) >= 2.059
+BuildRequires:	rust >= 1.70.0
 BuildRequires:	sqlite3-devel >= 3.9.0
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 BuildRequires:	zlib-devel
+%{?rust_req}
 Requires:	curl-libs >= 7.23.0
 Requires:	sqlite3-libs >= 3.9.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -36,7 +46,28 @@ efficiently zero in on problems.
 
 
 %prep
-%setup -q
+%setup -q -a1
+
+%{__mv} %{name}-%{crates_ver}/src/third-party/lnav-rs-ext/* src/third-party/lnav-rs-ext
+cd src/third-party/lnav-rs-ext
+
+# use our offline registry
+export CARGO_HOME="$(pwd)/.cargo"
+
+mkdir -p "$CARGO_HOME"
+cat >.cargo/config <<EOF
+[source.crates-io]
+registry = 'https://github.com/rust-lang/crates.io-index'
+replace-with = 'vendored-sources'
+
+[source.'git+https://github.com/tstack/log2src.git?branch=caching1']
+git = 'https://github.com/tstack/log2src.git'
+branch = 'caching1'
+replace-with = 'vendored-sources'
+
+[source.vendored-sources]
+directory = '$PWD/vendor'
+EOF
 
 %build
 %{__aclocal} -I m4
@@ -46,8 +77,18 @@ efficiently zero in on problems.
 %configure \
 	--disable-silent-rules \
 	--disable-static \
-	--without-cargo \
 	--with-jemalloc
+
+cd src/third-party/lnav-rs-ext
+export CARGO_HOME="$(pwd)/.cargo"
+
+%cargo_build --frozen --package lnav-rs-ext
+if [ "%{cargo_objdir}" != "target/release" ]; then
+mkdir -p target/release
+cp -p %{cargo_objdir}/liblnav_rs_ext.a target/release
+fi
+cd ../../..
+
 %{__make}
 
 %install
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lnav.git/commitdiff/d053718fcf4ac2f2b62a0fceca2e58413bd27466



More information about the pld-cvs-commit mailing list