From 6cb2e21167ed32d9e2ac06dbcccc841a284a26e6 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 19 Aug 2025 05:30:59 +0800 Subject: [PATCH] revert config.toml change as there are too many downstream packages affected (cherry picked from commit c91920993479a71f3e38e67e64adb5d20c940241) --- 0003-use-config.toml-as-config.patch | 13 ------------- rust-packaging.spec | 6 ++++-- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 0003-use-config.toml-as-config.patch diff --git a/0003-use-config.toml-as-config.patch b/0003-use-config.toml-as-config.patch deleted file mode 100644 index 79764ac..0000000 --- a/0003-use-config.toml-as-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/data/macros.cargo b/data/macros.cargo -index e54705a..eff8bae 100644 ---- a/data/macros.cargo -+++ b/data/macros.cargo -@@ -18,7 +18,7 @@ - %cargo_prep (\ - set -eu \ - %{__mkdir} -p .cargo \ --cat > .cargo/config << EOF \ -+cat > .cargo/config.toml << EOF \ - [build]\ - rustc = "%{__rustc}"\ - rustdoc = "%{__rustdoc}"\ diff --git a/rust-packaging.spec b/rust-packaging.spec index 6a3389b..072004b 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -4,14 +4,13 @@ Name: rust-packaging Version: 23 -Release: 3 +Release: 4 Summary: RPM macros for building Rust packages on various architectures License: MIT URL: https://pagure.io/fedora-rust/rust2rpm Source: https://pagure.io/fedora-rust/rust2rpm/archive/v%{version}/rust2rpm-v%{version}.tar.gz Patch1: 0001-remove-test-spec-with-opensuse-tomlfile.patch Patch2: 0002-rust-macros-do-not-strip.patch -Patch3: 0003-use-config.toml-as-config.patch BuildRequires: python3-devel python3-setuptools BuildRequires: python3-pbr python3-pip python3-wheel @@ -76,6 +75,9 @@ PYTEST_XDIST_AUTO_NUM_WORKERS=%{_smp_build_ncpus} \ %{python3_sitelib}/rust2rpm-*.dist-info/ %changelog +* Tue Aug 19 2025 Funda Wang - 23-4 +- revert config.toml change as there are too many downstream packages affected + * Sun Aug 17 2025 Funda Wang - 23-3 - use config.toml rather than config for projects -- Gitee