Hello community,
here is the log from the commit of package netcdf-fortran for openSUSE:Factory
checked in at 2017-11-21 15:33:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old)
and /work/SRC/openSUSE:Factory/.netcdf-fortran.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf-fortran"
Tue Nov 21 15:33:22 2017 rev:3 rq:543902 version:4.4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes
2017-11-13 14:06:39.816576266 +0100
+++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new/netcdf-fortran.changes
2017-11-21 15:33:22.371034298 +0100
@@ -1,0 +2,11 @@
+Wed Nov 15 13:30:29 UTC 2017 - e...@suse.com
+
+- Fix typo in modules file which made help less useful.
+
+-------------------------------------------------------------------
+Tue Nov 14 11:12:31 UTC 2017 - e...@suse.com
+
+- Fix modules file: only use %hpc_bindir if it really exists
+- Translate '-' to '_' for env-variable.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netcdf-fortran.spec ++++++
--- /var/tmp/diff_new_pack.9ix9tp/_old 2017-11-21 15:33:22.891015454 +0100
+++ /var/tmp/diff_new_pack.9ix9tp/_new 2017-11-21 15:33:22.891015454 +0100
@@ -57,6 +57,8 @@
%{bcond_without mpi}
%endif
+%define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_')
+
%{?hpc_init:%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}}
%{?with_mpi:-m %mpi_flavor %{?mpi_ver:-V %mpi_ver}}}}
%if 0%{!?package_name:1}
@@ -162,7 +164,7 @@
This package contains all files needed to create projects that use
%{?mpi_flavor:the %mpi_flavor version of} NetCDF.
-%{hpc_master_pachage devel}
+%{hpc_master_package devel}
%package devel-static
Summary: Static development files for %{name}
@@ -242,7 +244,7 @@
puts stderr "version of NetCDF are loaded automatically via this module. A
typical compilation"
puts stderr "example for Fortran applications requiring NetCDF is as follows:"
puts stderr " "
-puts stderr "\\\$FC -I\\\$NETCDF_FORTRAN_INC app.f90 -L\\\$NETCDF_FORTRAN_LIB
-lnetcdff -L\\\$NETCDF_LIB -lnetcdf -L\$HDF5_LIB -lhdf5"
+puts stderr "\\\$FC -I\\\$NETCDF_FORTRAN_INC app.f90 -L\\\$NETCDF_FORTRAN_LIB
-lnetcdff -L\\\$NETCDF_LIB -lnetcdf -L\\\$HDF5_LIB -lhdf5"
puts stderr "\nVersion %{version}\n"
@@ -267,9 +269,10 @@
prepend-path MANPATH %{hpc_mandir}
prepend-path LD_LIBRARY_PATH %{hpc_libdir}
-setenv %{hpc_upcase %pname}_DIR %{hpc_prefix}
-setenv %{hpc_upcase %pname}_BIN %{hpc_bindir}
-
+setenv %{hpc_upcase_trans_hyph %pname}_DIR %{hpc_prefix}
+if {[file isdirectory %{hpc_bindir}]} {
+setenv %{hpc_upcase_trans_hyph %pname}_BIN %{hpc_bindir}
+}
if {[file isdirectory %{hpc_includedir}]} {
prepend-path LIBRARY_PATH %{hpc_libdir}
prepend-path CPATH %{hpc_includedir}
@@ -278,8 +281,8 @@
prepend-path INCLUDE %{hpc_includedir}
%hpc_modulefile_add_pkgconfig_path
-setenv %{hpc_upcase %pname}_LIB %{hpc_libdir}
-setenv %{hpc_upcase %pname}_INC %{hpc_includedir}
+setenv %{hpc_upcase_trans_hyph %pname}_LIB %{hpc_libdir}
+setenv %{hpc_upcase_trans_hyph %pname}_INC %{hpc_includedir}
}
EOF
