Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
Dan Horák | 24825afacf | |
Orion Poplawski | 3f81bc4bfd | |
Orion Poplawski | 52b0c066ca |
14
netcdf.spec
14
netcdf.spec
|
@ -1,6 +1,6 @@
|
|||
Name: netcdf
|
||||
Version: 4.1.3
|
||||
Release: 3%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Summary: Libraries for the Unidata network Common Data Form
|
||||
|
||||
Group: Applications/Engineering
|
||||
|
@ -242,7 +242,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
|
|||
/bin/mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod \
|
||||
${RPM_BUILD_ROOT}%{_fmoddir}
|
||||
/bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
|
||||
/bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
|
||||
for mpi in %{mpi_list}
|
||||
do
|
||||
module load $mpi-%{_arch}
|
||||
|
@ -250,11 +249,12 @@ do
|
|||
rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la
|
||||
module purge
|
||||
done
|
||||
/bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
|
||||
|
||||
|
||||
%check
|
||||
make -C build check
|
||||
for mpi in mpich2 openmpi
|
||||
for mpi in %{mpi_list}
|
||||
do
|
||||
module load $mpi-%{_arch}
|
||||
make -C $mpi check
|
||||
|
@ -287,7 +287,7 @@ fi
|
|||
%{_bindir}/ncgen3
|
||||
%{_libdir}/*.so.*
|
||||
%{_mandir}/man1/*
|
||||
%{_infodir}/*
|
||||
%{_infodir}/%{name}*.info*
|
||||
|
||||
%files devel
|
||||
%{_bindir}/nc-config
|
||||
|
@ -348,6 +348,12 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Mar 20 2012 Dan Horák <dan[at]danny.cz> - 4.1.3-5
|
||||
- use %%{mpi_list} also in %%check
|
||||
|
||||
* Sun Feb 12 2012 Orion Poplawski <orion@cora.nwra.com> - 4.1.3-4
|
||||
- Remove info conflict (bug 789661)
|
||||
|
||||
* Wed Feb 1 2012 Orion Poplawski <orion@cora.nwra.com> - 4.1.3-3
|
||||
- Enable MPI builds
|
||||
|
||||
|
|
Loading…
Reference in New Issue