Update to 2.10.4

Resolves: RHEL-62014
This commit is contained in:
Pavel Simovec 2024-10-10 10:29:11 +02:00
parent 4b59e850e6
commit f2a79a731d
5 changed files with 38 additions and 34 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/pybind11-2.6.0.tar.gz
/pybind11-2.6.1.tar.gz
/pybind11-2.6.2.tar.gz
/pybind11-2.10.4.tar.gz

View File

@ -0,0 +1,28 @@
diff -uNr pybind11-2.10.1.bak/pybind11/commands.py pybind11-2.10.1/pybind11/commands.py
--- pybind11-2.10.1.bak/pybind11/commands.py 2022-11-07 15:25:26.651515082 -0600
+++ pybind11-2.10.1/pybind11/commands.py 2022-11-07 15:27:01.574703289 -0600
@@ -8,22 +8,13 @@
Return the path to the pybind11 include directory. The historical "user"
argument is unused, and may be removed.
"""
- installed_path = os.path.join(DIR, "include")
- source_path = os.path.join(os.path.dirname(DIR), "include")
- return installed_path if os.path.exists(installed_path) else source_path
-
+ return '/usr/include/pybind11'
def get_cmake_dir() -> str:
"""
Return the path to the pybind11 CMake module directory.
"""
- cmake_installed_path = os.path.join(DIR, "share", "cmake", "pybind11")
- if os.path.exists(cmake_installed_path):
- return cmake_installed_path
-
- msg = "pybind11 not installed, installation required to access the CMake files"
- raise ImportError(msg)
-
+ return '/usr/share/cmake/pybind11'
def get_pkgconfig_dir() -> str:
"""

View File

@ -1,30 +0,0 @@
diff -up pybind11-2.6.1/pybind11/commands.py.hpath pybind11-2.6.1/pybind11/commands.py
--- pybind11-2.6.1/pybind11/commands.py.hpath 2020-11-11 22:33:21.000000000 +0100
+++ pybind11-2.6.1/pybind11/commands.py 2020-11-12 13:22:07.355000414 +0100
@@ -1,22 +1,8 @@
# -*- coding: utf-8 -*-
import os
-
-DIR = os.path.abspath(os.path.dirname(__file__))
-
-
def get_include(user=False):
- # type: (bool) -> str
- installed_path = os.path.join(DIR, "include")
- source_path = os.path.join(os.path.dirname(DIR), "include")
- return installed_path if os.path.exists(installed_path) else source_path
-
+ return '/usr/include/pybind11'
def get_cmake_dir():
- # type: () -> str
- cmake_installed_path = os.path.join(DIR, "share", "cmake", "pybind11")
- if os.path.exists(cmake_installed_path):
- return cmake_installed_path
- else:
- msg = "pybind11 not installed, installation required to access the CMake files"
- raise ImportError(msg)
+ return '/usr/share/cmake/pybind11'
diff -up pybind11-2.6.1/pybind11/__init__.py.hpath pybind11-2.6.1/pybind11/__init__.py
diff -up pybind11-2.6.1/pybind11/__main__.py.hpath pybind11-2.6.1/pybind11/__main__.py

View File

@ -21,15 +21,15 @@
%global python3_enabled 1
Name: pybind11
Version: 2.6.2
Release: 6%{?dist}
Version: 2.10.4
Release: 1%{?dist}
Summary: Seamless operability between C++11 and Python
License: BSD
URL: https://github.com/pybind/pybind11
Source0: https://github.com/pybind/pybind11/archive/v%{version}/%{name}-%{version}.tar.gz
# Patch out header path
Patch1: pybind11-2.6.1-hpath.patch
Patch1: pybind11-2.10.1-hpath.patch
BuildRequires: make
%if %{python2_enabled}
@ -175,6 +175,7 @@ PYBIND11_USE_CMAKE=true %py3_install "--install-purelib" "%{python3_sitearch}"
%{_includedir}/pybind11/
%{_datadir}/cmake/pybind11/
%{_bindir}/pybind11-config
%{_datadir}/pkgconfig/%{name}.pc
%if %{python2_enabled}
%files -n python2-%{name}
@ -189,6 +190,10 @@ PYBIND11_USE_CMAKE=true %py3_install "--install-purelib" "%{python3_sitearch}"
%endif
%changelog
* Thu Oct 10 2024 Pavel Simovec <psimovec@redhat.com> - 2.10.4-1
- Update to 2.10.4
- Resolves: RHEL-62014
* Wed Jul 24 2024 Miro Hrončok <mhroncok@redhat.com> - 2.6.2-6
- Introduce epoch to pybind11-devel to sort newer than python3.11-pybind11-devel
- Resolves: RHEL-38108

View File

@ -1 +1 @@
SHA512 (pybind11-2.6.2.tar.gz) = 1eb346ff6b8f827053265340925e2c8038b1e2a89c352fc09f15ebe86128e7ba1f48c4368b193941f034b30bee7f72a94343e05d4841fdbbd0e4d91ed3d32025
SHA512 (pybind11-2.10.4.tar.gz) = 7970defbb6d057a44468ed707c80bfa6ef8c9578528fbc084b03aeea20a52dbd681581f82d55ff90af11ee89693379bd79e2ab6603239ba05b0aa8da29dd93c7