diff --git a/.gitignore b/.gitignore index 886f8a4..1c67e81 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /pyo3-0.19.1.crate /pyo3-0.19.2.crate /pyo3-0.20.0.crate +/pyo3-0.20.1.crate diff --git a/pyo3-fix-metadata.diff b/pyo3-fix-metadata.diff index fb7e5ee..31436a4 100644 --- a/pyo3-fix-metadata.diff +++ b/pyo3-fix-metadata.diff @@ -1,26 +1,15 @@ ---- pyo3-0.20.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ pyo3-0.20.0/Cargo.toml 2023-11-13T23:46:49.379610+00:00 -@@ -149,9 +149,6 @@ - version = "1.8.0" - features = ["std"] - --[dev-dependencies.send_wrapper] --version = "0.6" -- - [dev-dependencies.serde] - version = "1.0" - features = ["derive"] -@@ -161,9 +158,6 @@ - - [dev-dependencies.trybuild] +--- pyo3-0.20.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ pyo3-0.20.1/Cargo.toml 2023-12-31T22:04:59.479050+00:00 +@@ -168,7 +168,7 @@ version = ">=1.0.70" -- --[dev-dependencies.widestring] + + [dev-dependencies.widestring] -version = "0.5.1" ++version = "1.0.2" [build-dependencies.pyo3-build-config] - version = "0.20.0" -@@ -217,7 +211,6 @@ + version = "0.20.1" +@@ -229,7 +229,6 @@ "experimental-inspect", "rust_decimal", ] diff --git a/rust-pyo3.spec b/rust-pyo3.spec index 6ba8d13..a93ec24 100644 --- a/rust-pyo3.spec +++ b/rust-pyo3.spec @@ -5,7 +5,7 @@ %global crate pyo3 Name: rust-pyo3 -Version: 0.20.0 +Version: 0.20.1 Release: %autorelease Summary: Bindings to Python interpreter @@ -13,11 +13,9 @@ License: MIT OR Apache-2.0 URL: https://crates.io/crates/pyo3 Source: %{crates_source} # Manually created patch for downstream crate metadata changes -# * drop send_wrapper and widestring dev-dependencies (not packaged yet) +# * bump widestring dev-dependency from 0.5 to 1.0 # * drop MSVC- and MinGW-only features Patch: pyo3-fix-metadata.diff -# * skip the single doctest that depends on send_wrapper -Patch: 0001-ignore-doctests-with-missing-send_wrapper-dependency.patch BuildRequires: cargo-rpm-macros >= 24 @@ -96,6 +94,18 @@ use the "abi3-py311" feature of the "%{crate}" crate. %files -n %{name}+abi3-py311-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+abi3-py312-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+abi3-py312-devel %{_description} + +This package contains library source intended for building other packages which +use the "abi3-py312" feature of the "%{crate}" crate. + +%files -n %{name}+abi3-py312-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+abi3-py37-devel Summary: %{summary} BuildArch: noarch @@ -168,6 +178,18 @@ use the "chrono" feature of the "%{crate}" crate. %files -n %{name}+chrono-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+either-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+either-devel %{_description} + +This package contains library source intended for building other packages which +use the "either" feature of the "%{crate}" crate. + +%files -n %{name}+either-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+experimental-inspect-devel Summary: %{summary} BuildArch: noarch @@ -360,6 +382,18 @@ use the "serde" feature of the "%{crate}" crate. %files -n %{name}+serde-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+smallvec-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+smallvec-devel %{_description} + +This package contains library source intended for building other packages which +use the "smallvec" feature of the "%{crate}" crate. + +%files -n %{name}+smallvec-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+unindent-devel Summary: %{summary} BuildArch: noarch @@ -376,8 +410,6 @@ use the "unindent" feature of the "%{crate}" crate. %autosetup -n %{crate}-%{version} -p1 # drop files that are not useful rm -r emscripten/ newsfragments/ -# drop the tests for which dependencies were removed -rm tests/test_pep_587.rs %cargo_prep %generate_buildrequires diff --git a/sources b/sources index d4cdab5..2fb2f7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyo3-0.20.0.crate) = 85d9533c75f905752c62f6a4898582ae48daf085e287b44949c47260301205a5f00477927877ce46300d2801d22fbc04a958c058a37eb28374c834fff27feca1 +SHA512 (pyo3-0.20.1.crate) = f49a8570b4ed535ef6ac209b080e0612e1185babc2436aa488e29aecb7abcecc12ccf2214225ac17ef38c6c38d343dc8c2a186890e795b81c59ccf2a2ec8509e