From 35aad0fb819a0ea7151a9a75e73b221f7caf518a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 17 May 2023 20:08:13 +0200 Subject: [PATCH] Update to version 0.2.4; Fixes RHBZ#2193002 --- .gitignore | 1 + README.md | 3 --- displaydoc-fix-metadata.diff | 11 --------- rust-displaydoc.spec | 48 +++++++++++++++--------------------- sources | 2 +- 5 files changed, 22 insertions(+), 43 deletions(-) delete mode 100644 README.md delete mode 100644 displaydoc-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 817d712..054fec4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /displaydoc-0.2.3.crate +/displaydoc-0.2.4.crate diff --git a/README.md b/README.md deleted file mode 100644 index 9d37905..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-displaydoc - -The rust-displaydoc package diff --git a/displaydoc-fix-metadata.diff b/displaydoc-fix-metadata.diff deleted file mode 100644 index 3180e35..0000000 --- a/displaydoc-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- displaydoc-0.2.3/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ displaydoc-0.2.3/Cargo.toml 2021-08-05T14:22:54.424920+00:00 -@@ -85,7 +85,7 @@ - version = "1.0.0" - - [dev-dependencies.static_assertions] --version = "0.3.4" -+version = "1.1" - - [dev-dependencies.thiserror] - version = "1.0.24" diff --git a/rust-displaydoc.spec b/rust-displaydoc.spec index 1f1e945..bc561bf 100644 --- a/rust-displaydoc.spec +++ b/rust-displaydoc.spec @@ -1,33 +1,23 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate displaydoc -Name: rust-%{crate} -Version: 0.2.3 +Name: rust-displaydoc +Version: 0.2.4 Release: %autorelease Summary: Derive macro for implementing the display Trait -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/displaydoc Source: %{crates_source} -# Initial patched metadata -# Bump static_assertions to 1.1 -# https://github.com/yaahc/displaydoc/pull/34 -Patch0: displaydoc-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: -Derive macro for implementing the display Trait via a doc comment and string -interpolation.} +A derive macro for implementing the display Trait via a doc comment and +string interpolation.} %description %{_description} @@ -37,13 +27,15 @@ 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 LICENSE-MIT LICENSE-APACHE -%doc README.md CHANGELOG.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -51,11 +43,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_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+std-devel Summary: %{summary} @@ -63,11 +55,11 @@ BuildArch: noarch %description -n %{name}+std-devel %{_description} -This package contains library source intended for building other packages -which use "std" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "std" feature of the "%{crate}" crate. %files -n %{name}+std-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 2efff73..5885999 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (displaydoc-0.2.3.crate) = 848d88d1642f4000be88a728a3ff1835fe2887ebd38e26c032e0ae0a3ad4ba658ee1a7a98deab7bbffb90fc7ed6067232a2dc100d9b7391e69977646390c4664 +SHA512 (displaydoc-0.2.4.crate) = a1de2c200584bfac640f8b84b5103d8687919cd29f59a14898e98d480f476a8e4dc06e3b929af479d536cd02186e2a9be72e6414338bc117b97bc0d160029592