rpms/libnc-dap/F-8 libnc-dap-3.7.0-nolibdir.patch, NONE, 1.1 libnc-dap.spec, 1.19, 1.20

[Patrice Dumas (pertusus)]

Author: pertusus

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

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-8/libnc-dap.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- libnc-dap.spec	22 Aug 2007 10:01:04 -0000	1.19
+++ libnc-dap.spec	10 Jan 2008 00:29:35 -0000	1.20
@@ -1,17 +1,18 @@
 Name: libnc-dap
 Summary: The NetCDF interface to DAP-2 from OPeNDAP
 Version: 3.7.0
-Release: 7%{?dist}
-
-Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
-URL: http://www.opendap.org/
+Release: 9%{?dist}
 
 Group: Development/Libraries
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # ncdump, netcdf headers, lnetcdf are coverd by a BSD/MIT-like license
 # but they are linked statically against libnc-dap
 License: LGPLv2+
-BuildRequires: gawk libdap-devel >= 3.7.3 gcc-gfortran
+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
+
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: libdap-devel >= 3.7.3 gcc-gfortran
 
 %description
 The libnc-dap library is a call-for-call replacement for netcdf. It can 
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .nolibdir
 rm -rf netcdf/.svn
 
 %build
@@ -72,6 +74,13 @@
 
 
 %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