rpms/libnc-dap/F-7 libnc-dap-3.7.0-nolibdir.patch, NONE, 1.1 libnc-dap.spec, 1.15, 1.16

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/libnc-dap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17063/F-7

Modified Files:
	libnc-dap.spec 
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: libnc-dap.spec
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/F-7/libnc-dap.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libnc-dap.spec	1 May 2007 12:18:18 -0000	1.15
+++ libnc-dap.spec	10 Jan 2008 00:29:21 -0000	1.16
@@ -1,15 +1,17 @@
 Name: libnc-dap
 Summary: The NetCDF interface to DAP-2 from OPeNDAP
 Version: 3.7.0
-Release: 3%{?dist}
+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)
-# dncdump and netcdf headers are coverd by a BSD-like license
-License: LGPL
 BuildRequires: libdap-devel >= 3.7.3 gcc-gfortran
 
 %description
@@ -23,7 +25,7 @@
 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
@@ -36,10 +38,11 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .nolibdir
 rm -rf netcdf/.svn
 
 %build
-%configure --disable-dependency-tracking
+%configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -65,13 +68,26 @@
 %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