[rpms/cp2k] rawhide: Cleanup the spec file

[rpms/cp2k] rawhide: Cleanup the spec file

[Cristian Le]

A new commit has been pushed.

Repo   : rpms/cp2k
Branch : rawhide
Commit : 17f66c070139419cef2a527a797fa177ec98622e
Author : Cristian Le <git@lecris.dev>
Date   : 2026-07-24T15:45:02+02:00
Stats  : +9/-11 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/cp2k/c/17f66c070139419cef2a527a797fa177ec98622e?branch=rawhide

Log:
Cleanup the spec file

---
diff --git a/cp2k.spec b/cp2k.spec
index 155fe04..c288a5c 100644
--- a/cp2k.spec
+++ b/cp2k.spec
@@ -1,5 +1,6 @@
-# libxsmm is designed for x86_64 architectures only, see project's README
-# %bcond libxs %[ "%{_arch}" == "x86_64" ]
+# libxs is not packaged yet
+# https://bugzilla.redhat.com/show_bug.cgi?id=2493314
+%bcond libxs 0
 
 # Disable LTO due to https://bugzilla.redhat.com/show_bug.cgi?id=2243158
 %global _lto_cflags %nil
@@ -33,9 +34,9 @@ BuildRequires: flexiblas-devel
 BuildRequires: cmake(DBCSR)
 BuildRequires: cmake(libint2)
 BuildRequires: pkgconfig(fftw3)
-# %if %{with libxs}
-# BuildRequires: pkgconfig(libxsmm)
-# %endif
+%if %{with libxs}
+BuildRequires: pkgconfig(libxsmm)
+%endif
 # cmake(Libxc) technically fails
 # https://github.com/cp2k/cp2k/issues/3767
 BuildRequires: libxc-devel
@@ -147,11 +148,7 @@ cmake_common_args=(
   "-DCP2K_USE_LIBINT2:BOOL=ON"
   "-DCP2K_USE_LIBXC:BOOL=ON"
   "-DCP2K_USE_SPGLIB:BOOL=ON"
-  # %if %{with libxs}
-  # "-DCP2K_USE_LIBXS:BOOL=ON"
-  # %else
-  "-DCP2K_USE_LIBXS:BOOL=OFF"
-  # %endif
+  "-DCP2K_USE_LIBXS:BOOL=%{with libxs}"
 )
 for mpi in '' mpich openmpi; do
   if [ -n "$mpi" ]; then
@@ -160,6 +157,7 @@ for mpi in '' mpich openmpi; do
       "-DCMAKE_INSTALL_PREFIX:PATH=${MPI_HOME}"
       "-DCMAKE_PREFIX_PATH:PATH=${MPI_HOME};%{_prefix}"
       "-DCMAKE_INSTALL_Fortran_MODULES:PATH=${MPI_FORTRAN_MOD_DIR}/cp2k"
+      "-DCMAKE_INSTALL_LIBDIR:PATH=lib"
       "-DCP2K_DATA_DIR:PATH=%{_datadir}/cp2k/data"
       "-DCP2K_USE_MPI:BOOL=ON"
       "-DCP2K_USE_MPI_F08:BOOL=ON"
@@ -167,7 +165,7 @@ for mpi in '' mpich openmpi; do
   else
     cmake_mpi_args=(
       "-DCMAKE_INSTALL_Fortran_MODULES:PATH=%{_fmoddir}/cp2k"
-      "-DCMAKE_INSTALL_LIBDIR:PATH=lib64"
+      "-DCMAKE_INSTALL_LIBDIR:PATH=%{_lib}"
       "-DCP2K_USE_MPI:BOOL=OFF"
     )
   fi