rpms/nco/devel nco-3.0.0-fixudunits.patch, NONE, 1.1 nco.spec, NONE, 1.1 nco_install_C_headers.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Ed Hill (edhill) fedora-extras-commits at redhat.com
Thu Jul 21 05:43:25 UTC 2005


Author: edhill

Update of /cvs/extras/rpms/nco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32648/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nco-3.0.0-fixudunits.patch nco.spec 
	nco_install_C_headers.patch 
Log Message:
auto-import nco-3.0.1-3 on branch devel from nco-3.0.1-3.src.rpm

nco-3.0.0-fixudunits.patch:

--- NEW FILE nco-3.0.0-fixudunits.patch ---
--- nco-3.0.0/configure.in.BAD	2005-04-22 10:53:36.000000000 -0500
+++ nco-3.0.0/configure.in	2005-04-22 10:53:54.000000000 -0500
@@ -408,10 +408,8 @@
     LDFLAGS="${LDFLAGS} -L${UDUNITS_PATH}/lib"
     CPPFLAGS="${CPPFLAGS} -I${UDUNITS_PATH}/include"
 #    nco_udunits_dat=${UDUNITS_PATH}/src/lib/udunits.dat
-  elif test "${NETCDF_INC}"; then
-    nco_udunits_dat="${NETCDF_INC}/../etc/udunits.dat"
   else
-    nco_udunits_dat="/usr/local/etc/udunits.dat"
+    nco_udunits_dat="/etc/udunits.dat"
   fi
 # warn if udunits.dat is not found, but continue anyway since the builder may savy and know to add it later, like when building packages (e.g. .debs)
   AC_CHECK_FILE([$nco_udunits_dat],,AC_WARN([file $nco_udunits_dat was not found but will be compiled into NCO. Some executables may fail without it.]))


--- NEW FILE nco.spec ---
Name:           nco
Version:        3.0.1
Release:        3%{?dist}
Summary:        Suite of programs for manipulating NetCDF/HDF4 files
Group:          Applications/Engineering
License:        GPL
URL:            http://nco.sourceforge.net/

#  The NCO web site now recommends CVS so the tar.gz was obtained
#  using the following recommended commands:
#    cvs -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco login
#    cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco co \
#        -r nco-3_0_1 -d nco-3.0.1 nco
#    tar -czf nco-3.0.1.tar.gz ./nco-3.0.1
Source0:        nco-3.0.1.tar.gz
Patch0:		nco_install_C_headers.patch
Patch1:         nco-3.0.0-fixudunits.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  netcdf-devel, libtool, automake, autoconf
BuildRequires:  udunits, udunits-devel, opendap-devel
BuildRequires:  curl-devel, libxml2-devel, librx-devel

%package devel
Summary:        Development files for NCO
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description
The netCDF Operators, NCO, are a suite of command line programs known
as operators.  The operators facilitate manipulation and analysis of
self-describing data stored in the freely available netCDF and HDF
formats (http://www.unidata.ucar.edu/packages/netcdf and
http://hdf.ncsa.uiuc.edu, respectively).  Each NCO operator (e.g.,
ncks) takes netCDF or HDF input file(s), performs an operation (e.g.,
averaging, hyperslabbing, or renaming), and outputs a processed netCDF
file.  Although most users of netCDF and HDF data are involved in
scientific research, these data formats, and thus NCO, are generic and
are equally useful in fields from agriculture to zoology.  The NCO
User's Guide illustrates NCO use with examples from the field of
climate modeling and analysis.  The NCO homepage is
http://nco.sourceforge.net/.

%description devel
This package contains the NCO header files and static libs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%build
aclocal
autoheader
automake --foreign
autoconf
export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
%configure --includedir=%{_includedir}/nco
make %{?_smp_mflags}
unset NETCDF_INC NETCDF_LIB CPPFLAGS

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/nco
make install DESTDIR=${RPM_BUILD_ROOT}
rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir

%clean
rm -rf ${RPM_BUILD_ROOT}


%post
/sbin/ldconfig
/sbin/install-info %{_infodir}/nco.info.gz \
    %{_infodir}/dir 2>/dev/null || :

%postun
/sbin/ldconfig
if [ "$1" = 0 ]; then
  /sbin/install-info --delete %{_infodir}/nco.info.gz \
    %{_infodir}/dir 2>/dev/null || :
fi

