public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/atuin] f44: Allow shlex version 2
Date: Tue, 01 Sep 2026 13:02:34 GMT [thread overview]
Message-ID: <178826775455.1.3106147147434456743.rpms-atuin-37c5bf6eebd3@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/atuin
Branch : f44
Commit : 37c5bf6eebd308e9976c728d6de5ba9582c4fc3e
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-08-31T08:11:58+01:00
Stats : +17/-0 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/atuin/c/37c5bf6eebd308e9976c728d6de5ba9582c4fc3e?branch=f44
Log:
Allow shlex version 2
Update license list comment based on a current Rawhide build
---
diff --git a/atuin-18.12.1-shlex2.patch b/atuin-18.12.1-shlex2.patch
new file mode 100644
index 0000000..316021f
--- /dev/null
+++ b/atuin-18.12.1-shlex2.patch
@@ -0,0 +1,12 @@
+diff -Naur a/crates/atuin/Cargo.toml b/crates/atuin/Cargo.toml
+--- a/crates/atuin/Cargo.toml 2026-02-11 23:08:49.000000000 +0000
++++ b/crates/atuin/Cargo.toml 2026-08-31 07:45:06.823702540 +0100
+@@ -81,7 +81,7 @@
+ regex = "1.10.5"
+ norm = { version = "0.1.1", features = ["fzf-v2"] }
+ tempfile = { workspace = true }
+-shlex = "1.3.0"
++shlex = ">=1.3.0, <3.0.0"
+
+ [target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies]
+ arboard = { version = "3.4", optional = true }
diff --git a/atuin.spec b/atuin.spec
index a929571..22208f1 100644
--- a/atuin.spec
+++ b/atuin.spec
@@ -29,6 +29,7 @@ SourceLicense: MIT
# ISC
# MIT
# MIT AND (MIT OR Apache-2.0)
+# MIT AND Apache-2.0
# MIT AND BSD-3-Clause
# MIT OR Apache-2.0
# MIT OR Apache-2.0 OR Zlib
@@ -78,6 +79,10 @@ Patch: atuin-remove-divan.patch
# Bump prost-* dependencies to 0.14
# Cherry-picked from https://github.com/atuinsh/atuin/pull/3203
Patch: 3203.patch
+# refactor(deps): bump shlex from v1 to v2 - #4024
+# https://github.com/atuinsh/atuin/pull/4024
+# Rebased on v18.12.1; without changes to Cargo.lock; allows v1 for EPEL10.3
+Patch: atuin-18.12.1-shlex2.patch
BuildRequires: cargo-rpm-macros >= 24
%if %{with check} && %{with pgtests}
reply other threads:[~2026-09-01 13:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178826775455.1.3106147147434456743.rpms-atuin-37c5bf6eebd3@fedoraproject.org \
--to=code@musicinmybrain.net \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox