- Drop Require: gcc-gfortran for now

This commit is contained in:
Orion Poplawski 2009-11-05 18:57:50 +00:00
parent 52baab4768
commit f507ef7996
1 changed files with 29 additions and 23 deletions

View File

@ -1,6 +1,6 @@
Name: netcdf
Version: 4.0.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Libraries for the Unidata network Common Data Form
Group: Applications/Engineering
@ -12,12 +12,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran, gawk
BuildRequires: hdf5-devel
BuildRequires: valgrind
%package devel
Summary: Development files for netcdf
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gcc-gfortran%{_isa}
#Requires: gcc-gfortran%{_isa}
Requires: pkgconfig
%package static
@ -25,8 +26,8 @@ Summary: Static libs for netcdf
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description
%description
NetCDF (network Common Data Form) is an interface for array-oriented
data access and a freely-distributed collection of software libraries
for C, Fortran, C++, and perl that provides an implementation of the
@ -64,21 +65,20 @@ man pages.
%description static
This package contains the netCDF static libs.
%prep
%setup -q
%patch0 -p1
%build
export FC="gfortran"
export F90="gfortran"
export CPPFLAGS="-fPIC"
export FFLAGS="-fPIC ${RPM_OPT_FLAGS}"
export F90FLAGS="$FFLAGS"
export FCFLAGS="$FFLAGS"
%configure --enable-shared
%configure --enable-shared \
--enable-extra-example-tests \
--enable-valgrind-tests
# parallel build is broken, .mod file hasn't right deps %%{?_smp_mflags}
make
%install
make install DESTDIR=${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/netcdf
@ -92,6 +92,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
#New with 4.0.1, and not multi-lib compatible
/bin/rm -f ${RPM_BUILD_ROOT}%{_bindir}/nc-config
%check
make check
@ -99,6 +100,7 @@ make check
%clean
rm -rf ${RPM_BUILD_ROOT}
%post
/sbin/ldconfig
/sbin/install-info %{_infodir}/netcdf.info \
@ -111,6 +113,7 @@ if [ "$1" = 0 ]; then
%{_infodir}/dir 2>/dev/null || :
fi
%files
%defattr(-,root,root,-)
%doc COPYRIGHT README
@ -134,6 +137,9 @@ fi
%changelog
* Thu Nov 5 2009 Orion Poplawski <orion@cora.nwra.com> - 4.0.1-4
- Drop Require: gcc-gfortran for now
* Fri Oct 23 2009 Orion Poplawski <orion@cora.nwra.com> - 4.0.1-3
- Don't ship multi-lib incompatible nc-config
- Require gcc-gfortran for -devel (bug #483469)