Skip to content

Commit ae99525

Browse files
committed
Revert "Remove python3-scikit-build-core+pyproject subpackage"
This reverts commit 7e3d62b. Signed-off-by: Cristian Le <[email protected]>
1 parent 7e3d62b commit ae99525

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

Diff for: .distro/python-scikit-build-core.rpmlintrc

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
addFilter("python.?-scikit-build-core\+pyproject.* spelling-error \('[Mm]etapackage")
2+
addFilter("python.?-scikit-build-core\+.* no-documentation")
13
addFilter("python.?-scikit-build-core.* files-duplicate .*__init__.py .*")

Diff for: .distro/python-scikit-build-core.spec

+19-10
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,30 @@ A next generation Python CMake adapter and Python API for plugins
3535
Summary: %{summary}
3636
Requires: cmake
3737
Recommends: (ninja-build or make)
38+
Recommends: python3-scikit-build-core+pyproject = %{version}-%{release}
3839
Suggests: ninja-build
3940
Suggests: gcc
40-
4141
BuildArch: noarch
42+
%description -n python3-scikit-build-core %_description
4243

43-
# Deprecated extras/optional-dependencies
44-
# Provides python3dist() do not seem to be generated, defining them manually
45-
# Note: the version can be a bit off if the python metadata version is different than RPM.
46-
# It shouldn't be an issue in this package.
47-
%py_provides python3-scikit-build-core+pyproject
48-
Provides: python3dist(scikit-build-core[pyproject]) = %{version}
49-
Provides: python%{python3_version}dist(scikit-build-core[pyproject]) = %{version}
50-
Obsoletes: python3-scikit-build-core+pyproject < 0.11.0-1%{?dist}
5144

52-
%description -n python3-scikit-build-core %_description
45+
# Add %%pyproject_extras_subpkg results manually because BuildArch: noarch is not injected
46+
# https://src.fedoraproject.org/rpms/python-rpm-macros/pull-request/174
47+
# %%pyproject_extras_subpkg -n python3-scikit-build-core pyproject
48+
49+
%package -n python3-scikit-build-core+pyproject
50+
Summary: Metapackage for python3-scikit-build-core: pyproject extras
51+
Requires: python3-scikit-build-core = %{?epoch:%{epoch}:}%{version}-%{release}
52+
BuildArch: noarch
53+
# Deprecated empty extras package
54+
# Note: Cannot use Obsoletes + Provides here. python3dist() does not seem to be picked up
55+
Provides: deprecated()
56+
%description -n python3-scikit-build-core+pyproject
57+
This is a metapackage bringing in pyproject extras requires for
58+
python3-scikit-build-core.
59+
It makes sure the dependencies are installed.
60+
61+
%files -n python3-scikit-build-core+pyproject -f %{_pyproject_ghost_distinfo}
5362

5463

5564
%prep

0 commit comments

Comments
 (0)