The package rpms/rust-cpython.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-cpython.git/commit/?id=05578....
Change:
-%ifnarch s390x
Thanks.
Full change:
============
commit 055786b20dd9fec6dba68cb0fa0cc1967919026a
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Thu Apr 7 00:57:28 2022 +0200
Update to version 0.7.0; Fixes RHBZ#2012486
diff --git a/.gitignore b/.gitignore
index 71d086b..7351bc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/cpython-0.5.2.crate
/cpython-0.6.0.crate
+/cpython-0.7.0.crate
diff --git a/cpython-fix-metadata.diff b/cpython-fix-metadata.diff
index 8867ee6..7582425 100644
--- a/cpython-fix-metadata.diff
+++ b/cpython-fix-metadata.diff
@@ -1,17 +1,17 @@
---- cpython-0.6.0/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ cpython-0.6.0/Cargo.toml 2021-07-31T09:23:22.400894+00:00
-@@ -34,10 +34,6 @@
+--- cpython-0.7.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ cpython-0.7.0/Cargo.toml 2022-04-06T20:26:05.578631+00:00
+@@ -33,10 +33,6 @@
[dependencies.paste]
version = "1"
-[dependencies.python27-sys]
--version = "0.6.0"
+-version = "0.7.0"
-optional = true
-
[dependencies.python3-sys]
- version = "0.6.0"
+ version = "0.7.0"
optional = true
-@@ -58,13 +54,11 @@
+@@ -57,13 +53,11 @@
[features]
default = ["python3-sys"]
extension-module = ["python3-sys/extension-module"]
@@ -22,6 +22,6 @@
py-link-mode-default = ["python3-sys/link-mode-default"]
py-link-mode-unresolved-static = ["python3-sys/link-mode-unresolved-static"]
-py2-no-auto-unicode-promotion = []
+ python-3-10 = ["python3-sys/python-3-10"]
python-3-4 = ["python3-sys/python-3-4"]
python-3-5 = ["python3-sys/python-3-5"]
- python-3-6 = ["python3-sys/python-3-6"]
diff --git a/rust-cpython.spec b/rust-cpython.spec
index d5a55c0..87f823d 100644
--- a/rust-cpython.spec
+++ b/rust-cpython.spec
@@ -1,11 +1,16 @@
-# Generated by rust2rpm 18
+# Generated by rust2rpm 21
+# * test suite segfaults on s390x
+%ifnarch s390x
%bcond_without check
+%else
+%bcond_with check
+%endif
%global debug_package %{nil}
%global crate cpython
Name: rust-%{crate}
-Version: 0.6.0
+Version: 0.7.0
Release: %autorelease
Summary: Bindings to Python
@@ -18,11 +23,8 @@ Source: %{crates_source}
Patch0: cpython-fix-metadata.diff
ExclusiveArch: %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch: noarch
-%endif
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Bindings to Python.}
@@ -35,13 +37,14 @@ 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
-%doc README.md CHANGELOG.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%doc %{crate_instdir}/CHANGELOG.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -49,11 +52,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}+extension-module-devel
Summary: %{summary}
@@ -61,11 +64,11 @@ BuildArch: noarch
%description -n %{name}+extension-module-devel %{_description}
-This package contains library source intended for building other packages
-which use "extension-module" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "extension-module" feature of the "%{crate}" crate.
%files -n %{name}+extension-module-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+nightly-devel
Summary: %{summary}
@@ -73,11 +76,11 @@ BuildArch: noarch
%description -n %{name}+nightly-devel %{_description}
-This package contains library source intended for building other packages
-which use "nightly" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "nightly" feature of the "%{crate}" crate.
%files -n %{name}+nightly-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+no-auto-initialize-devel
Summary: %{summary}
@@ -85,11 +88,11 @@ BuildArch: noarch
%description -n %{name}+no-auto-initialize-devel %{_description}
-This package contains library source intended for building other packages
-which use "no-auto-initialize" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "no-auto-initialize" feature of the "%{crate}" crate.
%files -n %{name}+no-auto-initialize-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+nonnull-devel
Summary: %{summary}
@@ -97,11 +100,11 @@ BuildArch: noarch
%description -n %{name}+nonnull-devel %{_description}
-This package contains library source intended for building other packages
-which use "nonnull" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "nonnull" feature of the "%{crate}" crate.
%files -n %{name}+nonnull-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+py-link-mode-default-devel
Summary: %{summary}
@@ -109,11 +112,11 @@ BuildArch: noarch
%description -n %{name}+py-link-mode-default-devel %{_description}
-This package contains library source intended for building other packages
-which use "py-link-mode-default" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "py-link-mode-default" feature of the "%{crate}" crate.
%files -n %{name}+py-link-mode-default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+py-link-mode-unresolved-static-devel
Summary: %{summary}
@@ -121,11 +124,23 @@ BuildArch: noarch
%description -n %{name}+py-link-mode-unresolved-static-devel %{_description}
-This package contains library source intended for building other packages
-which use "py-link-mode-unresolved-static" feature of "%{crate}"
crate.
+This package contains library source intended for building other packages which
+use the "py-link-mode-unresolved-static" feature of the "%{crate}"
crate.
%files -n %{name}+py-link-mode-unresolved-static-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+python-3-10-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+python-3-10-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "python-3-10" feature of the "%{crate}" crate.
+
+%files -n %{name}+python-3-10-devel
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+python-3-4-devel
Summary: %{summary}
@@ -133,11 +148,11 @@ BuildArch: noarch
%description -n %{name}+python-3-4-devel %{_description}
-This package contains library source intended for building other packages
-which use "python-3-4" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "python-3-4" feature of the "%{crate}" crate.
%files -n %{name}+python-3-4-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+python-3-5-devel
Summary: %{summary}
@@ -145,11 +160,11 @@ BuildArch: noarch
%description -n %{name}+python-3-5-devel %{_description}
-This package contains library source intended for building other packages
-which use "python-3-5" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "python-3-5" feature of the "%{crate}" crate.
%files -n %{name}+python-3-5-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+python-3-6-devel
Summary: %{summary}
@@ -157,11 +172,11 @@ BuildArch: noarch
%description -n %{name}+python-3-6-devel %{_description}
-This package contains library source intended for building other packages
-which use "python-3-6" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "python-3-6" feature of the "%{crate}" crate.
%files -n %{name}+python-3-6-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+python-3-7-devel
Summary: %{summary}
@@ -169,11 +184,11 @@ BuildArch: noarch
%description -n %{name}+python-3-7-devel %{_description}
-This package contains library source intended for building other packages
-which use "python-3-7" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "python-3-7" feature of the "%{crate}" crate.
%files -n %{name}+python-3-7-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+python-3-8-devel
Summary: %{summary}
@@ -181,11 +196,23 @@ BuildArch: noarch
%description -n %{name}+python-3-8-devel %{_description}
-This package contains library source intended for building other packages
-which use "python-3-8" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "python-3-8" feature of the "%{crate}" crate.
%files -n %{name}+python-3-8-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+python-3-9-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+python-3-9-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "python-3-9" feature of the "%{crate}" crate.
+
+%files -n %{name}+python-3-9-devel
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+python3-sys-devel
Summary: %{summary}
@@ -193,11 +220,11 @@ BuildArch: noarch
%description -n %{name}+python3-sys-devel %{_description}
-This package contains library source intended for building other packages
-which use "python3-sys" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "python3-sys" feature of the "%{crate}" crate.
%files -n %{name}+python3-sys-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serde-devel
Summary: %{summary}
@@ -205,11 +232,11 @@ BuildArch: noarch
%description -n %{name}+serde-devel %{_description}
-This package contains library source intended for building other packages
-which use "serde" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "serde" feature of the "%{crate}" crate.
%files -n %{name}+serde-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serde-convert-devel
Summary: %{summary}
@@ -217,16 +244,18 @@ BuildArch: noarch
%description -n %{name}+serde-convert-devel %{_description}
-This package contains library source intended for building other packages
-which use "serde-convert" feature of "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "serde-convert" feature of the "%{crate}" crate.
%files -n %{name}+serde-convert-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
rm tests/check_symbols.py
%cargo_prep
+# remove executable bit from all files
+find -type f -executable -exec chmod -x {} +
%generate_buildrequires
%cargo_generate_buildrequires
@@ -239,19 +268,7 @@ rm tests/check_symbols.py
%if %{with check}
%check
-%ifnarch s390x
-# * skip unit tests that no longer with with Python 3.10:
-# 'float' object cannot be interpreted as an integer
-#
https://bugs.python.org/issue37999
-# * skip doctests that no longer work with Python 3.10 due to C API changes:
-# unicodedata.ucnhash_CAPI removed from Python 3.10 without deprecation
-#
https://bugs.python.org/issue44418
-%cargo_test -- -- --skip objects::num::test::float_to_ --skip src/objects/capsule.rs
-%else
-# FIXME: lots of test failures on s390x since version 0.6.0:
-#
https://github.com/dgrunwald/rust-cpython/issues/265
-%cargo_test -- -- --skip objects::num::test::float_to_ --skip src/objects/capsule.rs ||
:
-%endif
+%cargo_test
%endif
%changelog
diff --git a/sources b/sources
index 9243587..954dc71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cpython-0.6.0.crate) =
d656b3671c5d50216f80d757278d2b25c91a6da659f65832fbc621b7aa2e5975318189e33139fa31d84dad1cf052fd7af2c6b1fa6287ab19dc4ec89939e537c5
+SHA512 (cpython-0.7.0.crate) =
74508ee2a58bf20ed374c92c8ee67fb850f807c84a6b53c01007db87541c4ede8690c376fe9958903f716b2d0024c3f8562377b63abf630dd6c8964c7946d40f