dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: netcdf
-# $Id$
-NAME := netcdf
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

netcdf.spec

@@ -1,22 +1,26 @@
 Name:           netcdf
-Version:        4.0.0
-Release:        2%{?dist}
+Version:        4.0.1
+Release:        3%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
 License:        NetCDF
-URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.0.tar.gz
+URL:            http://www.unidata.ucar.edu/software/netcdf/
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-%{version}.tar.gz
 Patch0:         netcdf-4.0.0-gcc4.3-cstring.patch
 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:       pkgconfig
+
 
 %package static
 Summary:        Static libs for netcdf
@@ -25,16 +29,16 @@ 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 
+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.
@@ -56,26 +60,25 @@ 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 -n netcdf-4.0
+%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
+make %{?_smp_mflags}
+
 
 %install
 make install DESTDIR=${RPM_BUILD_ROOT}
@@ -88,6 +91,10 @@ 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
 
@@ -95,6 +102,7 @@ make check
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+
 %post
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/netcdf.info \
@@ -107,10 +115,12 @@ if [ "$1" = 0 ]; then
     %{_infodir}/dir 2>/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT README
-%{_bindir}/*
+%{_bindir}/ncdump
+%{_bindir}/ncgen
 %{_libdir}/*.so.*
 %{_mandir}/man1/*
 %{_infodir}/*
@@ -120,6 +130,7 @@ fi
 %{_includedir}/netcdf
 %{_fmoddir}/*.mod
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/netcdf.pc
 %{_mandir}/man3/*
 
 %files static
@@ -128,6 +139,20 @@ fi
 
 
 %changelog
+* Thu Nov 5 2009 Orion Poplawski <orion@cora.nwra.com> - 4.0.1-3
+- Drop Require: gcc-gfortran for now
+
+* Tue Oct 27 2009 Orion Poplawski <orion@cora.nwra.com> - 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 <orion@cora.nwra.com> - 4.0.1-1
+- Update to 4.0.1
+- Fix up URL and Source urls
+- Re-enable parallel builds
+- Add pkgconfig file
+- Add more tests to make check
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
@@ -196,7 +221,7 @@ fi
 - rebuild for gcc4.1
 
 * Sun Oct 16 2005 Ed Hill <ed@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@eh3.com> - 3.6.0-7.p1
@@ -233,8 +258,8 @@ fi
 
 * Sat Dec  4 2004 Ed Hill <eh3@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@mit.edu> - 0:3.5.1-0.fdr.12
@@ -244,7 +269,7 @@ fi
 - headers in /usr/include/netcdf, libs in /usr/lib/netcdf
 
 * Mon Oct  4 2004 Ed Hill <eh3@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
 

sources

@@ -1 +1 @@
-afc057b07b6e6843556dcfbc4ced402c  netcdf-4.0.tar.gz
+a251453c5477599f050fa4e593295186  netcdf-4.0.1.tar.gz