public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rust-compress-tools] rawhide: Regenerate with rust2rpm v28
@ 2026-07-31 21:00 Fabio Valentini
0 siblings, 0 replies; only message in thread
From: Fabio Valentini @ 2026-07-31 21:00 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rust-compress-tools
Branch : rawhide
Commit : 1243c0cbb011151e1505e42a8e902bc682c53e9e
Author : Fabio Valentini <decathorpe@gmail.com>
Date : 2026-07-31T23:00:19+02:00
Stats : +48/-47 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/rust-compress-tools/c/1243c0cbb011151e1505e42a8e902bc682c53e9e?branch=rawhide
Log:
Regenerate with rust2rpm v28
---
diff --git a/0001-backport-tests-port-from-unmaintained-crate-encoding.patch b/0001-backport-tests-port-from-unmaintained-crate-encoding.patch
index e486861..71e5f30 100644
--- a/0001-backport-tests-port-from-unmaintained-crate-encoding.patch
+++ b/0001-backport-tests-port-from-unmaintained-crate-encoding.patch
@@ -1,29 +1,3 @@
-From 910374f37cf37a977cadcec5a2e8a9aaa94a688c Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe@gmail.com>
-Date: Fri, 19 Jan 2024 20:04:44 +0100
-Subject: [PATCH] backport: tests: port from unmaintained crate encoding to
- encoding_rs
-
----
- Cargo.toml | 4 ++--
- tests/integration_test.rs | 23 ++++++++++++++++++-----
- 2 files changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 703c953..1d17a1d 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -109,8 +109,8 @@ version = "0.1"
- version = "1.6.3"
- features = ["attributes"]
-
--[dev-dependencies.encoding]
--version = "0.2"
-+[dev-dependencies.encoding_rs]
-+version = "0.8.32"
-
- [dev-dependencies.tempfile]
- version = "3.1"
diff --git a/tests/integration_test.rs b/tests/integration_test.rs
index 9d0fbc7..4b08ae2 100644
--- a/tests/integration_test.rs
diff --git a/README.md b/README.md
deleted file mode 100644
index 1dbebdd..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-compress-tools
-
-The rust-compress-tools package
diff --git a/compress-tools-fix-metadata-auto.diff b/compress-tools-fix-metadata-auto.diff
index 68d14c4..1175d29 100644
--- a/compress-tools-fix-metadata-auto.diff
+++ b/compress-tools-fix-metadata-auto.diff
@@ -1,6 +1,6 @@
--- compress-tools-0.12.4/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ compress-tools-0.12.4/Cargo.toml 1970-01-01T00:00:01+00:00
-@@ -144,8 +144,5 @@
++++ compress-tools-0.12.4/Cargo.toml 2026-07-31T20:58:52.046335+00:00
+@@ -144,8 +144,6 @@
[target."cfg(not(target_env = \"msvc\"))".build-dependencies.pkg-config]
version = "0.3"
@@ -9,3 +9,4 @@
-
[badges.coveralls]
repository = "ossystems/compress-tools-rs"
++
diff --git a/compress-tools-fix-metadata.diff b/compress-tools-fix-metadata.diff
new file mode 100644
index 0000000..10ea8eb
--- /dev/null
+++ b/compress-tools-fix-metadata.diff
@@ -0,0 +1,13 @@
+--- compress-tools-0.12.4/Cargo.toml 1970-01-01T00:00:01+00:00
++++ compress-tools-0.12.4/Cargo.toml 2026-07-31T20:58:52.047166+00:00
+@@ -109,8 +109,8 @@
+ version = "1.6.3"
+ features = ["attributes"]
+
+-[dev-dependencies.encoding]
+-version = "0.2"
++[dev-dependencies.encoding_rs]
++version = "0.8.32"
+
+ [dev-dependencies.tempfile]
+ version = "3.1"
diff --git a/rust-compress-tools.spec b/rust-compress-tools.spec
index fce2486..8113bea 100644
--- a/rust-compress-tools.spec
+++ b/rust-compress-tools.spec
@@ -1,5 +1,5 @@
-# Generated by rust2rpm 22
-%bcond_without check
+# Generated by rust2rpm 28
+%bcond check 1
%global debug_package %{nil}
%global crate compress-tools
@@ -12,15 +12,16 @@ Summary: Utility functions for compressed and archive files handling
License: MIT OR Apache-2.0
URL: https://crates.io/crates/compress-tools
Source: %{crates_source}
-# Automatically generated patch to strip foreign dependencies
+# Automatically generated patch to strip dependencies and normalize metadata
Patch: compress-tools-fix-metadata-auto.diff
-# * backported upstream patch to port from encoding to encoding_rs:
-# https://github.com/OSSystems/compress-tools-rs/commit/5e7bbdd
-Patch: 0001-backport-tests-port-from-unmaintained-crate-encoding.patch
+# Manually created patch for downstream crate metadata changes
+# * port from unmaintained crate encoding to encoding_rs
+Patch: compress-tools-fix-metadata.diff
+# * https://github.com/OSSystems/compress-tools-rs/commit/5e7bbdd
+Patch2: 0001-backport-tests-port-from-unmaintained-crate-encoding.patch
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging >= 21
+BuildRequires: cargo-rpm-macros >= 24
+BuildRequires: pkgconfig(libarchive) >= 3.5.1
%global _description %{expand:
Utility functions for compressed and archive files handling.}
@@ -201,12 +202,11 @@ use the "tokio_support" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%generate_buildrequires
%cargo_generate_buildrequires
-echo 'pkgconfig(libarchive) >= 3.5.1'
%build
%cargo_build
diff --git a/rust2rpm.conf b/rust2rpm.conf
deleted file mode 100644
index 0ccd232..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-buildrequires =
- pkgconfig(libarchive) >= 3.5.1
-lib.requires =
- pkgconfig(libarchive) >= 3.5.1
diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..8a57b88
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,21 @@
+[package]
+cargo-toml-patch-comments = [
+ "port from unmaintained crate encoding to encoding_rs",
+]
+doc-files.exclude = ["test.txt"]
+
+[[package.extra-patches]]
+number = 2
+file = "0001-backport-tests-port-from-unmaintained-crate-encoding.patch"
+comments = ["https://github.com/OSSystems/compress-tools-rs/commit/5e7bbdd"]
+
+[requires]
+build = ["pkgconfig(libarchive) >= 3.5.1"]
+lib = ["pkgconfig(libarchive) >= 3.5.1"]
+
+[scripts]
+check.pre = [
+ "# some tests require the environment to have a UTF-8 locale",
+ "export LANG=C.UTF-8",
+]
+
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-31 21:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-31 21:00 [rpms/rust-compress-tools] rawhide: Regenerate with rust2rpm v28 Fabio Valentini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox