Account for changed modulefiles location

fds/fds.sh

@@ -90,7 +90,8 @@ elif [ "$USE_MPICH" = true ]; then
 else
         # Use Intel MPI by default. First we have to load the module files from
         # the OneAPI installations as they aren't loaded by default.
-        module use /opt/intel/oneapi/modulefiles
+        /opt/intel/oneapi/modulefiles-setup.sh --force
+        module use ~/modulefiles
         # Load mpi, this will now load intel mpi first
         module load mpi
         # Unlike openmpi, the intel modules don't set MPI_SUFFIX so we need to

fds/template.spec

@@ -1,5 +1,5 @@
 
-%global this_release 4
+%global this_release 5
 
 #TODO: this isn't as clean as the openmpi version
 %global _intelmpi_load \
@@ -221,6 +221,8 @@ install -D %{repo}-%{commit}/%{build_dir}/%{intel_string}%{?arch_suffix}/fds%{?m
 %endif
 
 %changelog
+* Mon Mar 25 2024 Jake O'Shannessy <[email protected]> - %{version}-5
+- Unpin intel package versions
 * Sun Dec 10 2023 Jake O'Shannessy <[email protected]> - %{version}-4
 - Unpin intel package versions
 * Mon Jul 17 2023 Jake O'Shannessy <[email protected]> - %{version}-3