From 1f34cef866603e56ee8b1706b4311cf37e2526b1 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 13 May 2025 14:31:45 +0000 Subject: [PATCH] import UBI pybind11-2.10.4-2.el9 --- .gitignore | 2 +- .pybind11.metadata | 2 +- SOURCES/pybind11-2.10.1-hpath.patch | 28 +++++++++++++++++++++++++++ SOURCES/pybind11-2.6.1-hpath.patch | 30 ----------------------------- SPECS/pybind11.spec | 15 ++++++++++++--- 5 files changed, 42 insertions(+), 35 deletions(-) create mode 100644 SOURCES/pybind11-2.10.1-hpath.patch delete mode 100644 SOURCES/pybind11-2.6.1-hpath.patch diff --git a/.gitignore b/.gitignore index d23c3d9..a416565 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pybind11-2.6.2.tar.gz +SOURCES/pybind11-2.10.4.tar.gz diff --git a/.pybind11.metadata b/.pybind11.metadata index 15aa587..7338588 100644 --- a/.pybind11.metadata +++ b/.pybind11.metadata @@ -1 +1 @@ -e340be2d61439deaf7bdd4bd273bb8c51b713f26 SOURCES/pybind11-2.6.2.tar.gz +5c366a92fc4b3937bcc3389405edbe362b1f3cbd SOURCES/pybind11-2.10.4.tar.gz diff --git a/SOURCES/pybind11-2.10.1-hpath.patch b/SOURCES/pybind11-2.10.1-hpath.patch new file mode 100644 index 0000000..c615c6d --- /dev/null +++ b/SOURCES/pybind11-2.10.1-hpath.patch @@ -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: + """ diff --git a/SOURCES/pybind11-2.6.1-hpath.patch b/SOURCES/pybind11-2.6.1-hpath.patch deleted file mode 100644 index 07271a2..0000000 --- a/SOURCES/pybind11-2.6.1-hpath.patch +++ /dev/null @@ -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 diff --git a/SPECS/pybind11.spec b/SPECS/pybind11.spec index 0957e89..d4fe25b 100644 --- a/SPECS/pybind11.spec +++ b/SPECS/pybind11.spec @@ -21,15 +21,15 @@ %global python3_enabled 1 Name: pybind11 -Version: 2.6.2 -Release: 6%{?dist} +Version: 2.10.4 +Release: 2%{?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,14 @@ PYBIND11_USE_CMAKE=true %py3_install "--install-purelib" "%{python3_sitearch}" %endif %changelog +* Thu Oct 31 2024 Pavel Simovec - 2.10.4-2 +- rebuilt +- Resolves: RHEL-62014 + +* Thu Oct 10 2024 Pavel Simovec - 2.10.4-1 +- Update to 2.10.4 +- Resolves: RHEL-62014 + * Wed Jul 24 2024 Miro HronĨok - 2.6.2-6 - Introduce epoch to pybind11-devel to sort newer than python3.11-pybind11-devel - Resolves: RHEL-38108