diff --git a/.gitignore b/.gitignore index 3c9e15c..95430e0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /*.src.rpm /rustls-native-certs-0.5.0.crate +/rustls-native-certs-0.6.2.crate diff --git a/rust-rustls-native-certs.spec b/rust-rustls-native-certs.spec index f474309..07b17c2 100644 --- a/rust-rustls-native-certs.spec +++ b/rust-rustls-native-certs.spec @@ -1,33 +1,30 @@ -# Generated by rust2rpm 17 -%bcond_without check +# Generated by rust2rpm 24 +# * missing dev-dependency: x509-parser +%bcond_with check %global debug_package %{nil} %global crate rustls-native-certs -Name: rust-%{crate} -Version: 0.5.0 +Name: rust-rustls-native-certs +Version: 0.6.2 Release: %autorelease Summary: Allow rustls to use the platform native certificate store # Upstream license specification: Apache-2.0/ISC/MIT -License: ASL 2.0 or ISC or MIT +License: Apache-2.0 OR ISC OR MIT URL: https://crates.io/crates/rustls-native-certs Source: %{crates_source} -# Initial patched metadata -# * drop windows- and mac OS-specific dependencies -Patch0: rustls-native-certs-fix-metadata.diff +# Automatically generated patch to strip foreign dependencies +Patch: rustls-native-certs-fix-metadata-auto.diff -ExclusiveArch: %{rust_arches} # ring is not available on ppc64le and s390x ExcludeArch: ppc64le s390x -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: -Rustls-native-certs allows rustls to use the platform native certificate store.} +Rustls-native-certs allows rustls to use the platform native certificate +store.} %description %{_description} @@ -37,14 +34,18 @@ 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 LICENSE-APACHE LICENSE-ISC LICENSE-MIT -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ -%exclude %{cargo_registry}/%{crate}-%{version_no_tilde}/{admin/,integration-tests/} +%license %{crate_instdir}/LICENSE +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-ISC +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/CONTRIBUTING.md +%doc %{crate_instdir}/README.md +%doc %{crate_instdir}/RELEASING.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -52,23 +53,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 - -%package -n %{name}+rustls-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+rustls-devel %{_description} - -This package contains library source intended for building other packages -which use "rustls" feature of "%{crate}" crate. - -%files -n %{name}+rustls-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -85,14 +74,7 @@ which use "rustls" feature of "%{crate}" crate. %if %{with check} %check -# skip tests that require internet connectivity -%cargo_test -- -- \ - --skip amazon \ - --skip apple \ - --skip ebay \ - --skip facebook \ - --skip google \ - --skip netflix +%cargo_test %endif %changelog diff --git a/rustls-native-certs-fix-metadata.diff b/rustls-native-certs-fix-metadata-auto.diff similarity index 59% rename from rustls-native-certs-fix-metadata.diff rename to rustls-native-certs-fix-metadata-auto.diff index ea97d4d..d6edaf2 100644 --- a/rustls-native-certs-fix-metadata.diff +++ b/rustls-native-certs-fix-metadata-auto.diff @@ -1,7 +1,7 @@ ---- rustls-native-certs-0.5.0/Cargo.toml 2020-11-22T14:23:18+00:00 -+++ rustls-native-certs-0.5.0/Cargo.toml 2021-04-23T09:32:55.268672+00:00 -@@ -40,7 +40,3 @@ - default = ["rustls"] +--- rustls-native-certs-0.6.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ rustls-native-certs-0.6.2/Cargo.toml 2023-03-18T21:28:12.757025+00:00 +@@ -44,7 +44,3 @@ + version = "0.12" [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-probe] version = "0.1.2" -[target."cfg(target_os = \"macos\")".dependencies.security-framework] diff --git a/sources b/sources index 0da8f8c..6160189 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rustls-native-certs-0.5.0.crate) = 55ec5d034a4ca3fbff5255fdffd79c0abbcc9f767dffa18d48fd667c262f60dd67cd48c8aa8f1738e580a07e9a6bcb3375479b072d1e18ce6aaf8da32071ee41 +SHA512 (rustls-native-certs-0.6.2.crate) = 04c7a39cd62d1845c4430ae63fc739ed21e2cb43ec49ff77fb18867b1e8a16c4a03146583a25242c8b44b44090b38b45a550b2852824b975c3466a1740349968