diff --git a/.gitignore b/.gitignore index ef5f75b..da4f145 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /proc-macro-hack-0.5.16.crate /proc-macro-hack-0.5.18.crate /proc-macro-hack-0.5.19.crate +/proc-macro-hack-0.5.20+deprecated.crate diff --git a/proc-macro-hack-fix-metadata.diff b/proc-macro-hack-fix-metadata.diff new file mode 100644 index 0000000..f4c0773 --- /dev/null +++ b/proc-macro-hack-fix-metadata.diff @@ -0,0 +1,11 @@ +--- proc-macro-hack-0.5.20+deprecated/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ proc-macro-hack-0.5.20+deprecated/Cargo.toml 2023-02-03T13:45:03.794589+00:00 +@@ -13,7 +13,7 @@ + edition = "2018" + rust-version = "1.31" + name = "proc-macro-hack" +-version = "0.5.20+deprecated" ++version = "0.5.20" + authors = ["David Tolnay "] + description = "Procedural macros in expression position" + readme = "README.md" diff --git a/rust-proc-macro-hack.spec b/rust-proc-macro-hack.spec index aa860a9..8500d3d 100644 --- a/rust-proc-macro-hack.spec +++ b/rust-proc-macro-hack.spec @@ -1,26 +1,24 @@ -# Generated by rust2rpm 19 +# Generated by rust2rpm 23 # * demo-hack is not packaged %bcond_with check %global debug_package %{nil} %global crate proc-macro-hack +%global upstream_version 0.5.20+deprecated -Name: rust-%{crate} -Version: 0.5.19 +Name: rust-proc-macro-hack +Version: 0.5.20 Release: %autorelease Summary: Procedural macros in expression position -# 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/proc-macro-hack -Source: %{crates_source} +Source: %{crates_source %{crate} %{upstream_version}} +# Manually created patch for downstream crate metadata changes +# * remove "deprecated" specifier from version string +Patch: proc-macro-hack-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Procedural macros in expression position.} @@ -30,16 +28,19 @@ Procedural macros in expression position.} %package devel Summary: %{summary} BuildArch: noarch +# deprecated by upstream: not needed since Rust 1.45 +Provides: deprecated() %description devel %{_description} This package contains library source intended for building other packages which -use "%{crate}" crate. +use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -48,13 +49,13 @@ 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. +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 %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{upstream_version} -p1 %cargo_prep %generate_buildrequires diff --git a/sources b/sources index ab6cd98..813bfc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (proc-macro-hack-0.5.19.crate) = 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952 +SHA512 (proc-macro-hack-0.5.20+deprecated.crate) = 278e786f8e0c93e346de900666b3d55d366324167a2e5e553565870c4444bfe661cf8c151a29cbd3176a4905ec49d69cffb81ae1e4a129f30404f930972c4b43