%files
%defattr(-,root,root,-)
%doc doc/README doc/LICENSE doc/rtfm.txt
%{_bindir}/*
%{_mandir}/*/*
%{_infodir}/*
%{_libdir}/libnco*[0-9]*.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/nco
%{_libdir}/libnco*.a
%{_libdir}/libnco.so
%{_libdir}/libnco_c++.so


%changelog
* Thu Jul 21 2005 Ed Hill <ed at eh3.com> - 3.0.1-3
- add LICENSE file

* Sat Jul  9 2005 Ed Hill <ed at eh3.com> - 3.0.1-2
- add BuildRequires: opendap-devel

* Sun Jun 19 2005 Ed Hill <ed at eh3.com> - 3.0.1-1
- update to upstream 3.0.1
- comment & fixes for BuildRequires

* Sat Apr 23 2005 Ed Hill <ed at eh3.com> - 3.0.0-2
- add BuildRequires and fix CXXFLAGS per Tom Callaway
- add udunits patch per Tom Callaway

* Sat Apr 16 2005 Ed Hill <ed at eh3.com> - 3.0.0-1
- update to ver 3.0.0
- devel package fixes per D.M. Kaplan and M. Schwendt
- fix info post/postun

* Sun Dec  5 2004 Ed Hill <eh3 at mit.edu> - 0:2.9.9-0.fdr.4
- sync with netcdf-3.6.0beta6-0.fdr.0
- split into devel and non-devel

* Wed Dec  1 2004 Ed Hill <eh3 at mit.edu> - 0:2.9.9-0.fdr.3
- sync with netcdf-0:3.5.1-0.fdr.11
- added '-fpermissive' for GCC 3.4.2 warnings
- added "Provides:nco-devel" for the headers and libs

* Mon Oct  4 2004 Ed Hill <eh3 at mit.edu> - 0:2.9.9-0.fdr.2
- Add some of Michael Schwendt's suggested INC/LIB path fixes and 
  sync with the netcdf-3.5.1-0.fdr.10 dependency.

* Thu Sep 23 2004 Ed Hill <eh3 at mit.edu> - 0:2.9.9-0.fdr.1
- add NETCDF_INC and NETCDF_LIB to work on systems where old
  versions of netcdf may exist in /usr/local

* Wed Sep  8 2004 Ed Hill <eh3 at mit.edu> - 0:2.9.9-0.fdr.0
- updated to ver 2.9.9

* Sat Aug  7 2004 Ed Hill <eh3 at mit.edu> - 0:2.9.8-0.fdr.0
- updated to ver 2.9.8

* Sat Jul 17 2004 Ed Hill <eh3 at mit.edu> - 0:2.9.7-0.fdr.2
- removed unneeded %ifarch

* Sat Jul 17 2004 Ed Hill <eh3 at mit.edu> - 0:2.9.7-0.fdr.1
- Add %post,%postun

* Sat Jul 17 2004 Ed Hill <eh3 at mit.edu> - 0:2.9.7-0.fdr.0
- Initial working version


nco_install_C_headers.patch:

--- NEW FILE nco_install_C_headers.patch ---
--- nco-3.0.0/src/nco/Makefile.am	2004-08-06 12:44:00.000000000 -0400
+++ nco-3.0.0_new/src/nco/Makefile.am	2005-04-18 08:54:22.000000000 -0400
@@ -69,6 +69,8 @@
 # This creates version-stamped shared-library, e.g., libnco-2.9.4.so
 libnco_la_LDFLAGS = -release @VERSION@
 
+include_HEADERS = $(HEADER_SRC)
+
 libnco_la_SOURCES = nco_att_utl.c nco_bnr.c nco_cln_utl.c nco_cnf_dmn.c \
 nco_cnf_typ.c nco_cnv_arm.c nco_rth_flt.c ${NCO_GETOPT} \
 nco_cnv_csm.c nco_ctl.c nco_dbg.c nco_dmn_utl.c nco_fl_utl.c nco_lmt.c \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jul 2005 05:42:32 -0000	1.1
+++ .cvsignore	21 Jul 2005 05:43:23 -0000	1.2
@@ -0,0 +1 @@
+nco-3.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jul 2005 05:42:32 -0000	1.1
+++ sources	21 Jul 2005 05:43:23 -0000	1.2
@@ -0,0 +1 @@
+72f76553c95bc2b2fdaddcd7cc876f67  nco-3.0.1.tar.gz




More information about the scm-commits mailing list