diff --git a/SOURCES/rust2rpm.toml b/SOURCES/rust2rpm.toml new file mode 100644 index 0000000..cc50e03 --- /dev/null +++ b/SOURCES/rust2rpm.toml @@ -0,0 +1,4 @@ +[tests] +skip = ["assert_sizes"] +comments = ["skip test for exact size of a struct / enum that fails with Rust 1.64+: https://github.com/servo/tendril/issues/66"] + diff --git a/SOURCES/tendril-fix-metadata.diff b/SOURCES/tendril-fix-metadata.diff new file mode 100644 index 0000000..e7dafe5 --- /dev/null +++ b/SOURCES/tendril-fix-metadata.diff @@ -0,0 +1,12 @@ +--- tendril-0.4.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ tendril-0.4.3/Cargo.toml 2024-01-19T19:09:07.549735+00:00 +@@ -17,9 +17,6 @@ + readme = "README.md" + license = "MIT/Apache-2.0" + repository = "https://github.com/servo/tendril" +-[dependencies.encoding] +-version = "0.2" +-optional = true + + [dependencies.encoding_rs] + version = "0.8.12" diff --git a/SPECS/rust-tendril.spec b/SPECS/rust-tendril.spec index 21c95f1..bd60c7f 100644 --- a/SPECS/rust-tendril.spec +++ b/SPECS/rust-tendril.spec @@ -1,32 +1,33 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.3.5) +## (rpmautospec version 0.5.1) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 3; + release_number = 7; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec -# Generated by rust2rpm 21 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate tendril -Name: rust-%{crate} +Name: rust-tendril Version: 0.4.3 Release: %autorelease Summary: Compact buffer/string type for zero-copy parsing # Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/tendril Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * drop unused support for the obsolete "encoding" crate +Patch: tendril-fix-metadata.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Compact buffer/string type for zero-copy parsing.} @@ -72,18 +73,6 @@ use the "bench" feature of the "%{crate}" crate. %files -n %{name}+bench-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+encoding-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+encoding-devel %{_description} - -This package contains library source intended for building other packages which -use the "encoding" feature of the "%{crate}" crate. - -%files -n %{name}+encoding-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+encoding_rs-devel Summary: %{summary} BuildArch: noarch @@ -97,7 +86,7 @@ use the "encoding_rs" 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 @@ -117,9 +106,22 @@ use the "encoding_rs" feature of the "%{crate}" crate. %endif %changelog -* Mon Jan 15 2024 Arkady L. Shane - 0.4.3-3 +## START: Generated by rpmautospec +* Fri Jan 19 2024 Fabio Valentini - 0.4.3-7 +- Drop unused support for the obsolete "encoding" crate + +* Mon Jan 15 2024 Arkady L. Shane - 0.4.3-6 - Rebuilt for MSVSphere 9.3 +* Mon Aug 07 2023 Fabio Valentini - 0.4.3-6 +- Regenerate with rust2rpm v24 + +* Fri Jul 21 2023 Fedora Release Engineering - 0.4.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.4.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Dec 14 2022 Fabio Valentini - 0.4.3-3 - Ignore test failures caused by struct / enum size changes in Rust 1.64+ @@ -161,3 +163,4 @@ use the "encoding_rs" feature of the "%{crate}" crate. * Mon Mar 11 2019 Igor Gnatenko - 0.4.1-1 - Initial package +## END: Generated by rpmautospec