Hello community,
here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory
checked in at 2017-11-21 15:33:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old)
and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf-cxx4"
Tue Nov 21 15:33:17 2017 rev:6 rq:543901 version:4.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2017-11-13
14:06:37.160671811 +0100
+++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes
2017-11-21 15:33:21.635060969 +0100
@@ -1,0 +2,9 @@
+Tue Nov 14 10:18:38 UTC 2017 - e...@suse.com
+
+- Fix modules file: only use %hpc_bindir if it really exists
+ - installing the tool package is optional.
+- Translate '-' to '_' for env-variable.
+- Require lua-lmod.
+- Add Requires for library package to tools package.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netcdf-cxx4.spec ++++++
--- /var/tmp/diff_new_pack.DiILpc/_old 2017-11-21 15:33:22.243038936 +0100
+++ /var/tmp/diff_new_pack.DiILpc/_new 2017-11-21 15:33:22.243038936 +0100
@@ -43,6 +43,8 @@
%define c_f_ver 6
%endif
+%define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_')
+
%if %{with hpc}
%{hpc_init -c %{compiler_family} %{?c_f_ver:-v %{c_f_ver}}}
%define package_name %{hpc_package_name %_ver}
@@ -87,6 +89,7 @@
%package tools
Summary: Tools for working with the netcdf4 C++ library
Group: Productivity/Scientific/Other
+%{?with_hpc:Requires: %{libname -s %{sover} -l %_ver}}
BuildArch: noarch
%description tools
@@ -106,6 +109,7 @@
%else
%hpc_requires
Requires: libnetcdf-%{compiler_family}%{?c_f_ver}-hpc
+Requires: lua-lmod
%endif
%description -n %{libname -s %{sover} -l %_ver}
@@ -126,7 +130,6 @@
Requires: netcdf-%{compiler_family}%{?c_f_ver}-hpc-devel
%endif
Requires: %{libname -s %{sover} -l %_ver} = %{version}
-
%{?with_hpc:%hpc_requires_devel}
%description -n %{libname -l %_ver}-devel
@@ -216,9 +219,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}
@@ -227,8 +231,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
