From 554e34e58707959f56f9ceda95e6bf34d6df8958 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mar 09 2019 08:29:28 +0000 Subject: Update to 2018.2.5 Signed-off-by: Igor Gnatenko --- diff --git a/.gitignore b/.gitignore index 27ff479..c7d1773 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pyopencl-2017.2.tar.gz /pyopencl-2017.2.2.tar.gz /pyopencl-2018.1.1.tar.gz +/pyopencl-2018.2.5.tar.gz diff --git a/0001-disable-executing-git-submodule.patch b/0001-disable-executing-git-submodule.patch new file mode 100644 index 0000000..3bc388d --- /dev/null +++ b/0001-disable-executing-git-submodule.patch @@ -0,0 +1,25 @@ +From ebffe91861a95f00ecb4d7c03e209147d547c0d6 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sat, 24 Oct 2015 12:55:47 +0200 +Subject: [PATCH 1/2] disable executing git submodule + +Signed-off-by: Igor Gnatenko +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 1b71cb5..29ecdbc 100644 +--- a/setup.py ++++ b/setup.py +@@ -110,7 +110,6 @@ def main(): + check_pybind11, check_git_submodules, ExtensionUsingNumpy, + get_pybind_include, PybindBuildExtCommand) + check_pybind11() +- check_git_submodules() + + hack_distutils() + conf = get_config(get_config_schema(), +-- +2.21.0 + diff --git a/0002-disable-executing-git-submodule.patch b/0002-disable-executing-git-submodule.patch deleted file mode 100644 index 7789b99..0000000 --- a/0002-disable-executing-git-submodule.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 03bc9977c852971955d03018317518d992a7033f Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sat, 24 Oct 2015 12:55:47 +0200 -Subject: [PATCH 2/3] disable executing git submodule - -Signed-off-by: Igor Gnatenko ---- - setup.py | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index 4ca9284..b4c687b 100644 ---- a/setup.py -+++ b/setup.py -@@ -99,9 +99,7 @@ def get_config_schema(): - - def main(): - from setuptools import find_packages -- from aksetup_helper import (hack_distutils, get_config, setup, -- check_git_submodules) -- check_git_submodules() -+ from aksetup_helper import (hack_distutils, get_config, setup) - - hack_distutils() - conf = get_config(get_config_schema(), --- -2.15.1 - diff --git a/0002-don-t-hack-distutils-with-C-LDFLAGS.patch b/0002-don-t-hack-distutils-with-C-LDFLAGS.patch new file mode 100644 index 0000000..bde5772 --- /dev/null +++ b/0002-don-t-hack-distutils-with-C-LDFLAGS.patch @@ -0,0 +1,25 @@ +From f9a4ec2caab09f28e72d59cad1b5859a1534f02b Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sat, 24 Oct 2015 13:11:13 +0200 +Subject: [PATCH 2/2] don't hack distutils with C/LDFLAGS + +Signed-off-by: Igor Gnatenko +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 29ecdbc..3aa4b2d 100644 +--- a/setup.py ++++ b/setup.py +@@ -111,7 +111,6 @@ def main(): + get_pybind_include, PybindBuildExtCommand) + check_pybind11() + +- hack_distutils() + conf = get_config(get_config_schema(), + warn_about_no_config=False) + +-- +2.21.0 + diff --git a/0003-don-t-hack-distutils-with-C-LDFLAGS.patch b/0003-don-t-hack-distutils-with-C-LDFLAGS.patch deleted file mode 100644 index 39cae3e..0000000 --- a/0003-don-t-hack-distutils-with-C-LDFLAGS.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8a52174bc19a5d69e6cfee974b42acfee7204c04 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sat, 24 Oct 2015 13:11:13 +0200 -Subject: [PATCH 3/3] don't hack distutils with C/LDFLAGS - -Signed-off-by: Igor Gnatenko ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index b4c687b..07282e0 100644 ---- a/setup.py -+++ b/setup.py -@@ -101,7 +101,6 @@ def main(): - from setuptools import find_packages - from aksetup_helper import (hack_distutils, get_config, setup) - -- hack_distutils() - conf = get_config(get_config_schema(), - warn_about_no_config=False) - --- -2.15.1 - diff --git a/python-pyopencl.spec b/python-pyopencl.spec index 8290a75..5323451 100644 --- a/python-pyopencl.spec +++ b/python-pyopencl.spec @@ -3,8 +3,8 @@ %global srcname pyopencl Name: python-%{srcname} -Version: 2018.1.1 -Release: 4%{?dist} +Version: 2018.2.5 +Release: 1%{?dist} Summary: Python wrapper for OpenCL # https://bugzilla.redhat.com/show_bug.cgi?id=1219819#c16 @@ -30,9 +30,9 @@ Summary: Python wrapper for OpenCL License: MIT and Boost and ASL 2.0 and GPLv2 and BSD URL: https://mathema.tician.de/software/pyopencl Source0: %{pypi_source} -Patch1: 0002-disable-executing-git-submodule.patch +Patch1: 0001-disable-executing-git-submodule.patch # Have not asked upstream, but they want to enforce CFLAGS/LDFLAGS -Patch2: 0003-don-t-hack-distutils-with-C-LDFLAGS.patch +Patch2: 0002-don-t-hack-distutils-with-C-LDFLAGS.patch # pyopencl/cl/pyopencl-bessel-[j,y].cl and # pyopencl/cl/pyopencl-eval-tbl.cl contain snippets taken from boost @@ -80,10 +80,8 @@ Python 3 version. %autosetup -n %{srcname}-%{version} -p1 rm -vrf *.egg-info rm -vf examples/download-examples-from-wiki.py -# https://github.com/inducer/pyopencl/pull/239 -sed -i -e "/pytest/d" setup.py -# generate html docs +# generate html docs #sphinx-build doc/source html # remove the sphinx-build leftovers #rm -rf html/.{doctrees,buildinfo} @@ -104,6 +102,9 @@ find %{buildroot}%{python3_sitearch}/%{srcname} -name '*.so' -exec chmod 755 {} %{python3_sitearch}/%{srcname}-*.egg-info/ %changelog +* Sat Mar 09 2019 Igor Gnatenko - 2018.2.5-1 +- Update to 2018.2.5 + * Sat Feb 02 2019 Fedora Release Engineering - 2018.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 99b4561..8d27974 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyopencl-2018.1.1.tar.gz) = 74bf68bb857b592f2bc3bae84b8a245573cec1ac6331f82b731b05a5a1b586c646b98754c68fd02ce067a10a62faac3119f6c47f01e48ec949e39b42d5efdfa3 +SHA512 (pyopencl-2018.2.5.tar.gz) = 91f9e9b15ef0dbf22440b6abf762c729e8de587966c9d9a5da8c7ac02230ef700e31056248f1d93ec7e7af6e79918d68e18139e413f3cef287ecf683ee81ac05