Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0

This commit is contained in:
Deji Akingunola 2013-07-24 14:28:01 -04:00
parent a14093229a
commit 08dc5d3fec
1 changed files with 51 additions and 41 deletions

View File

@ -1,6 +1,6 @@
Name: netcdf Name: netcdf
Version: 4.2.1.1 Version: 4.2.1.1
Release: 4%{?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
@ -26,12 +26,12 @@ BuildRequires: valgrind
BuildRequires: openssh-clients BuildRequires: openssh-clients
Requires: hdf5 = %{_hdf5_version} Requires: hdf5 = %{_hdf5_version}
%global with_mpich2 1 %global with_mpich 1
%global with_openmpi 1 %global with_openmpi 1
%if 0%{?rhel} %if 0%{?rhel}
%ifarch ppc64 %ifarch ppc64
# No mpich2 on ppc64 in EL # No mpich2 on ppc64 in EL
%global with_mpich2 0 %global with_mpich 0
%endif %endif
%endif %endif
%ifarch s390 s390x %ifarch s390 s390x
@ -39,8 +39,8 @@ Requires: hdf5 = %{_hdf5_version}
%global with_openmpi 0 %global with_openmpi 0
%endif %endif
%if %{with_mpich2} %if %{with_mpich}
%global mpi_list mpich2 %global mpi_list mpich
%endif %endif
%if %{with_openmpi} %if %{with_openmpi}
%global mpi_list %{?mpi_list} openmpi %global mpi_list %{?mpi_list} openmpi
@ -100,38 +100,44 @@ Requires: %{name} = %{version}-%{release}
This package contains the netCDF C static libs. This package contains the netCDF C static libs.
%if %{with_mpich2} %if %{with_mpich}
%package mpich2 %package mpich
Summary: NetCDF mpich2 libraries Summary: NetCDF mpich libraries
Group: Development/Libraries Group: Development/Libraries
Requires: mpich2 Requires: mpich
BuildRequires: mpich2-devel BuildRequires: mpich-devel
BuildRequires: hdf5-mpich2-devel >= 1.8.4 BuildRequires: hdf5-mpich-devel >= 1.8.4
Provides: %{name}-mpich2 = %{version}-%{release}
Obsoletes: %{name}-mpich2 < 4.2.1.1-5
%description mpich2 %description mpich
NetCDF parallel mpich2 libraries NetCDF parallel mpich libraries
%package mpich2-devel %package mpich-devel
Summary: NetCDF mpich2 development files Summary: NetCDF mpich development files
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-mpich2%{?_isa} = %{version}-%{release} Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
Requires: mpich2 Requires: mpich
Requires: pkgconfig Requires: pkgconfig
Requires: hdf5-mpich2-devel Requires: hdf5-mpich-devel
Requires: libcurl-devel Requires: libcurl-devel
Provides: %{name}-mpich2-devel = %{version}-%{release}
Obsoletes: %{name}-mpich2-devel < 4.2.1.1-5
%description mpich2-devel %description mpich-devel
NetCDF parallel mpich2 development files NetCDF parallel mpich development files
%package mpich2-static %package mpich-static
Summary: NetCDF mpich2 static libraries Summary: NetCDF mpich static libraries
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-mpich2-devel%{?_isa} = %{version}-%{release} Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release}
Provides: %{name}-mpich2-static = %{version}-%{release}
Obsoletes: %{name}-mpich2-static < 4.2.1.1-5
%description mpich2-static %description mpich-static
NetCDF parallel mpich2 static libraries NetCDF parallel mpich static libraries
%endif %endif
@ -276,25 +282,25 @@ rm -rf ${RPM_BUILD_ROOT}
%files static %files static
%{_libdir}/*.a %{_libdir}/*.a
%if %{with_mpich2} %if %{with_mpich}
%files mpich2 %files mpich
%doc COPYRIGHT README %doc COPYRIGHT README
%{_libdir}/mpich2/bin/nccopy %{_libdir}/mpich/bin/nccopy
%{_libdir}/mpich2/bin/ncdump %{_libdir}/mpich/bin/ncdump
%{_libdir}/mpich2/bin/ncgen %{_libdir}/mpich/bin/ncgen
%{_libdir}/mpich2/bin/ncgen3 %{_libdir}/mpich/bin/ncgen3
%{_libdir}/mpich2/lib/*.so.* %{_libdir}/mpich/lib/*.so.*
%doc %{_libdir}/mpich2/share/man/man1/*.1* %doc %{_libdir}/mpich/share/man/man1/*.1*
%files mpich2-devel %files mpich-devel
%{_libdir}/mpich2/bin/nc-config %{_libdir}/mpich/bin/nc-config
%{_includedir}/mpich2-%{_arch} %{_includedir}/mpich-%{_arch}
%{_libdir}/mpich2/lib/*.so %{_libdir}/mpich/lib/*.so
%{_libdir}/mpich2/lib/pkgconfig/%{name}.pc %{_libdir}/mpich/lib/pkgconfig/%{name}.pc
%doc %{_libdir}/mpich2/share/man/man3/*.3* %doc %{_libdir}/mpich/share/man/man3/*.3*
%files mpich2-static %files mpich-static
%{_libdir}/mpich2/lib/*.a %{_libdir}/mpich/lib/*.a
%endif %endif
%if %{with_openmpi} %if %{with_openmpi}
@ -320,6 +326,10 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog %changelog
* Wed Jul 24 2013 Deji Akingunola <dakingun@gmail.com> - 4.2.1.1-5
- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1.1-4 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild