Skip to content

Commit

Permalink
netcdf: Autospec creation for version 4.7.3
Browse files Browse the repository at this point in the history
Additional changes:
- Removed a huge unused patch:
  0001-netcdf-Autospec-creation-for-update-from-version-net.patch
- Removed a patch no longer needed:
  disable-remote.patch
- Removed "series" as no patches are needed any more
- Removed no longer valid configuration options:
  WARNING: unrecognized options: --enable-ncgen4, --enable-extra-example-tests
- As the build passes all tests now, modified options.conf with:
  allow_test_failures = false
- Added a "description" file.
  • Loading branch information
jurobystricky committed Nov 25, 2019
1 parent 6aa089d commit effaa42
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 2,224 deletions.
2,167 changes: 0 additions & 2,167 deletions 0001-netcdf-Autospec-creation-for-update-from-version-net.patch

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME := netcdf
URL = https://github.com/Unidata/netcdf-c/archive/v4.7.2/netcdf-c-4.7.2.tar.gz
URL = https://github.com/Unidata/netcdf-c/archive/v4.7.3/netcdf-c-4.7.3.tar.gz
ARCHIVES =

include ../common/Makefile.common
2 changes: 1 addition & 1 deletion buildreq_cache
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
4.7.2
4.7.3
doxygen
graphviz
util-linux
12 changes: 5 additions & 7 deletions configure
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
--enable-shared \
--enable-netcdf-4 \
--enable-dap \
--enable-ncgen4 \
--enable-extra-example-tests \
--disable-dap-remote-tests \
--with-pic \
--enable-shared
--enable-netcdf-4
--enable-dap
--disable-dap-remote-tests
--with-pic
--disable-doxygen
1 change: 1 addition & 0 deletions configure_misses
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Configure miss: whether to fetch some sample HDF4 files from Unidata ftp site to
Configure miss: whether we should attempt to install netcdf-fortran (EXPERIMENTAL)
Configure miss: whether parallel IO tests should be run
Configure miss: whether netCDF-4 logging is enabled
Configure miss: whether dap remote testing should be enabled (default on)
Configure miss: whether dap remote authorization testing should be enabled (default off)
Configure miss: whether the time-consuming dap tests should be enabled (default off)
Configure miss: whether to enable strict null-byte header padding when reading (default off)
Expand Down
5 changes: 5 additions & 0 deletions description
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The Unidata network Common Data Form (netCDF) is an interface for scientific data access
and a freely-distributed software library that provides an implementation of the interface.
The netCDF library also defines a machine-independent format for representing scientific data.
Together, the interface, library, and format support the creation, access, and sharing of
scientific data. The current netCDF software provides C interfaces for applications and data.
15 changes: 0 additions & 15 deletions disable-remote.patch

This file was deleted.

47 changes: 22 additions & 25 deletions netcdf.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
# Generated by: autospec.py
#
Name : netcdf
Version : 4.7.2
Release : 5
URL : https://github.com/Unidata/netcdf-c/archive/v4.7.2/netcdf-c-4.7.2.tar.gz
Source0 : https://github.com/Unidata/netcdf-c/archive/v4.7.2/netcdf-c-4.7.2.tar.gz
Summary : network Common Data Form interface for array-oriented data access and corresponding library
Version : 4.7.3
Release : 10
URL : https://github.com/Unidata/netcdf-c/archive/v4.7.3/netcdf-c-4.7.3.tar.gz
Source0 : https://github.com/Unidata/netcdf-c/archive/v4.7.3/netcdf-c-4.7.3.tar.gz
Summary : NetCDF Client Library for C
Group : Development/Tools
License : BSD-3-Clause
Requires: netcdf-bin = %{version}-%{release}
Expand All @@ -21,12 +21,13 @@ BuildRequires : graphviz
BuildRequires : hdf5-dev
BuildRequires : util-linux
BuildRequires : zlib-dev
Patch1: disable-remote.patch

%description
# Unidata NetCDF
[![Build Status](https://travis-ci.org/Unidata/netcdf-c.svg?branch=master)](https://travis-ci.org/Unidata/netcdf-c)
[![Coverity Scan Build Status](https://scan.coverity.com/projects/157/badge.svg)](https://scan.coverity.com/projects/157)
The Unidata network Common Data Form (netCDF) is an interface for scientific data access
and a freely-distributed software library that provides an implementation of the interface.
The netCDF library also defines a machine-independent format for representing scientific data.
Together, the interface, library, and format support the creation, access, and sharing of
scientific data. The current netCDF software provides C interfaces for applications and data.

%package bin
Summary: bin components for the netcdf package.
Expand All @@ -44,7 +45,6 @@ Requires: netcdf-lib = %{version}-%{release}
Requires: netcdf-bin = %{version}-%{release}
Provides: netcdf-devel = %{version}-%{release}
Requires: netcdf = %{version}-%{release}
Requires: netcdf = %{version}-%{release}

%description dev
dev components for the netcdf package.
Expand Down Expand Up @@ -76,28 +76,25 @@ man components for the netcdf package.


%prep
%setup -q -n netcdf-c-4.7.2
%patch1 -p1
%setup -q -n netcdf-c-4.7.3
cd %{_builddir}/netcdf-c-4.7.3

%build
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C.UTF-8
export SOURCE_DATE_EPOCH=1571852774
# -Werror is for werrorists
export SOURCE_DATE_EPOCH=1574701635
export GCC_IGNORE_WERROR=1
export CFLAGS="$CFLAGS -fno-lto "
export FCFLAGS="$CFLAGS -fno-lto "
export FFLAGS="$CFLAGS -fno-lto "
export CXXFLAGS="$CXXFLAGS -fno-lto "
%configure --disable-static --enable-shared \ \
--enable-netcdf-4 \ \
--enable-dap \ \
--enable-ncgen4 \ \
--enable-extra-example-tests \ \
--disable-dap-remote-tests \ \
--with-pic \ \
%configure --disable-static --enable-shared \
--enable-netcdf-4 \
--enable-dap \
--disable-dap-remote-tests \
--with-pic \
--disable-doxygen
make %{?_smp_mflags}

Expand All @@ -106,13 +103,13 @@ export LANG=C.UTF-8
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
make VERBOSE=1 V=1 %{?_smp_mflags} check || :
make VERBOSE=1 V=1 %{?_smp_mflags} check

%install
export SOURCE_DATE_EPOCH=1571852774
export SOURCE_DATE_EPOCH=1574701635
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/netcdf
cp %{_builddir}/netcdf-c-4.7.2/COPYRIGHT %{buildroot}/usr/share/package-licenses/netcdf/1b45343da188e7ec176d9443c8c3312798532bfc
cp %{_builddir}/netcdf-c-4.7.3/COPYRIGHT %{buildroot}/usr/share/package-licenses/netcdf/1b45343da188e7ec176d9443c8c3312798532bfc
%make_install

%files
Expand Down Expand Up @@ -143,7 +140,7 @@ cp %{_builddir}/netcdf-c-4.7.2/COPYRIGHT %{buildroot}/usr/share/package-licenses
%files lib
%defattr(-,root,root,-)
/usr/lib64/libnetcdf.so.15
/usr/lib64/libnetcdf.so.15.2.0
/usr/lib64/libnetcdf.so.15.2.1

%files license
%defattr(0644,root,root,0755)
Expand Down
4 changes: 2 additions & 2 deletions options.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = netcdf
url = https://github.com/Unidata/netcdf-c/archive/v4.7.2/netcdf-c-4.7.2.tar.gz
url = https://github.com/Unidata/netcdf-c/archive/v4.7.3/netcdf-c-4.7.3.tar.gz
archives =
giturl = https://github.com/Unidata/netcdf-c.git
domain =
Expand All @@ -9,7 +9,7 @@ domain =
# build 32 bit libraries
32bit = false
# allow package to build with test failures
allow_test_failures = true
allow_test_failures = false
# unset %build ld_as_needed variable
asneeded = false
# this package is trusted enough to automatically update (used by other tools)
Expand Down
2 changes: 1 addition & 1 deletion release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5
10
1 change: 0 additions & 1 deletion series

This file was deleted.

4 changes: 2 additions & 2 deletions testresults
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Total : 207
Total : 192
Pass : 192
Fail : 15
Fail : 0
Skip : 0
XFail : 0
2 changes: 1 addition & 1 deletion upstream
Original file line number Diff line number Diff line change
@@ -1 +1 @@
db75244c848f6c3e73a0df12ecc387e061c2ccd7/netcdf-c-4.7.2.tar.gz
a78018c377c843cf7b941c2cdad0190920192179/netcdf-c-4.7.3.tar.gz
2 changes: 1 addition & 1 deletion versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.7.2
4.7.3

0 comments on commit effaa42

Please sign in to comment.