public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Fabio Valentini <decathorpe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/rust-colored_json2] rawhide: compat package no longer needed
Date: Wed, 24 Jun 2026 13:32:56 GMT [thread overview]
Message-ID: <178230797630.1.5981597640892180767.rpms-rust-colored_json2-488256f20e98@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/rust-colored_json2
Branch : rawhide
Commit : 488256f20e984c18356ca50cfc5927e3f1a9d494
Author : Fabio Valentini <decathorpe@gmail.com>
Date : 2026-06-24T15:32:49+02:00
Stats : +1/-156 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/rust-colored_json2/c/488256f20e984c18356ca50cfc5927e3f1a9d494?branch=rawhide
Log:
compat package no longer needed
---
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1d08dcd..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/colored_json-2.1.0.crate
diff --git a/colored_json-2-no-atty.patch b/colored_json-2-no-atty.patch
deleted file mode 100644
index a6af894..0000000
--- a/colored_json-2-no-atty.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur colored_json-2.1.0-original/src/lib.rs colored_json-2.1.0/src/lib.rs
---- colored_json-2.1.0-original/src/lib.rs 2019-11-04 10:00:21.000000000 +0000
-+++ colored_json-2.1.0/src/lib.rs 2026-02-21 10:36:10.700074924 +0000
-@@ -136,20 +136,18 @@
- //!```
-
- extern crate ansi_term;
--extern crate atty;
- #[cfg(unix)]
- extern crate libc;
- extern crate serde;
- extern crate serde_json;
-
--use std::io;
-+use std::io::{self, IsTerminal};
-
- #[cfg(windows)]
- pub use ansi_term::enable_ansi_support;
- pub use ansi_term::Colour;
- pub use ansi_term::Colour as Color;
- pub use ansi_term::Style;
--use atty::Stream;
- use serde::Serialize;
- use serde_json::ser::Formatter;
- pub use serde_json::ser::{CompactFormatter, PrettyFormatter};
-@@ -744,8 +742,8 @@
- impl ColorMode {
- fn is_tty(output: Output) -> bool {
- match output {
-- Output::StdOut => atty::is(Stream::Stdout),
-- Output::StdErr => atty::is(Stream::Stderr),
-+ Output::StdOut => io::stdout().is_terminal(),
-+ Output::StdErr => io::stderr().is_terminal(),
- }
- }
-
diff --git a/colored_json-fix-metadata.diff b/colored_json-fix-metadata.diff
deleted file mode 100644
index 363cd16..0000000
--- a/colored_json-fix-metadata.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- colored_json-2.1.0/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ colored_json-2.1.0/Cargo.toml 2026-02-21T10:32:46.202840+00:00
-@@ -27,9 +27,6 @@
- [dependencies.ansi_term]
- version = "0.12"
-
--[dependencies.atty]
--version = "0.2"
--
- [dependencies.serde]
- version = "1"
-
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..3f67be8
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+compat package no longer needed
diff --git a/rust-colored_json2.spec b/rust-colored_json2.spec
deleted file mode 100644
index 45abad8..0000000
--- a/rust-colored_json2.spec
+++ /dev/null
@@ -1,83 +0,0 @@
-# Generated by rust2rpm 28
-%bcond check 1
-%global debug_package %{nil}
-
-%global crate colored_json
-
-Name: rust-colored_json2
-Version: 2.1.0
-Release: %autorelease
-Summary: Colorize JSON, for printing it out on the command line
-
-License: EPL-2.0
-URL: https://crates.io/crates/colored_json
-Source: %{crates_source}
-# Manually created patch for downstream crate metadata changes
-# * Drop dependency on unmaintained atty crate. Upstream did this in
-# https://github.com/ctron/colored_json/commit/b670fc1b90cd8ea423d7332ea48d720211537d3d,
-# switching to is_terminal, followed by a switch to stdlib functionality in
-# https://github.com/ctron/colored_json/commit/3ec8713fd840beca41f8ca8cb8c7461f7493edd4.
-# A small source patch is required to replace atty.
-Patch: colored_json-fix-metadata.diff
-# * Source patch to replace the unmaintained atty crate with
-# std::io::IsTerminal; part of “migrate from atty to is_terminal due to
-# RUSTSEC-2021-0145,”
-# https://github.com/ctron/colored_json/commit/b670fc1b90cd8ea423d7332ea48d720211537d3d,
-# followed by part of “feat: use `std`'s `is_terminal()`,”
-# https://github.com/ctron/colored_json/commit/3ec8713fd840beca41f8ca8cb8c7461f7493edd4.
-Patch10: colored_json-2-no-atty.patch
-
-BuildRequires: cargo-rpm-macros >= 24
-
-%global _description %{expand:
-Colorize JSON, for printing it out on the command line.}
-
-%description %{_description}
-
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "%{crate}" crate.
-
-%files devel
-%license %{crate_instdir}/LICENSE
-%doc %{crate_instdir}/CRATE-README.md
-%doc %{crate_instdir}/README.md
-%{crate_instdir}/
-
-%package -n %{name}+default-devel
-Summary: %{summary}
-BuildArch: noarch
-
-%description -n %{name}+default-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "default" feature of the "%{crate}" crate.
-
-%files -n %{name}+default-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%prep
-%autosetup -n %{crate}-%{version} -p1
-%cargo_prep
-
-%generate_buildrequires
-%cargo_generate_buildrequires
-
-%build
-%cargo_build
-
-%install
-%cargo_install
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%changelog
-%autochangelog
diff --git a/rust2rpm.toml b/rust2rpm.toml
deleted file mode 100644
index c6ecd3f..0000000
--- a/rust2rpm.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-cargo-toml-patch-comments = [
- """\
-Drop dependency on unmaintained atty crate. Upstream did this in \
-https://github.com/ctron/colored_json/commit/b670fc1b90cd8ea423d7332ea48d720211537d3d, \
-switching to is_terminal, followed by a switch to stdlib functionality in \
-https://github.com/ctron/colored_json/commit/3ec8713fd840beca41f8ca8cb8c7461f7493edd4. \
-A small source patch is required to replace atty.\
-"""
-]
-
-[[package.extra-patches]]
-number = 10
-file = "colored_json-2-no-atty.patch"
-comments = [
- """\
-Source patch to replace the unmaintained atty crate with std::io::IsTerminal; part of \
-“migrate from atty to is_terminal due to RUSTSEC-2021-0145,” \
-https://github.com/ctron/colored_json/commit/b670fc1b90cd8ea423d7332ea48d720211537d3d, \
-followed by part of “feat: use `std`'s `is_terminal()`,” \
-https://github.com/ctron/colored_json/commit/3ec8713fd840beca41f8ca8cb8c7461f7493edd4.\
-"""
-]
diff --git a/sources b/sources
deleted file mode 100644
index 678e6d7..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (colored_json-2.1.0.crate) = f2e4ce51c16aadc930930791a3bc5f7c042372927c3a05261b6f8bd5c83d72849f6d6832f3eb883352655c58262807272f8a43b528807adfd1e45520afdb3649
reply other threads:[~2026-06-24 13:32 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=178230797630.1.5981597640892180767.rpms-rust-colored_json2-488256f20e98@fedoraproject.org \
--to=decathorpe@gmail.com \
--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