Hello community,
here is the log from the commit of package netcdf for openSUSE:Factory checked
in at 2017-11-01 11:06:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netcdf (Old)
and /work/SRC/openSUSE:Factory/.netcdf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf"
Wed Nov 1 11:06:30 2017 rev:36 rq:537473 version:4.4.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/netcdf/netcdf.changes 2017-10-29
20:24:09.651793584 +0100
+++ /work/SRC/openSUSE:Factory/.netcdf.new/netcdf.changes 2017-11-01
11:06:29.580666989 +0100
@@ -1,0 +2,7 @@
+Sat Oct 28 19:23:30 UTC 2017 - e...@suse.com
+
+- Add minimal mpi-selector support for non-HPC MPI build.
+ This will avoid the MPI packages to conflict with the
+ 'serial' ones as both provide the same files and libs.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netcdf.spec ++++++
--- /var/tmp/diff_new_pack.728khL/_old 2017-11-01 11:06:30.340639226 +0100
+++ /var/tmp/diff_new_pack.728khL/_new 2017-11-01 11:06:30.344639080 +0100
@@ -105,6 +105,7 @@
%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?with_mpi:-m
{%mpi_flavor}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}}
%define package_name %{hpc_package_name %_ver}
%define libname(s:) lib%{pname}%{hpc_package_name_tail %_ver}
+%define p_prefix %hpc_prefix
%define p_bindir %hpc_bindir
%define p_libdir %hpc_libdir
%define p_mandir %hpc_mandir
@@ -112,10 +113,19 @@
%else
%define package_name %{pname}%{p_suffix}
%define libname(s:) lib%{pname}%{-s*}%{?p_suffix}
+ %if %{without mpi}
+%define p_prefix %_prefix
%define p_bindir %_bindir
%define p_libdir %_libdir
%define p_mandir %_mandir
%define p_includedir %_includedir
+ %else
+%define p_prefix /usr/%{_lib}/mpi/gcc/%{mpi_flavor}
+%define p_bindir %{p_prefix}/bin
+%define p_libdir %{p_prefix}/%{_lib}
+%define p_mandir %{p_prefix}/share/man
+%define p_includedir %{p_prefix}/include
+ %endif
%endif
%define p_suffix %{?with_mpi:-%{mpi_flavor}}
%define hdf5_module_file %{?with_mpi:p}hdf5
@@ -344,6 +354,11 @@
%{?with_hpc:export LDFLAGS="-L$HDF5_LIB"}
%if %{without hpc}
%configure \
+ --prefix=%{p_prefix} \
+ --bindir=%{p_bindir} \
+ --libdir=%{p_libdir} \
+ --includedir=%{p_includedir} \
+ --mandir=%{p_mandir} \
%else
%hpc_configure \
%endif
@@ -384,6 +399,27 @@
%_netcdf_sonum %{sonum}
%_netcdf_version %{version}
EOF
+ %if %{with mpi}
+# Module files
+mkdir -p %{buildroot}%{_datadir}/modules/%{pname}-%{mpi_flavor}
+cat << EOF > %{buildroot}%{_datadir}/modules/%{pname}-%{mpi_flavor}/%version
+#%%Module
+proc ModulesHelp { } {
+ global dotversion
+ puts stderr "\tLoads the %{pname}-%{mpi_flavor} %version Environment"
+}
+
+module-whatis "Loads the %{pname}-%{mpi_flavor} %version Environment."
+prepend-path PATH %{p_bindir}
+prepend-path MANPATH %{p_mandir}
+prepend-path LD_LIBRARY_PATH %{p_libdir}
+prepend-path LIBRARY_PATH %{p_libdir}
+prepend-path CPATH %{p_includedir}
+prepend-path C_INCLUDE_PATH %{p_includedir}
+prepend-path CPLUS_INCLUDE_PATH %{p_includedir}
+EOF
+
+ %endif
%else
%hpc_write_modules_files
#%%Module1.0#####################################################################
@@ -471,8 +507,15 @@
%files -n %{libname -s %{sonum}}
%defattr(-,root,root,-)
-%{?with_hpc:%hpc_dirs}
-%{?with_hpc:%hpc_modules_files}
+%if %{with hpc}
+%hpc_dirs
+%hpc_modules_files
+%else
+ %if %{with mpi}
+%dir %{_datadir}/modules
+%{_datadir}/modules/%{pname}-%{mpi_flavor}
+ %endif
+%endif
%{p_libdir}/libnetcdf.so.*
%if %{without hpc}
