Compare commits

...

3 Commits
master ... f16

Author SHA1 Message Date
Dan Horák
24825afacf use %{mpi_list} also in %check 2012-03-20 09:30:59 +01:00
Orion Poplawski
3f81bc4bfd Find all info files 2012-02-12 16:47:21 -07:00
Orion Poplawski
52b0c066ca Remove info conflict (bug 789661) 2012-02-12 16:22:17 -07:00

View File

@ -1,6 +1,6 @@
Name: netcdf Name: netcdf
Version: 4.1.3 Version: 4.1.3
Release: 3%{?dist} Release: 5%{?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
@ -242,7 +242,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
/bin/mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod \ /bin/mv ${RPM_BUILD_ROOT}%{_includedir}/*.mod \
${RPM_BUILD_ROOT}%{_fmoddir} ${RPM_BUILD_ROOT}%{_fmoddir}
/bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la /bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
/bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
for mpi in %{mpi_list} for mpi in %{mpi_list}
do do
module load $mpi-%{_arch} module load $mpi-%{_arch}
@ -250,11 +249,12 @@ do
rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la
module purge module purge
done done
/bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
%check %check
make -C build check make -C build check
for mpi in mpich2 openmpi for mpi in %{mpi_list}
do do
module load $mpi-%{_arch} module load $mpi-%{_arch}
make -C $mpi check make -C $mpi check
@ -287,7 +287,7 @@ fi
%{_bindir}/ncgen3 %{_bindir}/ncgen3
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_mandir}/man1/* %{_mandir}/man1/*
%{_infodir}/* %{_infodir}/%{name}*.info*
%files devel %files devel
%{_bindir}/nc-config %{_bindir}/nc-config
@ -348,6 +348,12 @@ fi
%changelog %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 * Wed Feb 1 2012 Orion Poplawski <orion@cora.nwra.com> - 4.1.3-3
- Enable MPI builds - Enable MPI builds