rpms/netcdf/F-12 netcdf.spec,1.39,1.40

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/netcdf/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30436

Modified Files:
	netcdf.spec 
Log Message:
* Thu Nov 5 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-4
- Drop Require: gcc-gfortran for now



Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/F-12/netcdf.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- netcdf.spec	26 Oct 2009 19:15:17 -0000	1.39
+++ netcdf.spec	5 Nov 2009 18:57:50 -0000	1.40
@@ -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}-%{ve
 
 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,18 +26,18 @@ Summary:        Static libs for netcdf
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
-%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 
-interface.  The NetCDF library also defines a machine-independent 
-format for representing scientific data.  Together, the interface, 
-library, and format support the creation, access, and sharing of 
-scientific data. The NetCDF software was developed at the Unidata 
+%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
+interface.  The NetCDF library also defines a machine-independent
+format for representing scientific data.  Together, the interface,
+library, and format support the creation, access, and sharing of
+scientific data. The NetCDF software was developed at the Unidata
 Program Center in Boulder, Colorado.
 
-NetCDF data is: 
+NetCDF data is:
 
    o Self-Describing: A NetCDF file includes information about the
      data it contains.
@@ -58,27 +59,26 @@ NetCDF data is: 
      access the same NetCDF file.
 
 %description devel
-This package contains the netCDF header files, shared devel libs, and 
+This package contains the netCDF header files, shared devel libs, and
 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 at cora.nwra.com> - 4.0.1-4
+- Drop Require: gcc-gfortran for now
+
 * Fri Oct 23 2009 Orion Poplawski <orion at cora.nwra.com> - 4.0.1-3
 - Don't ship multi-lib incompatible nc-config
 - Require gcc-gfortran for -devel (bug #483469)
@@ -213,7 +219,7 @@ fi
 - rebuild for gcc4.1
 
 * Sun Oct 16 2005 Ed Hill <ed at eh3.com> - 3.6.0-8.p1
-- building the library twice (once each for g77 and gfortran) 
+- building the library twice (once each for g77 and gfortran)
   fixes an annoying problem for people who need both compilers
 
 * Fri Sep 29 2005 Ed Hill <ed at eh3.com> - 3.6.0-7.p1
@@ -250,8 +256,8 @@ fi
 
 * Sat Dec  4 2004 Ed Hill <eh3 at mit.edu> - 0:3.6.0beta6-0.fdr.0
 - upgrade to 3.6.0beta6
-- create separate devel package that does *not* depend upon 
-  the non-devel package and put the headers/libs in "netcdf-3" 
+- create separate devel package that does *not* depend upon
+  the non-devel package and put the headers/libs in "netcdf-3"
   subdirs for easy co-existance with upcoming netcdf-4
 
 * Thu Dec  2 2004 Ed Hill <eh3 at mit.edu> - 0:3.5.1-0.fdr.12
@@ -261,7 +267,7 @@ fi
 - headers in /usr/include/netcdf, libs in /usr/lib/netcdf
 
 * Mon Oct  4 2004 Ed Hill <eh3 at mit.edu> - 0:3.5.1-0.fdr.10
-- Put headers in their own directory but leave the libraries in the 
+- Put headers in their own directory but leave the libraries in the
   %%{_libdir} -- there are only two libs and the majority of other
   "*-devel" packages follow this pattern