diff --git a/.gitignore b/.gitignore index e41d695..14c076d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /pybind11-2.4.1.tar.gz /pybind11-2.4.2.tar.gz /pybind11-2.4.3.tar.gz +/pybind11-2.5.0.tar.gz diff --git a/pybind11-2.4.0-nopip.patch b/pybind11-2.4.0-nopip.patch deleted file mode 100644 index 0ace618..0000000 --- a/pybind11-2.4.0-nopip.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up pybind11-2.4.0/pybind11/__init__.py.nopip pybind11-2.4.0/pybind11/__init__.py ---- pybind11-2.4.0/pybind11/__init__.py.nopip 2019-09-19 23:06:22.000000000 +0200 -+++ pybind11-2.4.0/pybind11/__init__.py 2019-09-20 08:38:31.351226101 +0200 -@@ -1,36 +1,4 @@ - from ._version import version_info, __version__ # noqa: F401 imported but unused - -- - def get_include(user=False): -- from distutils.dist import Distribution -- import os -- import sys -- -- # Are we running in a virtual environment? -- virtualenv = hasattr(sys, 'real_prefix') or \ -- sys.prefix != getattr(sys, "base_prefix", sys.prefix) -- -- # Are we running in a conda environment? -- conda = os.path.exists(os.path.join(sys.prefix, 'conda-meta')) -- -- if virtualenv: -- return os.path.join(sys.prefix, 'include', 'site', -- 'python' + sys.version[:3]) -- elif conda: -- if os.name == 'nt': -- return os.path.join(sys.prefix, 'Library', 'include') -- else: -- return os.path.join(sys.prefix, 'include') -- else: -- dist = Distribution({'name': 'pybind11'}) -- dist.parse_config_files() -- -- dist_cobj = dist.get_command_obj('install', create=True) -- -- # Search for packages in user's home directory? -- if user: -- dist_cobj.user = user -- dist_cobj.prefix = "" -- dist_cobj.finalize_options() -- -- return os.path.dirname(dist_cobj.install_headers) -+ return '/usr/include/pybind11' diff --git a/pybind11-2.5.0-hpath.patch b/pybind11-2.5.0-hpath.patch new file mode 100644 index 0000000..733d189 --- /dev/null +++ b/pybind11-2.5.0-hpath.patch @@ -0,0 +1,16 @@ +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.spec b/pybind11.spec index 996c79d..8f8fc67 100644 --- a/pybind11.spec +++ b/pybind11.spec @@ -14,15 +14,15 @@ Name: pybind11 -Version: 2.4.3 -Release: 2%{?dist} +Version: 2.5.0 +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 -# Don't use pip to get path to headers -Patch1: pybind11-2.4.0-nopip.patch +# Patch out header path +Patch1: pybind11-2.5.0-hpath.patch %if %{python2_enabled} # Needed to build the python libraries @@ -100,7 +100,7 @@ This package contains the Python 3 files. %prep %setup -q -%patch1 -p1 -b .nopip +%patch1 -p1 -b .hpath %build pys="" @@ -168,6 +168,9 @@ PYBIND11_USE_CMAKE=true %py3_install "--install-purelib" "%{python3_sitearch}" %endif %changelog +* Wed Apr 01 2020 Susi Lehtola - 2.5.0-1 +- Update to 2.5.0. + * Thu Jan 30 2020 Fedora Release Engineering - 2.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 835da90..483bf2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pybind11-2.4.3.tar.gz) = 993b9a00fb9a4280d5500f8bae2b1238c026c1635862307c7b06ac0d26c3a9743d9c69658190decd126d0de45353a51c4b354bcc023345a05fce0bdc52b56fe0 +SHA512 (pybind11-2.5.0.tar.gz) = 7f3a9c71916749436898d1844ef6b112baf0817a386308b5df8dec2a912ef4b6a932b94965e98f227c49fa77312f131972a6039f23b84a3daf6442a8ab0be7c2