Hello community,
here is the log from the commit of package netcdf for openSUSE:Factory checked
in at 2015-11-26 17:04:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/netcdf (Old)
and /work/SRC/openSUSE:Factory/.netcdf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf"
Changes:
--------
--- /work/SRC/openSUSE:Factory/netcdf/netcdf.changes 2015-08-27
08:57:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.netcdf.new/netcdf.changes 2015-11-26
17:04:23.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Nov 21 20:05:32 UTC 2015 - sco...@free.fr
+
+- install netcdf_par.h which is skipped when mpicc in not detected
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netcdf.spec ++++++
--- /var/tmp/diff_new_pack.Kb5A29/_old 2015-11-26 17:04:24.000000000 +0100
+++ /var/tmp/diff_new_pack.Kb5A29/_new 2015-11-26 17:04:24.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package netcdf
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,7 +16,6 @@
#
-
%if 0%{?sles_version}
%define _mvapich2 1
%endif
@@ -50,34 +49,34 @@
BuildRequires: gcc-fortran
BuildRequires: hdf-devel
BuildRequires: hdf5-devel >= 1.8.8
+BuildRequires: libcurl-devel >= 7.18.0
BuildRequires: libhdf
BuildRequires: libhdf5
BuildRequires: libhdf5_hl
-BuildRequires: libcurl-devel >= 7.18.0
BuildRequires: pkg-config
BuildRequires: zlib-devel >= 1.2.5
%ifarch %ix86 x86_64 ppc ppc64 s390x armv7l
BuildRequires: valgrind
%endif
%if 0%{?_openmpi}
-BuildRequires: openmpi-devel
BuildRequires: hdf-openmpi-devel
BuildRequires: hdf5-openmpi-devel
-BuildRequires: parallel-netcdf-openmpi-devel
BuildRequires: libhdf-openmpi
BuildRequires: libhdf5-openmpi
BuildRequires: libhdf5_hl-openmpi
BuildRequires: libpnetcdf-openmpi
+BuildRequires: openmpi-devel
+BuildRequires: parallel-netcdf-openmpi-devel
%endif
%if 0%{?_mvapich2}
-BuildRequires: mvapich2-devel
BuildRequires: hdf-mvapich2-devel
BuildRequires: hdf5-mvapich2-devel
-BuildRequires: parallel-netcdf-mvapich2-devel
BuildRequires: libhdf-mvapich2
BuildRequires: libhdf5-mvapich2
BuildRequires: libhdf5_hl-mvapich2
BuildRequires: libpnetcdf-mvapich2
+BuildRequires: mvapich2-devel
+BuildRequires: parallel-netcdf-mvapich2-devel
%endif
Requires: %{libname}%{sonum} = %{version}
@@ -366,8 +365,8 @@
Requires: hdf-devel
Requires: hdf5-devel >= 1.8.8
Requires: libcurl-devel >= 7.18.0
-Requires: zlib-devel >= 1.2.5
Requires: pkgconfig
+Requires: zlib-devel >= 1.2.5
%description devel
NetCDF is a set of software libraries and self-describing,
@@ -408,11 +407,11 @@
Requires: %{name}-devel-data = %{version}
Requires: hdf-openmpi-devel
Requires: hdf5-openmpi-devel >= 1.8.8
-Requires: parallel-netcdf-openmpi-devel
Requires: libcurl-devel >= 7.18.0
-Requires: zlib-devel >= 1.2.5
Requires: openmpi-devel
+Requires: parallel-netcdf-openmpi-devel
Requires: pkgconfig
+Requires: zlib-devel >= 1.2.5
%description openmpi-devel
NetCDF is a set of software libraries and self-describing,
@@ -454,11 +453,11 @@
Requires: %{name}-devel-data = %{version}
Requires: hdf-mvapich2-devel
Requires: hdf5-mvapich2-devel >= 1.8.8
-Requires: parallel-netcdf-mvapich2-devel
Requires: libcurl-devel >= 7.18.0
-Requires: zlib-devel >= 1.2.5
Requires: mvapich2-devel
+Requires: parallel-netcdf-mvapich2-devel
Requires: pkgconfig
+Requires: zlib-devel >= 1.2.5
%description mvapich2-devel
NetCDF is a set of software libraries and self-describing,
@@ -496,11 +495,11 @@
%package devel-static
Summary: Static development files for %{name}
Group: Development/Libraries/C and C++
+Requires: %{name}-devel = %{version}
Requires: hdf-devel
Requires: hdf5-devel >= 1.8.8
Requires: libcurl-devel >= 7.18.0
Requires: zlib-devel >= 1.2.5
-Requires: %{name}-devel = %{version}
%description devel-static
NetCDF is a set of software libraries and self-describing,
@@ -650,7 +649,6 @@
popd
done
-
%install
for build_dir in build; do
# for build_dir in %_mpi build; do
@@ -661,6 +659,9 @@
install -m644 %{S:1} %{buildroot}%{_mandir}/man1
rm -f %{buildroot}%{_libdir}/*.la
+# install netcdf_par.h which is skipped when mpicc in not detected
+install -m644 include/netcdf_par.h %{buildroot}%{_includedir}/netcdf_par.h
+
# rpm macro for version checking
mkdir -p %{buildroot}%{_sysconfdir}/rpm
cat > %{buildroot}%{_sysconfdir}/rpm/macros.netcdf <<EOF
