1 files changed, 29 insertions, 21 deletions
diff --git a/lammps.spec b/lammps.spec
index 7c52147..eb050e8 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -210,7 +210,7 @@ for mpi in '' mpich %{?with_openmpi:openmpi} ; do
     -DCMAKE_INSTALL_BINDIR=${MPI_BIN:-%{_bindir}} -DCMAKE_INSTALL_LIBDIR=${MPI_LIB:-%{_libdir}} -DLAMMPS_MACHINE="${MPI_SUFFIX#_}" -DLAMMPS_LIB_SUFFIX="${MPI_SUFFIX#_}" -DCMAKE_INSTALL_MANDIR=${MPI_MAN:-%{_mandir}} \
     ${mpi:+-DBUILD_MPI=ON -DFFT_USE_HEFFTE=ON -DCMAKE_EXE_LINKER_FLAGS="%{__global_ldflags} -Wl,-rpath -Wl,${MPI_LIB} -Wl,--enable-new-dtags" -DCMAKE_SHARED_LINKER_FLAGS="%{__global_ldflags} -Wl,-rpath -Wl,${MPI_LIB} -Wl,--enable-new-dtags" $(test "$mpi" != openmpi || echo "-DMPIEXEC_PREFLAGS=--oversubscribe") } \
     $(test -z "${mpi}" && echo -DBUILD_MPI=OFF -DBUILD_LAMMPS_SHELL=ON -DBUILD_TOOLS=ON)
-  %make_build
+  %cmake_build
   test -n "${mpi}" && module unload mpi/${mpi}-%{_arch}
 done
 
@@ -223,7 +223,7 @@ set +e
 set -e
 
 for mpi in '' mpich %{?with_openmpi:openmpi} ; do
-  %make_install -C build
+  %cmake_install -C build
 done
 
 cd python
@@ -254,27 +254,24 @@ done
 
 %ldconfig_scriptlets
 
-rm -rf phana_build/spglib_build_ext/include/spglib.h
-rm -rf phana_build/spglib_build_ext/lib/libsymspg.a
-
 %files
 %doc README
 %license LICENSE
-%{_builddir}/%{name}-%{version}-1.%{_arch}/build/lmp
-%{_mandir}/openmpi-%{_arch}/man1/lmp.*
-%{_builddir}/%{name}-%{version}-1.%{_arch}/build/liblammps.so.*
-%{_builddir}/%{name}-%{version}-1.%{_arch}/build/msi2lmp
-%{_mandir}/openmpi-%{_arch}/man1/msi2lmp.*
-%{_builddir}/%{name}-%{version}-1.%{_arch}/build/binary2txt
-%{_builddir}/%{name}-%{version}-1.%{_arch}/build/chain.x
-%{_builddir}/%{name}-%{version}-1.%{_arch}/build/micelle2d.x
-%{_builddir}/%{name}-%{version}-1.%{_arch}/build/stl_bin2txt
-%{_builddir}/%{name}-%{version}-1.%{_arch}/build/phana
-
+%{_bindir}/lmp
+%{_mandir}/man1/lmp.*
+%{_libdir}/liblammps.so.*
+%{_bindir}/msi2lmp
+%{_mandir}/man1/msi2lmp.*
+%{_bindir}/binary2txt
+%{_bindir}/chain.x
+%{_bindir}/micelle2d.x
+%{_bindir}/stl_bin2txt
+%{_bindir}/phana
+ 
 %files devel
-%{_builddir}/%{name}-%{version}-1.%{_arch}/build/liblammps.so
-%{_builddir}/%{name}-%{version}-1.%{_arch}/build/liblammps.pc
-%{_libdir}/openmpi/lib/cmake/LAMMPS
+%{_libdir}/liblammps.so
+%{_libdir}/pkgconfig/liblammps.pc
+%{_libdir}/cmake/LAMMPS
  
 %ifnarch %ix86
 %files openmpi-devel
@@ -283,6 +280,11 @@ rm -rf phana_build/spglib_build_ext/lib/libsymspg.a
 %{_libdir}/openmpi*/lib/cmake/LAMMPS
 %endif
  
+%files mpich-devel
+%{_libdir}/mpich*/lib/liblammps_mpich.so
+%{_libdir}/mpich*/lib/pkgconfig/liblammps_mpich.pc
+%{_libdir}/mpich*/lib/cmake/LAMMPS
+ 
 %files -n python3-%{name}
 %{python3_sitelib}/lammps
 %{python3_sitelib}/lammps-*.egg-info
@@ -295,14 +297,20 @@ rm -rf phana_build/spglib_build_ext/lib/libsymspg.a
 %files openmpi
 %license LICENSE
 %{_libdir}/openmpi*/bin/lmp_openmpi
-%{_mandir}/openmpi-%{_arch}/man1/lmp_openmpi.*
+%{_mandir}/openmpi*/man1/lmp_openmpi.*
 %{_libdir}/openmpi*/lib/liblammps_openmpi.so.*
 %endif
+
+%files mpich
+%license LICENSE
+%{_libdir}/mpich*/bin/lmp_mpich
+%{_mandir}/mpich*/man1/lmp_mpich.*
+%{_libdir}/mpich*/lib/liblammps_mpich.so.*
  
 %files data
 %license LICENSE
 %{_datadir}/%{name}
-%config etc/profile.d/lammps.*
+%config %{_sysconfdir}/profile.d/lammps.*
 
 %changelog
 * Tue Dec 12 2024 zhtianyu <zhangtianyu@iscas.ac.cn> - 20241119-1