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,6 +1,6 @@
 Name:           netcdf
 Version:        4.0.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form
 
 Group:          Applications/Engineering
@@ -12,11 +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:       pkgconfig
 
 %package static
@@ -24,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
@@ -63,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
@@ -88,6 +89,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_fmoddir}
   ${RPM_BUILD_ROOT}%{_includedir}/netcdf
 /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
@@ -96,6 +100,7 @@ make check
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+
 %post
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/netcdf.info \
@@ -108,10 +113,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}/*
@@ -130,6 +137,13 @@ 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)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild