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/rust-difftastic] f44: Allow tikv-jemallocator 0.7
Date: Sun, 07 Jun 2026 06:41:48 GMT [thread overview]
Message-ID: <178081450831.1.7422846947832923552.rpms-rust-difftastic-ca490fc546f8@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/rust-difftastic
Branch : f44
Commit : ca490fc546f882b52859620ee2f73250000e8e9f
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date : 2026-06-04T12:42:51+01:00
Stats : +9/-3 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/rust-difftastic/c/ca490fc546f882b52859620ee2f73250000e8e9f?branch=f44
Log:
Allow tikv-jemallocator 0.7
- Update `License` field based on a current build
---
diff --git a/difftastic-fix-metadata.diff b/difftastic-fix-metadata.diff
index f8f4328..6852836 100644
--- a/difftastic-fix-metadata.diff
+++ b/difftastic-fix-metadata.diff
@@ -1,5 +1,5 @@
--- difftastic-0.67.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ difftastic-0.67.0/Cargo.toml 2025-12-29T11:49:24.026013+00:00
++++ difftastic-0.67.0/Cargo.toml 2026-06-04T11:28:03.895428+00:00
@@ -67,7 +67,6 @@
[dependencies.crossterm]
@@ -52,3 +52,9 @@
[dependencies.tree-sitter-pascal]
version = "0.10.0"
+@@ -326,4 +322,4 @@
+ [features]
+
+ [target."cfg(not(any(target_env = \"msvc\", target_os = \"illumos\", target_os = \"freebsd\")))".dependencies.tikv-jemallocator]
+-version = "0.6"
++version = ">=0.6, <0.8"
diff --git a/rust-difftastic.spec b/rust-difftastic.spec
index 556959f..807bd8f 100644
--- a/rust-difftastic.spec
+++ b/rust-difftastic.spec
@@ -20,6 +20,7 @@ Source1: https://github.com/Wilfred/difftastic/raw/%{version}/difft.1
# * allow strum 0.27: https://github.com/Wilfred/difftastic/pull/822
# * temporarily drop tree-sitter-clojure-orchard, pending legal clarification
# * bump tree-sitter-ocaml from 0.23.2 to 0.24
+# * allow tikv-jemallocator 0.7: https://github.com/Wilfred/difftastic/pull/985
Patch: difftastic-fix-metadata.diff
# * strip out Clojure support from the codebase
# * https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/thread/D476PEK5GI4D5OSF4QBKZLHM77QC3LSH/
@@ -37,7 +38,6 @@ Summary: %{summary}
# (Apache-2.0 OR MIT) AND BSD-3-Clause
# (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
# CECILL-C
@@ -51,7 +51,6 @@ License: %{shrink:
AND (Apache-2.0 OR MIT) AND BSD-3-Clause
AND Unicode-DFS-2016
AND Apache-2.0
- AND (Apache-2.0 OR BSL-1.0)
AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT)
AND CECILL-C
AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain
diff --git a/rust2rpm.toml b/rust2rpm.toml
index ca67d84..50795fb 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -12,6 +12,7 @@ cargo-toml-patch-comments = [
"allow strum 0.27: https://github.com/Wilfred/difftastic/pull/822",
"temporarily drop tree-sitter-clojure-orchard, pending legal clarification",
"bump tree-sitter-ocaml from 0.23.2 to 0.24",
+ "allow tikv-jemallocator 0.7: https://github.com/Wilfred/difftastic/pull/985",
]
extra-files = [
"%{_mandir}/man1/difft.1*",
reply other threads:[~2026-06-07 6:41 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=178081450831.1.7422846947832923552.rpms-rust-difftastic-ca490fc546f8@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