rpms/nco/devel nco.spec,1.13,1.14

[Patrice Dumas]

Author: pertusus

Update of /cvs/extras/rpms/nco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16249

Modified Files:
	nco.spec 
Log Message:
* Sun Dec 21 2008 - Patrice Dumas <pertusus at free.fr> - 3.9.5-3
- call libtoolize
- remove unneeded dependencies on curl-devel, libxml2-devel, librx-devel
- ship more documentation



Index: nco.spec
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/nco.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nco.spec	11 Sep 2008 15:08:23 -0000	1.13
+++ nco.spec	21 Dec 2008 00:14:41 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           nco
 Version:        3.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
 License:        GPLv3
@@ -20,8 +20,9 @@
 BuildRequires:  libtool, automake, autoconf
 BuildRequires:  netcdf-devel, libnc-dap-devel
 BuildRequires:  udunits, udunits-devel
-BuildRequires:  curl-devel, libxml2-devel, librx-devel
+#BuildRequires:  curl-devel, libxml2-devel, librx-devel
 BuildRequires:  antlr
+BuildRequires:  texinfo-tex texinfo
 
 %package devel
 Summary:        Development files for NCO
@@ -59,16 +60,23 @@
 %patch0 -p1 -b .install_C_headers
 
 %build
+libtoolize --copy
 aclocal
+libtoolize --copy
 # nco accinclude.m4 isn't liked by newer autoheader
 #autoheader
 automake --foreign
 autoconf
-export CPPFLAGS=-I%{_includedir}/netcdf-3
+# it is possible that the netcdf header file used is from libnc-dap
+export CPPFLAGS=-I%{_includedir}/netcdf
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
 %configure --disable-dependency-tracking --includedir=%{_includedir}/nco
 make %{?_smp_mflags}
+pushd doc
+makeinfo --html --no-split nco.texi
+make nco.pdf
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -95,7 +103,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc doc/README doc/LICENSE doc/rtfm.txt
+%doc doc/README doc/LICENSE doc/rtfm.txt doc/nco.html doc/nco.pdf doc/nco.css
+%doc doc/index.shtml doc/TODO doc/ChangeLog doc/nco.png doc/nco_news.shtml
+%doc doc/nsf.png
 %{_bindir}/*
 %{_mandir}/*/*
 %{_infodir}/*
@@ -103,7 +113,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/nco
+%{_includedir}/nco/
 %{_libdir}/libnco.so
 %{_libdir}/libnco_c++.so
 
@@ -112,6 +122,11 @@
 %{_libdir}/libnco*.a
 
 %changelog
+* Sun Dec 21 2008 - Patrice Dumas <pertusus at free.fr> - 3.9.5-3
+- call libtoolize
+- remove unneeded dependencies on curl-devel, libxml2-devel, librx-devel
+- ship more documentation
+
 * Thu Sep 11 2008 - Patrice Dumas <pertusus at free.fr> - 3.9.5-2
 - rebuild for newer libnc-dap