diff --git a/netcdf.spec b/netcdf.spec index a1f0006..d592dbe 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -18,6 +18,9 @@ BuildRequires: valgrind Summary: Development files for netcdf Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: gcc-gfortran%{_isa} +Requires: pkgconfig + %package static Summary: Static libs for netcdf @@ -70,13 +73,9 @@ This package contains the netCDF static libs. %build -export FFLAGS="-fPIC ${RPM_OPT_FLAGS}" -export FCFLAGS="$FFLAGS" -%configure CPPFLAGS=-I%{_includedir}/hdf \ - LDFLAGS=-L%{_libdir}/hdf \ - --enable-shared \ +%configure --enable-shared \ --enable-extra-example-tests \ - --enable-valgrind-tests \ + --enable-valgrind-tests # parallel build is broken, .mod file hasn't right deps %%{?_smp_mflags} make %{?_smp_mflags} @@ -92,6 +91,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir} /bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la /bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir +#New with 4.0.1, and not multi-lib compatible +/bin/rm -f ${RPM_BUILD_ROOT}%{_bindir}/nc-config + %check make check @@ -117,7 +119,8 @@ fi %files %defattr(-,root,root,-) %doc COPYRIGHT README -%{_bindir}/* +%{_bindir}/ncdump +%{_bindir}/ncgen %{_libdir}/*.so.* %{_mandir}/man1/* %{_infodir}/* @@ -136,6 +139,10 @@ fi %changelog +* Tue Oct 27 2009 Orion Poplawski - 4.0.1-2 +- Don't ship multi-lib incompatible nc-config +- Require gcc-gfortran for -devel (bug #483469) + * Mon Sep 28 2009 Orion Poplawski - 4.0.1-1 - Update to 4.0.1 - Fix up URL and Source urls