From 7f916e528409b2a1cae663cdfaa476f8a65c86193a4fe80d3d915bfd808deebf Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 13 Feb 2020 14:54:10 +0000 Subject: [PATCH] Accepting request 774056 from home:StefanBruens:branches:science - Fix mixup of expanded/unexpaned python versions in devel package, the devel package always required python(2)-devel and python2-pybind. Move the data to a -common-devel subpackage, pulled in by versioned python{2,3}-pybind-devel packages. OBS-URL: https://build.opensuse.org/request/show/774056 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pybind11?expand=0&rev=13 --- python-pybind11.changes | 8 ++++++++ python-pybind11.spec | 25 +++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/python-pybind11.changes b/python-pybind11.changes index 2d10f81..ddaef1e 100644 --- a/python-pybind11.changes +++ b/python-pybind11.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 13 05:32:14 UTC 2020 - Stefan BrĂ¼ns + +- Fix mixup of expanded/unexpaned python versions in devel package, + the devel package always required python(2)-devel and + python2-pybind. Move the data to a -common-devel subpackage, + pulled in by versioned python{2,3}-pybind-devel packages. + ------------------------------------------------------------------- Tue Jan 14 10:19:23 UTC 2020 - John Vandenberg diff --git a/python-pybind11.spec b/python-pybind11.spec index 5517666..81c12aa 100644 --- a/python-pybind11.spec +++ b/python-pybind11.spec @@ -1,7 +1,7 @@ # # spec file for package python-pybind11 # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,13 +40,19 @@ and vice versa, mainly to create Python bindings of existing C++ code. It can reduce boilerplate code in traditional extension modules by inferring type information using compile-time introspection. -%package -n %{name}-devel +%package -n %{name}-common-devel Summary: Development files for pybind11 -Requires: %{name} = %{version} -Requires: python-devel -Provides: %{python_module pybind11-devel = %{version}} +Provides: %{python_module pybind11-common-devel = %{version}} -%description -n %{name}-devel +%description -n %{name}-common-devel +This package contains files for developing applications using pybind11. + +%package devel +Summary: Development files for pybind11 +Requires: %{name}-common-devel = %{version} +Requires: python-devel + +%description devel This package contains files for developing applications using pybind11. %prep @@ -63,7 +69,7 @@ This package contains files for developing applications using pybind11. %python_install %cmake_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -# removing duplciated header files +# removing duplicated header files rm -rv %{buildroot}%{_includedir}/python2.*/pybind11/ rm -rv %{buildroot}%{_includedir}/python3.*/pybind11 @@ -72,9 +78,12 @@ rm -rv %{buildroot}%{_includedir}/python3.*/pybind11 %license LICENSE %{python_sitelib}/* -%files -n %{name}-devel +%files -n %{name}-common-devel %{_includedir}/pybind11 %license LICENSE %{_datadir}/cmake/pybind11 +%files %{python_files devel} +%license LICENSE + %changelog