diff --git a/0001-Install-as-arch-independent.patch b/0001-Install-as-arch-independent.patch index 941775f..fe059e0 100644 --- a/0001-Install-as-arch-independent.patch +++ b/0001-Install-as-arch-independent.patch @@ -16,9 +16,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 6521c98..47af271 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -123,7 +123,7 @@ export(EXPORT ${PROJECT_NAME}-targets - install(FILES ${XTENSOR_PYTHON_HEADERS} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor-python) +@@ -130,7 +130,7 @@ export(EXPORT ${PROJECT_NAME}-targets + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" + DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig/") -set(XTENSOR_PYTHON_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE +set(XTENSOR_PYTHON_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" CACHE diff --git a/cxx-flags.patch b/cxx-flags.patch deleted file mode 100644 index c9fcc27..0000000 --- a/cxx-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xtensor-python-0.27.0/test/CMakeLists.txt -=================================================================== ---- xtensor-python-0.27.0.orig/test/CMakeLists.txt -+++ xtensor-python-0.27.0/test/CMakeLists.txt -@@ -30,7 +30,7 @@ include(CheckCXXCompilerFlag) - string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE) - - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wunused-parameter -Wextra -Wreorder -Wconversion -fvisibility=hidden") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wunused-parameter -Wextra -Wreorder -Wconversion -fvisibility=hidden") - CHECK_CXX_COMPILER_FLAG("-std=c++14" HAS_CPP14_FLAG) - - if (HAS_CPP14_FLAG) diff --git a/xtensor-python-0.27.0.tar.gz b/xtensor-python-0.27.0.tar.gz deleted file mode 100644 index 4bdc78a..0000000 --- a/xtensor-python-0.27.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40ee01bd213aeb7bf64f6d8a3257f4fa98ed31c401596c6c7b3b115f61a473b9 -size 65455 diff --git a/xtensor-python-0.28.0.tar.gz b/xtensor-python-0.28.0.tar.gz new file mode 100644 index 0000000..98f9b90 --- /dev/null +++ b/xtensor-python-0.28.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3be09f2bc284e5a468937ad411a9976f9ab7ea5d0df40f5b1964a3694e7ee931 +size 66807 diff --git a/xtensor-python.changes b/xtensor-python.changes index fa080bc..b83a285 100644 --- a/xtensor-python.changes +++ b/xtensor-python.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jul 24 05:19:43 UTC 2025 - Christoph G + +- Update to 0.28 + * Adjust xtensor includes + * Provide pkg-config file +- Adapt 0001-Install-as-arch-independent.patch +- Remove cxx-flags.patch as there is no longer a single place + to add compiler flags for tests. + ------------------------------------------------------------------- Mon Feb 17 19:15:37 UTC 2025 - Matwey Kornilov diff --git a/xtensor-python.spec b/xtensor-python.spec index 8476923..055b622 100644 --- a/xtensor-python.spec +++ b/xtensor-python.spec @@ -17,19 +17,18 @@ Name: xtensor-python -Version: 0.27.0 +Version: 0.28.0 Release: 0 Summary: Python bindings for the xtensor C++ multi-dimensional array library License: BSD-3-Clause URL: https://github.com/xtensor-stack/xtensor-python Source0: https://github.com/xtensor-stack/xtensor-python/archive/refs/tags/%{version}/%{name}-%{version}.tar.gz Patch0: 0001-Install-as-arch-independent.patch -Patch1: cxx-flags.patch BuildRequires: %{python_module breathe} BuildRequires: %{python_module numpy-devel} BuildRequires: %{python_module sphinx_rtd_theme} BuildRequires: %{pythons} -BuildRequires: cmake +BuildRequires: cmake >= 3.14 BuildRequires: doctest-devel BuildRequires: doxygen BuildRequires: fdupes @@ -37,7 +36,7 @@ BuildRequires: gcc-c++ BuildRequires: gtest BuildRequires: make BuildRequires: python-rpm-macros -BuildRequires: xtensor-devel >= 0.25.0 +BuildRequires: xtensor-devel >= 0.26 BuildRequires: cmake(pybind11) >= 2.6.1 Group: Development/Libraries/C and C++ @@ -123,5 +122,6 @@ cp -r %{_builddir}/%{buildsubdir}/docs/build/html/* %{buildroot}/%{_docdir}/%{na %license LICENSE %{_includedir}/xtensor-python %{_datadir}/cmake/xtensor-python +%{_datadir}/pkgconfig/xtensor-python.pc %changelog