commit netcdf-cxx4 for openSUSE:Factory
Hello community,
here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory
checked in at 2020-09-15 16:24:55
Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old)
and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new.4249 (New)
Package is "netcdf-cxx4"
Tue Sep 15 16:24:55 2020 rev:13 rq:833708 version:4.3.1
Changes:
--- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2019-10-04
11:22:37.708912752 +0200
+++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new.4249/netcdf-cxx4.changes
2020-09-15 16:25:41.050447090 +0200
@@ -1,0 +2,5 @@
+Fri Sep 11 06:12:00 UTC 2020 - Egbert Eich
+
+- Add build support for gcc8/9/10 to HPC build (bsc#1174439).
+
+---
Other differences:
--
++ netcdf-cxx4.spec ++
--- /var/tmp/diff_new_pack.3lkyJ2/_old 2020-09-15 16:25:42.258448247 +0200
+++ /var/tmp/diff_new_pack.3lkyJ2/_new 2020-09-15 16:25:42.262448251 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package netcdf
+# spec file for package netcdf-cxx4
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -46,6 +46,24 @@
%define c_f_ver 7
%endif
+%if "%flavor" == "gnu8-hpc"
+%global compiler_family gnu
+%bcond_without hpc
+%define c_f_ver 8
+%endif
+
+%if "%flavor" == "gnu9-hpc"
+%global compiler_family gnu
+%bcond_without hpc
+%define c_f_ver 9
+%endif
+
+%if "%flavor" == "gnu10-hpc"
+%global compiler_family gnu
+%bcond_without hpc
+%define c_f_ver 10
+%endif
+
%if !0%{?is_opensuse} && !0%{?with_hpc:1}
ExclusiveArch: do_not_build
%endif
@@ -73,7 +91,7 @@
Summary:C++ library for the Unidata network Common Data Form version 4
License:NetCDF
Group: Productivity/Scientific/Other
-Url:http://www.unidata.ucar.edu/software/netcdf/
+URL:http://www.unidata.ucar.edu/software/netcdf/
Source0:
http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-cxx4-%{version}.tar.gz
Patch0: netcdf-cxx4-testsuite_bigendian.patch
%if %{without hpc}
commit netcdf-cxx4 for openSUSE:Factory
Hello community,
here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory
checked in at 2019-10-04 11:21:57
Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old)
and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new.2352 (New)
Package is "netcdf-cxx4"
Fri Oct 4 11:21:57 2019 rev:12 rq:734576 version:4.3.1
Changes:
--- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2018-05-01
23:32:20.281522307 +0200
+++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new.2352/netcdf-cxx4.changes
2019-10-04 11:22:37.708912752 +0200
@@ -1,0 +2,8 @@
+Wed Oct 2 07:26:28 UTC 2019 - Ana Guerrero Lopez
+
+- Update to version 4.3.1, (jsc#SLE-9959), see changes at:
+ * https://www.unidata.ucar.edu/blogs/news/entry/netcdf-c-4-3-1
+- Use -ffat-lto-objects to provide a proper static library.
+- Spec file cleanup
+
+---
Old:
netcdf-cxx4-4.3.0.tar.gz
New:
netcdf-cxx4-4.3.1.tar.gz
Other differences:
--
++ netcdf-cxx4.spec ++
--- /var/tmp/diff_new_pack.YJOWHw/_old 2019-10-04 11:22:38.188911501 +0200
+++ /var/tmp/diff_new_pack.YJOWHw/_new 2019-10-04 11:22:38.188911501 +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,16 +12,17 @@
# 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/
#
%global flavor @BUILD_FLAVOR@%{nil}
%global pname netcdf-cxx4
-%global ver 4.3.0
-%global _ver 4_3_0
+%global ver 4.3.1
+%global _ver 4_3_1
%define sover 1
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
ExcludeArch:s390 s390x
@@ -267,30 +268,31 @@
%{?with_hpc:%hpc_module_delete_if_default}
%files tools
-%defattr(-,root,root)
-%doc COPYRIGHT
+%license COPYRIGHT
+%doc README.md RELEASE_NOTES.md
%{?with_hpc:%dir %{p_bindir}}
%{p_bindir}/ncxx4-config
%files -n %{libname -s %{sover} -l %_ver}
-%defattr(-,root,root)
-%doc COPYRIGHT
+%license COPYRIGHT
+%doc README.md RELEASE_NOTES.md
%{?with_hpc:%hpc_dirs}
%{?with_hpc:%hpc_modules_files}
%{p_libdir}/libnetcdf_c++4.so.%{sover}
%{p_libdir}/libnetcdf_c++4.so.%{sover}.*
%files -n %{libname -l %_ver}-devel
-%defattr(-,root,root)
-%doc COPYRIGHT
+%license COPYRIGHT
+%doc README.md RELEASE_NOTES.md
%{p_includedir}/
%{?with_hpc:%dir %{hpc_pkgconfigdir}}
%{p_libdir}/pkgconfig/netcdf-cxx4.pc
%{p_libdir}/libnetcdf_c++4.so
+# Do not add plugins for now
+%exclude %{p_libdir}/libh5bzip2.*
%if %{with hpc}
%files -n %{libname -l %_ver}-devel-static
-%defattr(-,root,root)
%{p_libdir}/*.a
%endif
++ netcdf-cxx4-4.3.0.tar.gz -> netcdf-cxx4-4.3.1.tar.gz ++
38425 lines of diff (skipped)
commit netcdf-cxx4 for openSUSE:Factory
Hello community, here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory checked in at 2018-05-01 23:32:17 Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old) and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New) Package is "netcdf-cxx4" Tue May 1 23:32:17 2018 rev:11 rq:602641 version:4.3.0 Changes: --- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2018-04-27 16:10:14.780257490 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes 2018-05-01 23:32:20.281522307 +0200 @@ -1,0 +2,6 @@ +Mon Apr 30 18:08:38 UTC 2018 - e...@suse.com + +- (Temporarily) disable fpr S390* as a check test for netcdf fails + currently on BE (bsc#1091474). + +--- Other differences: -- ++ netcdf-cxx4.spec ++ --- /var/tmp/diff_new_pack.7qya44/_old 2018-05-01 23:32:21.341483759 +0200 +++ /var/tmp/diff_new_pack.7qya44/_new 2018-05-01 23:32:21.341483759 +0200 @@ -23,6 +23,8 @@ %global _ver 4_3_0 %define sover 1 +ExcludeArch:s390 s390x + %if "%flavor" == "" ExclusiveArch: do_not_build %endif
commit netcdf-cxx4 for openSUSE:Factory
Hello community,
here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory
checked in at 2018-04-27 16:10:14
Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old)
and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New)
Package is "netcdf-cxx4"
Fri Apr 27 16:10:14 2018 rev:10 rq:601898 version:4.3.0
Changes:
--- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2018-03-24
16:16:24.669267528 +0100
+++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes
2018-04-27 16:10:14.780257490 +0200
@@ -1,0 +2,9 @@
+Fri Apr 27 12:24:16 UTC 2018 - e...@suse.com
+
+- Disable non-HPC builds on non-openSUSE systems:
+ a. currently only SUSE products/projects are supported/
+ b. non-HPC builds are not and have never been supported on SLE,
+ on openSUSE they are provided for compatibility reasons
+ (bsc#1091223).
+
+---
Other differences:
--
++ netcdf-cxx4.spec ++
--- /var/tmp/diff_new_pack.o8rbDh/_old 2018-04-27 16:10:15.352236514 +0200
+++ /var/tmp/diff_new_pack.o8rbDh/_new 2018-04-27 16:10:15.356236367 +0200
@@ -43,6 +43,10 @@
%define c_f_ver 7
%endif
+%if !0%{?is_opensuse} && !0%{?with_hpc:1}
+ExclusiveArch: do_not_build
+%endif
+
%define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_')
%if %{with hpc}
commit netcdf-cxx4 for openSUSE:Factory
Hello community,
here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory
checked in at 2018-03-24 16:16:10
Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old)
and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New)
Package is "netcdf-cxx4"
Sat Mar 24 16:16:10 2018 rev:9 rq:590562 version:4.3.0
Changes:
--- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2018-02-21
14:10:54.399409852 +0100
+++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes
2018-03-24 16:16:24.669267528 +0100
@@ -1,0 +2,8 @@
+Thu Mar 22 01:10:53 CET 2018 - r...@suse.de
+
+- add netcdf-cxx4-testsuite_bigendian.patch (bsc#1086393)
+ skip problematic testcases on bigendian architectures for now
+ looks like netcdf-4.4.X is lacking proper support
+- output test log in case of error in check section of specfile
+
+---
New:
netcdf-cxx4-testsuite_bigendian.patch
Other differences:
--
++ netcdf-cxx4.spec ++
--- /var/tmp/diff_new_pack.NmAkAW/_old 2018-03-24 16:16:25.685230905 +0100
+++ /var/tmp/diff_new_pack.NmAkAW/_new 2018-03-24 16:16:25.689230761 +0100
@@ -68,6 +68,7 @@
Group: Productivity/Scientific/Other
Url:http://www.unidata.ucar.edu/software/netcdf/
Source0:
http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-cxx4-%{version}.tar.gz
+Patch0: netcdf-cxx4-testsuite_bigendian.patch
%if %{without hpc}
BuildRequires: gcc-c++
BuildRequires: pkg-config
@@ -146,6 +147,9 @@
%prep
%setup -q -n %{pname}-%{version}
+%ifarch ppc ppc64 s390 s390x
+%patch0 -p1
+%endif
%build
%{?with_hpc:%hpc_setup}
@@ -245,7 +249,10 @@
export CPPFLAGS=$CFLAGS
export LDFLAGS="-L$NETCDF_LIB -lnetcdf -L$HDF5_LIB -lhdf5"
%endif
-make check
+make check || {
+ cat cxx4/test-suite.log
+ exit 1
+}
%post -n %{libname -s %{sover} -l %_ver} -p /sbin/ldconfig
++ netcdf-cxx4-testsuite_bigendian.patch ++
--- netcdf-cxx4-4.3.0/cxx4/test_type.cpp2018/03/21 16:54:10 1.1
+++ netcdf-cxx4-4.3.0/cxx4/test_type.cpp2018/03/21 17:14:40
@@ -288,9 +288,9 @@
cout <<"--- passed\n";
cout <
commit netcdf-cxx4 for openSUSE:Factory
Hello community,
here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory
checked in at 2018-02-21 14:10:52
Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old)
and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New)
Package is "netcdf-cxx4"
Wed Feb 21 14:10:52 2018 rev:8 rq:574726 version:4.3.0
Changes:
--- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2018-01-09
14:54:16.280769591 +0100
+++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes
2018-02-21 14:10:54.399409852 +0100
@@ -1,0 +2,5 @@
+Fri Feb 9 15:19:10 UTC 2018 - e...@suse.com
+
+- Fix summary in module files (bnc#1080259).
+
+---
Other differences:
--
++ netcdf-cxx4.spec ++
--- /var/tmp/diff_new_pack.XUMCOc/_old 2018-02-21 14:10:55.451371970 +0100
+++ /var/tmp/diff_new_pack.XUMCOc/_new 2018-02-21 14:10:55.455371826 +0100
@@ -201,7 +201,7 @@
module-whatis "Name: %{hpc_upcase %pname} built with %{compiler_family}
toolchain"
module-whatis "Version: %{version}"
module-whatis "Category: runtime library"
-module-whatis "Description: %{summary}"
+module-whatis "Description: %{SUMMARY:0}"
module-whatis "%{url}"
# Require generic netcdf
commit netcdf-cxx4 for openSUSE:Factory
Hello community,
here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory
checked in at 2018-01-09 14:54:15
Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old)
and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New)
Package is "netcdf-cxx4"
Tue Jan 9 14:54:15 2018 rev:7 rq:562357 version:4.3.0
Changes:
--- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2017-11-21
15:33:21.635060969 +0100
+++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes
2018-01-09 14:54:16.280769591 +0100
@@ -1,0 +2,6 @@
+Fri Jan 5 19:14:07 UTC 2018 - e...@suse.com
+
+- Switch from gcc6 to gcc7 as additional compiler flavor for HPC on SLES.
+- Fix library package requires - use HPC macro (boo#1074890).
+
+---
Other differences:
--
++ netcdf-cxx4.spec ++
--- /var/tmp/diff_new_pack.W1n2hL/_old 2018-01-09 14:54:16.928739215 +0100
+++ /var/tmp/diff_new_pack.W1n2hL/_new 2018-01-09 14:54:16.928739215 +0100
@@ -1,7 +1,7 @@
#
# spec file for package netcdf
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -37,10 +37,10 @@
%bcond_without hpc
%endif
-%if "%flavor" == "gnu6-hpc"
+%if "%flavor" == "gnu7-hpc"
%global compiler_family gnu
%bcond_without hpc
-%define c_f_ver 6
+%define c_f_ver 7
%endif
%define hpc_upcase_trans_hyph() %(echo %{**} | tr [a-z] [A-Z] | tr '-' '_')
@@ -109,7 +109,6 @@
%else
%hpc_requires
Requires: libnetcdf-%{compiler_family}%{?c_f_ver}-hpc
-Requires: lua-lmod
%endif
%description -n %{libname -s %{sover} -l %_ver}
commit netcdf-cxx4 for openSUSE:Factory
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-pathMANPATH %{hpc_mandir}
prepend-pathLD_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-pathLIBRARY_PATH%{hpc_libdir}
prepend-pathCPATH %{hpc_includedir}
@@ -227,8 +231,8 @@
prepend-pathINCLUDE %{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
commit netcdf-cxx4 for openSUSE:Factory
Hello community,
here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory
checked in at 2017-11-13 14:04:41
Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old)
and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New)
Package is "netcdf-cxx4"
Mon Nov 13 14:04:41 2017 rev:5 rq:541144 version:4.3.0
Changes:
--- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2017-10-31
15:44:38.032395407 +0100
+++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes
2017-11-13 14:06:37.160671811 +0100
@@ -1,0 +2,6 @@
+Fri Nov 10 16:14:47 UTC 2017 - e...@suse.com
+
+- Add Requires: for the netcdf library/devel package to the
+ netcdf-cxx4 library/devel package for HPC.
+
+---
Other differences:
--
++ netcdf-cxx4.spec ++
--- /var/tmp/diff_new_pack.3uKHMO/_old 2017-11-13 14:06:38.588620441 +0100
+++ /var/tmp/diff_new_pack.3uKHMO/_new 2017-11-13 14:06:38.592620297 +0100
@@ -101,8 +101,12 @@
%package -n %{libname -s %{sover} -l %_ver}
Summary:C++ library for the Unidata network Common Data Form version 4
Group: System/Libraries
-%{!?with_hpc:Provides:
libnetcdf%{sover}:%{p_libdir}/libnetcdf_c++.so.%{sover}}
-%{?with_hpc:%hpc_requires}
+%if %{without hpc}
+Provides: libnetcdf%{sover}:%{p_libdir}/libnetcdf_c++.so.%{sover}
+%else
+%hpc_requires
+Requires: libnetcdf-%{compiler_family}%{?c_f_ver}-hpc
+%endif
%description -n %{libname -s %{sover} -l %_ver}
NetCDF4 (network Common Data Form) is a set of software libraries and
@@ -118,6 +122,8 @@
Group: Development/Libraries/C and C++
%if %{without hpc}
Provides: libnetcdf-devel:%{_libdir}/libnetcdf_c++.so
+%else
+Requires: netcdf-%{compiler_family}%{?c_f_ver}-hpc-devel
%endif
Requires: %{libname -s %{sover} -l %_ver} = %{version}
commit netcdf-cxx4 for openSUSE:Factory
Hello community,
here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory
checked in at 2017-10-31 15:44:36
Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old)
and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New)
Package is "netcdf-cxx4"
Tue Oct 31 15:44:36 2017 rev:4 rq:537746 version:4.3.0
Changes:
--- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2017-10-26
18:44:27.455745481 +0200
+++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes
2017-10-31 15:44:38.032395407 +0100
@@ -1,0 +2,5 @@
+Mon Oct 30 10:44:06 UTC 2017 - e...@suse.com
+
+- Add and fix 'standard' build.
+
+---
Other differences:
--
++ netcdf-cxx4.spec ++
--- /var/tmp/diff_new_pack.JJxyql/_old 2017-10-31 15:44:38.500378443 +0100
+++ /var/tmp/diff_new_pack.JJxyql/_new 2017-10-31 15:44:38.500378443 +0100
@@ -28,7 +28,7 @@
%endif
%if "%flavor" == "standard"
-%undefine compiler_family gnu
+%undefine compiler_family
%bcond_with hpc
%endif
@@ -52,10 +52,10 @@
%define p_includedir %hpc_includedir
%else
%define package_name %pname
-%define libname(s:) libnetcdf_c++4%{?-s:-%{-s*}}}
+%define libname(s:l:) libnetcdf_c++4%{?-s:-%{-s*}}
%define p_bindir %_bindir
%define p_libdir %_libdir
-%define p_includedir %hpc_includedir
+%define p_includedir %_includedir
%endif
Name: %{package_name}
++ _multibuild ++
--- /var/tmp/diff_new_pack.JJxyql/_old 2017-10-31 15:44:38.532377283 +0100
+++ /var/tmp/diff_new_pack.JJxyql/_new 2017-10-31 15:44:38.536377138 +0100
@@ -1,3 +1,4 @@
+ standard
gnu-hpc
commit netcdf-cxx4 for openSUSE:Factory
Hello community,
here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory
checked in at 2017-10-26 18:44:26
Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old)
and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New)
Package is "netcdf-cxx4"
Thu Oct 26 18:44:26 2017 rev:3 rq:536566 version:4.3.0
Changes:
--- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2016-09-30
15:32:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes
2017-10-26 18:44:27.455745481 +0200
@@ -1,0 +2,21 @@
+Wed Oct 25 15:03:05 UTC 2017 - e...@suse.com
+
+- Fix Requires for the devel package.
+
+---
+Mon Oct 23 05:52:26 UTC 2017 - e...@suse.com
+
+- Fix buildrequires for compiler_families where c_f_ver is set.
+
+---
+Sat Oct 14 17:20:49 UTC 2017 - e...@suse.com
+
+- Add static library package.
+
+---
+Mon Aug 28 10:46:29 UTC 2017 - e...@suse.com
+
+- Make package multibuild aware and add support for HPC environment
+ modules (FATE#321719).
+
+---
New:
_multibuild
Other differences:
--
++ netcdf-cxx4.spec ++
--- /var/tmp/diff_new_pack.WD2L5T/_old 2017-10-26 18:44:28.159712626 +0200
+++ /var/tmp/diff_new_pack.WD2L5T/_new 2017-10-26 18:44:28.167712252 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package netcdf-cxx4
+# spec file for package netcdf
#
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -16,19 +16,66 @@
#
+%global flavor @BUILD_FLAVOR@%{nil}
+
+%global pname netcdf-cxx4
+%global ver 4.3.0
+%global _ver 4_3_0
%define sover 1
-Name: netcdf-cxx4
-Version:4.3.0
+%if "%flavor" == ""
+ExclusiveArch: do_not_build
+%endif
+
+%if "%flavor" == "standard"
+%undefine compiler_family gnu
+%bcond_with hpc
+%endif
+
+%if "%flavor" == "gnu-hpc"
+%global compiler_family gnu
+%bcond_without hpc
+%endif
+
+%if "%flavor" == "gnu6-hpc"
+%global compiler_family gnu
+%bcond_without hpc
+%define c_f_ver 6
+%endif
+
+%if %{with hpc}
+%{hpc_init -c %{compiler_family} %{?c_f_ver:-v %{c_f_ver}}}
+%define package_name %{hpc_package_name %_ver}
+%define libname(s:l:) lib%{pname}%{hpc_package_name_tail %{?-l:%{-l*}}}
+%define p_bindir %hpc_bindir
+%define p_libdir %hpc_libdir
+%define p_includedir %hpc_includedir
+%else
+%define package_name %pname
+%define libname(s:) libnetcdf_c++4%{?-s:-%{-s*}}}
+%define p_bindir %_bindir
+%define p_libdir %_libdir
+%define p_includedir %hpc_includedir
+%endif
+
+Name: %{package_name}
+Version:%ver
Release:0
Summary:C++ library for the Unidata network Common Data Form version 4
License:NetCDF
Group: Productivity/Scientific/Other
Url:http://www.unidata.ucar.edu/software/netcdf/
Source0:
http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-cxx4-%{version}.tar.gz
+%if %{without hpc}
BuildRequires: gcc-c++
-BuildRequires: pkgconfig(netcdf)
BuildRequires: pkg-config
+BuildRequires: pkgconfig(netcdf)
+%else
+BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
+BuildRequires: lua-lmod
+BuildRequires: netcdf-%{compiler_family}%{?c_f_ver}-hpc-devel
+BuildRequires: suse-hpc
+%endif
%description
NetCDF4 (network Common Data Form) is a set of software libraries and
@@ -49,63 +96,180 @@
This package provides tools for working with the C++ API.
+%{?with_hpc:%{hpc_master_package tools}}
-%package -n libnetcdf_c++4-%{sover}
+%package -n %{libname -s %{sover} -l %_ver}
Summary:C++ library for the Unidata network Common Data Form version 4
Group: System/Libraries
-Provides: libnetcdf%{sover}:%{_libdir}/libnetcdf_c++.so.%{sover}
+%{!?with_hpc:Provides:
libnetcdf%{sover}:%{p_libdir}/libnetcdf_c++.so.%{sover}}
+%{?with_hpc:%hpc_requires}
-%description -n libnetcdf_c++4-%{sover}
+%description -n %{libname -s %{sover} -l %_ver}
NetCDF4 (network Common Data Form) is a set of software libraries and
machine-independent data formats that support the creation, access, and sharing
of array-oriented scientific data.
This package provides the C++ API.
-%package -n libnetcdf_c++4-devel
+%{?with_hpc:%{hpc_master_package -n %{libname} -L -l}}
+
+%package -n %{libname -l %_ver}-devel
Summary:Development files for netcdf_c++
Group:
commit netcdf-cxx4 for openSUSE:Factory
Hello community,
here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory
checked in at 2016-09-30 15:32:47
Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old)
and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New)
Package is "netcdf-cxx4"
Changes:
--- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2016-09-20
13:25:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes
2016-09-30 15:32:52.0 +0200
@@ -1,0 +2,6 @@
+Mon Jul 25 13:10:20 UTC 2016 - jeng...@inai.de
+
+- Summary/RPM group update.
+- Rename soname macro because it really just contains the version.
+
+---
Other differences:
--
++ netcdf-cxx4.spec ++
--- /var/tmp/diff_new_pack.fOSEGA/_old 2016-09-30 15:32:54.0 +0200
+++ /var/tmp/diff_new_pack.fOSEGA/_new 2016-09-30 15:32:54.0 +0200
@@ -16,14 +16,14 @@
#
-%define soname 1
+%define sover 1
Name: netcdf-cxx4
Version:4.3.0
Release:0
Summary:C++ library for the Unidata network Common Data Form version 4
License:NetCDF
-Group: System/Libraries
+Group: Productivity/Scientific/Other
Url:http://www.unidata.ucar.edu/software/netcdf/
Source0:
http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-cxx4-%{version}.tar.gz
BuildRequires: gcc-c++
@@ -50,12 +50,12 @@
This package provides tools for working with the C++ API.
-%package -n libnetcdf_c++4-%{soname}
-Summary:C++ library for for the Unidata network Common Data Form
version 4
+%package -n libnetcdf_c++4-%{sover}
+Summary:C++ library for the Unidata network Common Data Form version 4
Group: System/Libraries
-Provides: libnetcdf%{soname}:%{_libdir}/libnetcdf_c++.so.%{soname}
+Provides: libnetcdf%{sover}:%{_libdir}/libnetcdf_c++.so.%{sover}
-%description -n libnetcdf_c++4-%{soname}
+%description -n libnetcdf_c++4-%{sover}
NetCDF4 (network Common Data Form) is a set of software libraries and
machine-independent data formats that support the creation, access, and sharing
of array-oriented scientific data.
@@ -65,7 +65,7 @@
%package -n libnetcdf_c++4-devel
Summary:Development files for netcdf_c++
Group: Development/Libraries/C and C++
-Requires: libnetcdf_c++4-%{soname} = %{version}
+Requires: libnetcdf_c++4-%{sover} = %{version}
Provides: libnetcdf-devel:%{_libdir}/libnetcdf_c++.so
%description -n libnetcdf_c++4-devel
@@ -85,20 +85,20 @@
%check
make check
-%post -n libnetcdf_c++4-%{soname} -p /sbin/ldconfig
+%post -n libnetcdf_c++4-%{sover} -p /sbin/ldconfig
-%postun -n libnetcdf_c++4-%{soname} -p /sbin/ldconfig
+%postun -n libnetcdf_c++4-%{sover} -p /sbin/ldconfig
%files tools
%defattr(-,root,root)
%doc COPYRIGHT
%{_bindir}/ncxx4-config
-%files -n libnetcdf_c++4-%{soname}
+%files -n libnetcdf_c++4-%{sover}
%defattr(-,root,root)
%doc COPYRIGHT
-%{_libdir}/libnetcdf_c++4.so.%{soname}
-%{_libdir}/libnetcdf_c++4.so.%{soname}.*
+%{_libdir}/libnetcdf_c++4.so.%{sover}
+%{_libdir}/libnetcdf_c++4.so.%{sover}.*
%files -n libnetcdf_c++4-devel
%defattr(-,root,root)
