Untabify, fix Provides

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-12-01 15:59:32 -05:00
parent d1255a163e
commit f9b43d3d69

View File

@ -1,33 +1,33 @@
Summary: A high-performance implementation of MPI Summary: A high-performance implementation of MPI
Name: mpich Name: mpich
Version: 3.2 Version: 3.2
Release: 1%{?dist} Release: 1%{?dist}
License: MIT License: MIT
Group: Development/Libraries Group: Development/Libraries
URL: http://www.mpich.org/ URL: http://www.mpich.org/
Source0: http://www.mpich.org/static/downloads/%{version}/%{name}-%{version}.tar.gz Source0: http://www.mpich.org/static/downloads/%{version}/%{name}-%{version}.tar.gz
Source1: mpich.macros Source1: mpich.macros
Source2: mpich.pth.py2 Source2: mpich.pth.py2
Source3: mpich.pth.py3 Source3: mpich.pth.py3
Patch0: mpich-modules.patch Patch0: mpich-modules.patch
Patch1: https://trac.mpich.org/projects/mpich/raw-attachment/ticket/2299/0001-pm-remshell-include-MPL-when-linking.patch Patch1: https://trac.mpich.org/projects/mpich/raw-attachment/ticket/2299/0001-pm-remshell-include-MPL-when-linking.patch
Patch2: 0002-pm-gforker-include-MPL-when-linking.patch Patch2: 0002-pm-gforker-include-MPL-when-linking.patch
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
BuildRequires: hwloc-devel >= 1.8 BuildRequires: hwloc-devel >= 1.8
%ifnarch s390 %ifnarch s390
BuildRequires: valgrind-devel BuildRequires: valgrind-devel
%endif %endif
# For python[23]_sitearch # For python[23]_sitearch
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: rpm-mpi-hooks BuildRequires: rpm-mpi-hooks
BuildRequires: automake BuildRequires: automake
Provides: mpi Provides: mpi
Provides: mpich2 = 3.0.1 Provides: mpich2 = %{version}
Obsoletes: mpich2 < 3.0 Obsoletes: mpich2 < 3.0
Requires: environment(modules) Requires: environment(modules)
%description %description
MPICH is a high-performance and widely portable implementation of the Message MPICH is a high-performance and widely portable implementation of the Message
@ -51,36 +51,36 @@ If you want MPICH support to be automatically loaded, you need to install the
mpich-autoload package. mpich-autoload package.
%package autoload %package autoload
Summary: Load mpich automatically into profile Summary: Load mpich automatically into profile
Group: System Environment/Base Group: System Environment/Base
Requires: mpich = %{version}-%{release} Requires: mpich = %{version}-%{release}
Provides: mpich2-autoload = 3.0.1 Provides: mpich2-autoload = 3.0.1
Obsoletes: mpich2-autoload < 3.0 Obsoletes: mpich2-autoload < 3.0
%description autoload %description autoload
This package contains profile files that make mpich automatically loaded. This package contains profile files that make mpich automatically loaded.
%package devel %package devel
Summary: Development files for mpich Summary: Development files for mpich
Group: Development/Libraries Group: Development/Libraries
Provides: %{name}-devel-static = %{version}-%{release} Provides: %{name}-devel-static = %{version}-%{release}
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: pkgconfig Requires: pkgconfig
Requires: gcc-gfortran Requires: gcc-gfortran
Requires: rpm-mpi-hooks Requires: rpm-mpi-hooks
Provides: mpich2-devel = 3.0.1 Provides: mpich2-devel = 3.0.1
Obsoletes: mpich2-devel < 3.0 Obsoletes: mpich2-devel < 3.0
%description devel %description devel
Contains development headers and libraries for mpich Contains development headers and libraries for mpich
%package doc %package doc
Summary: Documentations and examples for mpich Summary: Documentations and examples for mpich
Group: Documentation Group: Documentation
BuildArch: noarch BuildArch: noarch
Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release}
Provides: mpich2-doc = 3.0.1 Provides: mpich2-doc = 3.0.1
Obsoletes: mpich2-doc < 3.0 Obsoletes: mpich2-doc < 3.0
%description doc %description doc
Contains documentations, examples and man-pages for mpich Contains documentations, examples and man-pages for mpich
@ -121,43 +121,43 @@ Contains documentations, examples and man-pages for mpich
%autosetup -p1 %autosetup -p1
%build %build
%configure \ %configure \
--enable-sharedlibs=gcc \ --enable-sharedlibs=gcc \
--enable-shared \ --enable-shared \
--enable-static=no \ --enable-static=no \
--enable-lib-depend \ --enable-lib-depend \
--disable-rpath \ --disable-rpath \
--disable-silent-rules \ --disable-silent-rules \
--enable-fc \ --enable-fc \
--with-device=%{selected_channels} \ --with-device=%{selected_channels} \
--with-pm=hydra:gforker \ --with-pm=hydra:gforker \
--includedir=%{_includedir}/%{name}-%{_arch} \ --includedir=%{_includedir}/%{name}-%{_arch} \
--bindir=%{_libdir}/%{name}/bin \ --bindir=%{_libdir}/%{name}/bin \
--libdir=%{_libdir}/%{name}/lib \ --libdir=%{_libdir}/%{name}/lib \
--datadir=%{_datadir}/%{name} \ --datadir=%{_datadir}/%{name} \
--mandir=%{_mandir}/%{name}-%{_arch} \ --mandir=%{_mandir}/%{name}-%{_arch} \
--docdir=%{_datadir}/%{name}/doc \ --docdir=%{_datadir}/%{name}/doc \
--htmldir=%{_datadir}/%{name}/doc \ --htmldir=%{_datadir}/%{name}/doc \
--with-hwloc-prefix=system \ --with-hwloc-prefix=system \
FC=%{opt_fc} \ FC=%{opt_fc} \
F77=%{opt_f77} \ F77=%{opt_f77} \
CFLAGS="%{m_option} -O2 %{?XFLAGS}" \ CFLAGS="%{m_option} -O2 %{?XFLAGS}" \
CXXFLAGS="%{m_option} -O2 %{?XFLAGS}" \ CXXFLAGS="%{m_option} -O2 %{?XFLAGS}" \
FCFLAGS="%{m_option} -O2 %{?XFLAGS}" \ FCFLAGS="%{m_option} -O2 %{?XFLAGS}" \
FFLAGS="%{m_option} -O2 %{?XFLAGS}" \ FFLAGS="%{m_option} -O2 %{?XFLAGS}" \
LDFLAGS='-Wl,-z,noexecstack' \ LDFLAGS='-Wl,-z,noexecstack' \
MPICHLIB_CFLAGS="%{?opt_cc_cflags}" \ MPICHLIB_CFLAGS="%{?opt_cc_cflags}" \
MPICHLIB_CXXFLAGS="%{optflags}" \ MPICHLIB_CXXFLAGS="%{optflags}" \
MPICHLIB_FCFLAGS="%{?opt_fc_fflags}" \ MPICHLIB_FCFLAGS="%{?opt_fc_fflags}" \
MPICHLIB_FFLAGS="%{?opt_f77_fflags}" MPICHLIB_FFLAGS="%{?opt_f77_fflags}"
# MPICHLIB_LDFLAGS='-Wl,-z,noexecstack' \ # MPICHLIB_LDFLAGS='-Wl,-z,noexecstack' \
# MPICH_MPICC_FLAGS="%{m_option} -O2 %{?XFLAGS}" \ # MPICH_MPICC_FLAGS="%{m_option} -O2 %{?XFLAGS}" \
# MPICH_MPICXX_FLAGS="%{m_option} -O2 %{?XFLAGS}" \ # MPICH_MPICXX_FLAGS="%{m_option} -O2 %{?XFLAGS}" \
# MPICH_MPIFC_FLAGS="%{m_option} -O2 %{?XFLAGS}" \ # MPICH_MPIFC_FLAGS="%{m_option} -O2 %{?XFLAGS}" \
# MPICH_MPIF77_FLAGS="%{m_option} -O2 %{?XFLAGS}" # MPICH_MPIF77_FLAGS="%{m_option} -O2 %{?XFLAGS}"
# --with-openpa-prefix=embedded \ # --with-openpa-prefix=embedded \
# FCFLAGS="%{?opt_fc_fflags} -I%{_fmoddir}/%{name} %{?XFLAGS}" \ # FCFLAGS="%{?opt_fc_fflags} -I%{_fmoddir}/%{name} %{?XFLAGS}" \
#Try and work around 'unused-direct-shlib-dependency' rpmlint warnning #Try and work around 'unused-direct-shlib-dependency' rpmlint warnning
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
@ -189,7 +189,7 @@ cat >%{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.sh <<EOF
module load mpi/%{name}-%{_arch} module load mpi/%{name}-%{_arch}
EOF EOF
cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.{sh,csh} cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.{sh,csh}
# Install the RPM macros # Install the RPM macros
install -pDm0644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name} install -pDm0644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
@ -301,10 +301,10 @@ make check VERBOSE=1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Sat Jul 20 2013 Deji Akingunola <dakingun@gmail.com> - 3.0.4-3 * Sat Jul 20 2013 Deji Akingunola <dakingun@gmail.com> - 3.0.4-3
- Add proper Provides and Obsoletes for the sub-packages - Add proper Provides and Obsoletes for the sub-packages
* Thu Jul 18 2013 Deji Akingunola <dakingun@gmail.com> - 3.0.4-2 * Thu Jul 18 2013 Deji Akingunola <dakingun@gmail.com> - 3.0.4-2
- Fix some of the rpmlint warnings from package review (BZ #973493) - Fix some of the rpmlint warnings from package review (BZ #973493)
* Wed Jun 12 2013 Deji Akingunola <dakingun@gmail.com> - 3.0.4-1 * Wed Jun 12 2013 Deji Akingunola <dakingun@gmail.com> - 3.0.4-1
- Update to 3.0.4 - Update to 3.0.4