fix merge
This commit is contained in:
commit
211bf20c90
@ -1,6 +1,6 @@
|
|||||||
Name: netcdf
|
Name: netcdf
|
||||||
Version: 4.1.1
|
Version: 4.1.1
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: Libraries for the Unidata network Common Data Form
|
Summary: Libraries for the Unidata network Common Data Form
|
||||||
|
|
||||||
Group: Applications/Engineering
|
Group: Applications/Engineering
|
||||||
@ -18,7 +18,7 @@ BuildRequires: gcc-gfortran, gawk
|
|||||||
BuildRequires: hdf5-devel >= 1.8.4
|
BuildRequires: hdf5-devel >= 1.8.4
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x %{arm}
|
||||||
BuildRequires: valgrind
|
BuildRequires: valgrind
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -165,6 +165,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 11 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 4.1.1-6
|
||||||
|
- Add ARM to valgrind excludes
|
||||||
|
|
||||||
* Mon Dec 6 2010 jspaleta[at]fedoraproject.org - 4.1.1-5
|
* Mon Dec 6 2010 jspaleta[at]fedoraproject.org - 4.1.1-5
|
||||||
- rebuild to match gcc-gfortran versioning information
|
- rebuild to match gcc-gfortran versioning information
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user