rpms/pybind11
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update patch and remove entry for failed build in changelog.

Browse Source
This commit is contained in:
Susi Lehtola 2020-11-12 13:23:32 +01:00
parent c720d2901d
commit 3185818b61
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pybind11-2.5.0-hpath.patch
View File

@ -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'

30
pybind11-2.6.1-hpath.patch Normal file
View File

@ -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

4
pybind11.spec
View File

@ -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 <jussilehtola@fedoraproject.org> - 2.6.1-1
- Update to 2.6.1.
* Mon Nov 09 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.6.0-1
- Update to 2.6.0.
* Wed Aug 12 2020 Merlin Mathesius <mmathesi@redhat.com> - 2.5.0-5
- Drop Python 2 support for ELN and RHEL9+