From 39259d1df3045f5c571709c6bd95dbbf5af25702 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 12 Apr 2023 20:44:36 +0200 Subject: [PATCH] Regenerate with rust2rpm v24 --- README.md | 3 -- ...a.diff => ansi_term-fix-metadata-auto.diff | 2 +- rust-ansi_term0.11.spec | 40 ++++++++----------- 3 files changed, 18 insertions(+), 27 deletions(-) delete mode 100644 README.md rename ansi_term-fix-metadata.diff => ansi_term-fix-metadata-auto.diff (79%) diff --git a/README.md b/README.md deleted file mode 100644 index 80fa1c3..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-ansi_term0.11 - -The rust-ansi_term0.11 package \ No newline at end of file diff --git a/ansi_term-fix-metadata.diff b/ansi_term-fix-metadata-auto.diff similarity index 79% rename from ansi_term-fix-metadata.diff rename to ansi_term-fix-metadata-auto.diff index c20ea04..b894db1 100644 --- a/ansi_term-fix-metadata.diff +++ b/ansi_term-fix-metadata-auto.diff @@ -1,5 +1,5 @@ --- ansi_term-0.11.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ ansi_term-0.11.0/Cargo.toml 2019-07-15T05:58:24.549267+00:00 ++++ ansi_term-0.11.0/Cargo.toml 2023-04-12T18:41:32.268584+00:00 @@ -22,6 +22,3 @@ [lib] diff --git a/rust-ansi_term0.11.spec b/rust-ansi_term0.11.spec index d6e7e59..eec7400 100644 --- a/rust-ansi_term0.11.spec +++ b/rust-ansi_term0.11.spec @@ -1,30 +1,24 @@ -# Generated by rust2rpm 10 -%bcond_with check +# Generated by rust2rpm 24 +%bcond_without check %global debug_package %{nil} %global crate ansi_term -Name: rust-%{crate}0.11 +Name: rust-ansi_term0.11 Version: 0.11.0 Release: %autorelease Summary: Library for ANSI terminal colours and styles (bold, underline) -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/ansi_term Source: %{crates_source} -# Initial patched metadata -# * No winapi -Patch0: ansi_term-fix-metadata.diff -# https://github.com/ogham/rust-ansi-term/commit/5ff6af6f38790abcb3aafee1239286c10ef69576 -Patch0001: 0001-Fix-failing-test.patch - -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif +# Automatically generated patch to strip foreign dependencies +Patch: ansi_term-fix-metadata-auto.diff +# * backport patch to fix a failing test: +# https://github.com/ogham/rust-ansi-term/commit/5ff6af6 +Patch: 0001-Fix-failing-test.patch -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Library for ANSI terminal colours and styles (bold, underline).} @@ -37,13 +31,13 @@ BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%license LICENCE -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ +%license %{crate_instdir}/LICENCE +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -51,11 +45,11 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +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 %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -N