rpms/libnc-dap/EL-5 libnc-dap-3.7.0-nolibdir.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 libnc-dap.spec, 1.11, 1.12 sources, 1.4, 1.5

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/libnc-dap/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5313

Modified Files:
	.cvsignore libnc-dap.spec sources 
Added Files:
	libnc-dap-3.7.0-nolibdir.patch 
Log Message:
sync with devel

libnc-dap-3.7.0-nolibdir.patch:

--- NEW FILE libnc-dap-3.7.0-nolibdir.patch ---
diff -up libnc-dap-3.7.0/ncdap-config.in.nolibdir libnc-dap-3.7.0/ncdap-config.in
--- libnc-dap-3.7.0/ncdap-config.in.nolibdir	2007-10-21 11:04:28.000000000 +0200
+++ libnc-dap-3.7.0/ncdap-config.in	2007-10-21 11:04:57.000000000 +0200
@@ -4,7 +4,6 @@
 #
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 usage()
@@ -68,11 +67,11 @@ while test $# -gt 0; do
 	;;
 
     --libs)
-       	echo "-L${libdir} -lnc-dap @LIBS@"
+       	echo "-lnc-dap @LIBS@"
        	;;
 
     --flibs)
-       	echo "-L${libdir} -lnc-dap @LIBS@ @FLIBS@ -lstdc++"
+       	echo "-lnc-dap @LIBS@ @FLIBS@ -lstdc++"
        	;;
 
     --prefix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Sep 2006 09:20:43 -0000	1.4
+++ .cvsignore	27 Dec 2007 13:09:14 -0000	1.5
@@ -1 +1 @@
-libnc-dap-3.6.2.tar.gz
+libnc-dap-3.7.0.tar.gz


Index: libnc-dap.spec
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/EL-5/libnc-dap.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libnc-dap.spec	4 Oct 2006 22:45:20 -0000	1.11
+++ libnc-dap.spec	27 Dec 2007 13:09:14 -0000	1.12
@@ -1,15 +1,18 @@
 Name: libnc-dap
 Summary: The NetCDF interface to DAP-2 from OPeNDAP
-Version: 3.6.2
-Release: 4%{?dist}
+Version: 3.7.0
+Release: 9%{?dist}
 
-Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
+Group: Development/Libraries
+# ncdump, netcdf headers, lnetcdf are coverd by a BSD/MIT-like license
+# but they are linked statically against libnc-dap
+License: LGPLv2+
 URL: http://www.opendap.org/
+Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
+Patch0: libnc-dap-3.7.0-nolibdir.patch
 
-Group: Development/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: LGPL/BSD
-BuildRequires: libdap-devel >= 3.7.0
+BuildRequires: libdap-devel >= 3.7.3 gcc-gfortran
 
 %description
 The libnc-dap library is a call-for-call replacement for netcdf. It can 
@@ -18,14 +21,16 @@
 machines. Data served using DAP2 need not be stored in netcdf files 
 to be read using this replacement library.
 Also included in this package is the ncdump utility, also bundled with the
-original netcdf library, relinked with the library and thus able to read
-from DAP2 compatible servers.
+original netcdf library, renamed dncdump, relinked with the library and 
+thus able to read from DAP2 compatible servers.
 
 %package devel
-Summary: Static libraries and header files from libnc-dap
+Summary: Development files and header files from libnc-dap
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: libdap-devel >= 3.7.0
+# for /usr/share/aclocal owning
+Requires: automake
 
 %description devel
 This package contains all the files needed to develop applications that
@@ -33,16 +38,19 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .nolibdir
+rm -rf netcdf/.svn
 
 %build
-%configure
+%configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -rf netcdf/.svn
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
+mv $RPM_BUILD_ROOT%{_bindir}/ncdump $RPM_BUILD_ROOT%{_bindir}/dncdump
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,13 +68,35 @@
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libnc-dap.so
-%{_libdir}/libnc-dap.a
 %{_bindir}/ncdap-config
 %{_includedir}/libnc-dap/
 %{_datadir}/aclocal/*
 
 
 %changelog
+* Mon Dec 17 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-9
+- rebuild against newer libdap
+
+* Sun Oct 21 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-8
+- remove reference to libdir in ncdap-config, should fix multilib conflict
+  (#342251)
+
+* Wed Aug 22 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-7
+- fix license
+- add gawk BuildRequires
+
+* Fri Jun  1 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-4
+- remove static libs
+
+* Tue May  1 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-3
+- Buildrequires gfortran for the fortran API
+
+* Mon Apr 30 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-2
+- update to 3.7.0
+
+* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.6.2-5
+- licence is LGPL since it cause the BSD code to be distributed as LGPL too
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.6.2-4
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Sep 2006 09:20:43 -0000	1.4
+++ sources	27 Dec 2007 13:09:14 -0000	1.5
@@ -1 +1 @@
-36690500f4271e456aa8f00d2eea41ee  libnc-dap-3.6.2.tar.gz
+cb1c518725e1b2bb6078a691a2377eea  libnc-dap-3.7.0.tar.gz