diff --git a/pybind11-2.5.0-hpath.patch b/pybind11-2.5.0-hpath.patch deleted file mode 100644 index 733d189..0000000 --- a/pybind11-2.5.0-hpath.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up pybind11-2.5.0/pybind11/__init__.py.hpath pybind11-2.5.0/pybind11/__init__.py ---- pybind11-2.5.0/pybind11/__init__.py.hpath 2020-04-01 08:30:49.562640795 +0200 -+++ pybind11-2.5.0/pybind11/__init__.py 2020-04-01 08:31:53.176754407 +0200 -@@ -2,11 +2,4 @@ from ._version import version_info, __ve - - - def get_include(user=False): -- import os -- d = os.path.dirname(__file__) -- if os.path.exists(os.path.join(d, "include")): -- # Package is installed -- return os.path.join(d, "include") -- else: -- # Package is from a source directory -- return os.path.join(os.path.dirname(d), "include") -+ return '/usr/include/pybind11' diff --git a/pybind11-2.6.1-hpath.patch b/pybind11-2.6.1-hpath.patch new file mode 100644 index 0000000..07271a2 --- /dev/null +++ b/pybind11-2.6.1-hpath.patch @@ -0,0 +1,30 @@ +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/pybind11.spec b/pybind11.spec index 39e157f..ba36270 100644 --- a/pybind11.spec +++ b/pybind11.spec @@ -15,7 +15,6 @@ %global python3_enabled 1 - Name: pybind11 Version: 2.6.1 Release: 1%{?dist} @@ -178,9 +177,6 @@ PYBIND11_USE_CMAKE=true %py3_install "--install-purelib" "%{python3_sitearch}" * Thu Nov 12 2020 Susi Lehtola - 2.6.1-1 - Update to 2.6.1. -* Mon Nov 09 2020 Susi Lehtola - 2.6.0-1 -- Update to 2.6.0. - * Wed Aug 12 2020 Merlin Mathesius - 2.5.0-5 - Drop Python 2 support for ELN and RHEL9+