Hello community,
here is the log from the commit of package netcdf-fortran for openSUSE:Factory checked in at 2019-09-02 13:24:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netcdf-fortran (Old)
and /work/SRC/openSUSE:Factory/.netcdf-fortran.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf-fortran"
Mon Sep 2 13:24:42 2019 rev:8 rq:726778 version:4.4.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/netcdf-fortran/netcdf-fortran.changes 2018-05-01 23:33:01.388027346 +0200
+++ /work/SRC/openSUSE:Factory/.netcdf-fortran.new.7948/netcdf-fortran.changes 2019-09-02 13:24:43.993319392 +0200
@@ -1,0 +2,11 @@
+Mon Aug 26 18:43:28 UTC 2019 - Ana Guerrero Lopez
+
+- Update to version 4.4.5, see changes at:
+ * https://www.unidata.ucar.edu/blogs/news/entry/netcdf-fortran-4-4-4
+- Update Source to rename the tarball with the format $name-$version
+- Set BuildRequires on netcdf to 4.6.2 or higher, this is required for
+ this version to build
+- Refresh patch
+ * netcdf4-Return-status-for-non-void-function-always.patch
+
+-------------------------------------------------------------------
Old:
----
v4.4.4.tar.gz
New:
----
netcdf-fortran-4.4.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netcdf-fortran.spec ++++++
--- /var/tmp/diff_new_pack.PqWKEC/_old 2019-09-02 13:24:44.693319260 +0200
+++ /var/tmp/diff_new_pack.PqWKEC/_new 2019-09-02 13:24:44.693319260 +0200
@@ -1,7 +1,7 @@
#
# spec file for package netcdf
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -21,8 +21,8 @@
%define _do_check 1
%global pname netcdf-fortran
-%global ver 4.4.4
-%global _ver 4_4_4
+%global ver 4.4.5
+%global _ver 4_4_5
%if 0%{?is_opensuse} || 0%{?is_backports}
%undefine DisOMPI3
@@ -121,8 +121,8 @@
Version: %ver
Release: 0
%define sonum 6
-Url: http://www.unidata.ucar.edu/software/netcdf/
-Source: https://github.com/Unidata/netcdf-fortran/archive/v%{version}.tar.gz
+URL: https://www.unidata.ucar.edu/software/netcdf/
+Source: https://github.com/Unidata/netcdf-fortran/archive/v%{version}.tar.gz#/%{pname}-%{version}.tar.gz
Patch0: netcdf4-Return-status-for-non-void-function-always.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
@@ -137,7 +137,7 @@
BuildRequires: %{mpi_flavor}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
%endif
BuildRequires: hdf5-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc-devel
-BuildRequires: netcdf-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc-devel
+BuildRequires: netcdf-%{compiler_family}%{?c_f_ver}%{?with_mpi:-%{mpi_flavor}%{?mpi_ver}}-hpc-devel >= 4.6.2
Requires: %{libname}%{hpc_package_name_tail %_ver} = %{version}
%description
++++++ netcdf4-Return-status-for-non-void-function-always.patch ++++++
--- /var/tmp/diff_new_pack.PqWKEC/_old 2019-09-02 13:24:44.725319254 +0200
+++ /var/tmp/diff_new_pack.PqWKEC/_new 2019-09-02 13:24:44.725319254 +0200
@@ -12,33 +12,29 @@
caller.
Signed-off-by: Egbert Eich
----
- fortran/nf_lib.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-diff --git a/fortran/nf_lib.c b/fortran/nf_lib.c
-index 8e93f52..e081bc3 100755
---- a/fortran/nf_lib.c
-+++ b/fortran/nf_lib.c
-@@ -171,9 +171,7 @@ nc_inq_numgrps(int ncid, int *numgrps)
+diff -Nrua a/fortran/nf_lib.c b/fortran/nf_lib.c
+--- a/fortran/nf_lib.c 2019-01-10 02:02:05.000000000 +0100
++++ b/fortran/nf_lib.c 2019-08-27 10:13:01.494856231 +0200
+@@ -171,9 +171,8 @@
{
int ret;
- if ((ret = nc_inq_grps(ncid, numgrps, NULL)))
--
-- return ret;
+ return nc_inq_grps(ncid, numgrps, NULL);
+
+- return ret;
}
extern int
-@@ -181,9 +179,7 @@ nc_inq_numtypes(int ncid, int *numtypes)
+@@ -181,9 +180,8 @@
{
int ret;
- if ((ret = nc_inq_typeids(ncid, numtypes, NULL)))
--
-- return ret;
+ return nc_inq_typeids(ncid, numtypes, NULL);
+
+- return ret;
}
- #endif /*USE_NETCDF4*/
+ extern int