From 23a41a6fc86cc1fa7083bd99730a75362d9557a0 Mon Sep 17 00:00:00 2001
From: Julien Schueller <schueller@phimeca.com>
Date: Wed, 23 Oct 2024 09:45:43 +0200
Subject: [PATCH] Update Linux packages

---
 CMakeLists.txt        |  4 ++--
 ChangeLog             |  2 +-
 distro/debian/rules   |  8 +++-----
 distro/rpm/otsvm.spec | 10 ++--------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c2f406..dd3f3f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,9 +85,9 @@ if (BUILD_PYTHON)
     endif ()
 
     if (WIN32)
-      set (OTSVM_PYTHON_MODULE_PATH Lib/site-packages CACHE PATH "site-packages dir")
+      set (OTSVM_PYTHON_MODULE_PATH Lib/site-packages CACHE STRING "site-packages dir")
     else ()
-      set (OTSVM_PYTHON_MODULE_PATH ${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages CACHE PATH "site-packages dir")
+      set (OTSVM_PYTHON_MODULE_PATH ${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages CACHE STRING "site-packages dir")
     endif ()
   endif ()
 endif ()
diff --git a/ChangeLog b/ChangeLog
index 1edc13d..7194068 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-= 0.15 release (wip)
+= 0.15 release (2024-10-23)
 
  * Maintenance release
 
diff --git a/distro/debian/rules b/distro/debian/rules
index 3894ab7..7aa47f2 100644
--- a/distro/debian/rules
+++ b/distro/debian/rules
@@ -7,19 +7,17 @@ CXXFLAGS+=$(CPPFLAGS)
 DPKG_EXPORT_BUILDFLAGS = 1
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-PY3VER = $(shell py3versions -d)
-
 %:
 	dh $@ --buildsystem=cmake --with python3
 
 override_dh_auto_configure:
 	dh_auto_configure -Bbuild -- \
-            -DUSE_SPHINX=OFF \
             -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
             -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-            -DCMAKE_INSTALL_LIBDIR:PATH="lib/$(DEB_HOST_MULTIARCH)" \
+            -DCMAKE_INSTALL_LIBDIR:PATH=lib/$(DEB_HOST_MULTIARCH) \
             -DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/otsvm \
-            -DPYTHON_SITE_PACKAGES:PATH="lib/$(PY3VER)/site-packages"
+            -DOTSVM_PYTHON_MODULE_PATH=lib/python3/dist-packages \
+            -DCMAKE_UNITY_BUILD=ON
 
 override_dh_auto_build:
 	$(MAKE) -C build -j4
diff --git a/distro/rpm/otsvm.spec b/distro/rpm/otsvm.spec
index ff5742e..9ff02db 100644
--- a/distro/rpm/otsvm.spec
+++ b/distro/rpm/otsvm.spec
@@ -7,17 +7,11 @@
 %endif
 
 %define __cmake %{_bindir}/cmake
-%define _cmake_lib_suffix64 -DLIB_SUFFIX=64
 %define cmake \
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
 FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-%__cmake \\\
--DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-%if "%{?_lib}" == "lib64" \
-%{?_cmake_lib_suffix64} \\\
-%endif \
--DBUILD_SHARED_LIBS:BOOL=ON
+%__cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix}
 
 Name:           otsvm
 Version:        0.15
@@ -66,7 +60,7 @@ Python textual interface to OTSVM uncertainty library
 %build
 %cmake -DINSTALL_DESTDIR:PATH=%{buildroot} \
        -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
-       -DUSE_SPHINX=OFF .
+       -DCMAKE_UNITY_BUILD=ON .
 make %{?_smp_mflags}
 
 %install