diff --git a/README.md b/README.md deleted file mode 100644 index 983c41a..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-url1 - -The rust-url1 package \ No newline at end of file diff --git a/rust-url1.spec b/rust-url1.spec index 59727e9..a5e8c70 100644 --- a/rust-url1.spec +++ b/rust-url1.spec @@ -1,29 +1,25 @@ -# Generated by rust2rpm 15 +# Generated by rust2rpm 24 +# * outdated dev-dependencies: serde_json ^0.6.1 %bcond_with check %global debug_package %{nil} %global crate url -Name: rust-%{crate}1 +Name: rust-url1 Version: 1.7.2 Release: %autorelease Summary: URL library for Rust, based on the WHATWG URL Standard # Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/url Source: %{crates_source} -# Initial patched metadata -# * Exclude CI files, https://github.com/servo/rust-url/pull/467 -# * drop optional + unused serde feature (serde < 1 no longer available) -Patch0: url-fix-metadata.diff +# Manually created patch for downstream crate metadata changes +# * drop unused optional feature for supporting serde 0.9 +# * exclude files that are only useful for upstream development +Patch: url-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: URL library for Rust, based on the WHATWG URL Standard.} @@ -36,13 +32,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 UPGRADING.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%doc %{crate_instdir}/UPGRADING.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,11 +48,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}+encoding-devel Summary: %{summary} @@ -62,11 +60,11 @@ BuildArch: noarch %description -n %{name}+encoding-devel %{_description} -This package contains library source intended for building other packages -which use "encoding" feature of "%{crate}" crate. +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 %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+heap_size-devel Summary: %{summary} @@ -74,11 +72,11 @@ BuildArch: noarch %description -n %{name}+heap_size-devel %{_description} -This package contains library source intended for building other packages -which use "heap_size" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "heap_size" feature of the "%{crate}" crate. %files -n %{name}+heap_size-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+heapsize-devel Summary: %{summary} @@ -86,11 +84,11 @@ BuildArch: noarch %description -n %{name}+heapsize-devel %{_description} -This package contains library source intended for building other packages -which use "heapsize" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "heapsize" feature of the "%{crate}" crate. %files -n %{name}+heapsize-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+query_encoding-devel Summary: %{summary} @@ -98,11 +96,11 @@ BuildArch: noarch %description -n %{name}+query_encoding-devel %{_description} -This package contains library source intended for building other packages -which use "query_encoding" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "query_encoding" feature of the "%{crate}" crate. %files -n %{name}+query_encoding-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+rustc-serialize-devel Summary: %{summary} @@ -110,11 +108,11 @@ BuildArch: noarch %description -n %{name}+rustc-serialize-devel %{_description} -This package contains library source intended for building other packages -which use "rustc-serialize" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "rustc-serialize" feature of the "%{crate}" crate. %files -n %{name}+rustc-serialize-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/url-fix-metadata.diff b/url-fix-metadata.diff index 3914bb5..720d58c 100644 --- a/url-fix-metadata.diff +++ b/url-fix-metadata.diff @@ -1,5 +1,5 @@ --- url-1.7.2/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ url-1.7.2/Cargo.toml 2020-11-08T19:39:28.387877+00:00 ++++ url-1.7.2/Cargo.toml 2023-05-17T10:09:00.047183+00:00 @@ -21,6 +21,7 @@ categories = ["parser-implementations", "web-programming", "encoding"] license = "MIT/Apache-2.0"