rpms/libnc-dap/devel libnc-dap-3.7.4-AIS.patch, NONE, 1.1 libnc-dap.spec, 1.30, 1.31

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/libnc-dap/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20043

Modified Files:
	libnc-dap.spec 
Added Files:
	libnc-dap-3.7.4-AIS.patch 
Log Message:
Add patch to change AISConnect to Connect

libnc-dap-3.7.4-AIS.patch:
 Dnc.cc       |    2 +-
 NCConnect.cc |    2 +-
 NCConnect.h  |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE libnc-dap-3.7.4-AIS.patch ---
diff -up libnc-dap-3.7.4/Dnc.cc.AIS libnc-dap-3.7.4/Dnc.cc
--- libnc-dap-3.7.4/Dnc.cc.AIS	2009-01-21 10:13:28.000000000 -0700
+++ libnc-dap-3.7.4/Dnc.cc	2010-07-15 13:23:17.970943355 -0600
@@ -96,7 +96,7 @@ nc__create_mp(const char *path, int iofl
 {
     // ClientParams is allocated outside of NCConnect so that NCConnect's
     // ctor can get the path stripped of the URL params. It then passes this
-    // URL to AISConnect. The pointer 'cp' is passed to NCConnect so that the
+    // URL to Connect. The pointer 'cp' is passed to NCConnect so that the
     // memory can be recovered when this instance is deleted.
     ClientParams *cp = new ClientParams(path);
     NCConnect *c = new NCConnect(cp->url_without_params(), cp);
diff -up libnc-dap-3.7.4/NCConnect.cc.AIS libnc-dap-3.7.4/NCConnect.cc
--- libnc-dap-3.7.4/NCConnect.cc.AIS	2008-09-17 17:00:57.000000000 -0600
+++ libnc-dap-3.7.4/NCConnect.cc	2010-07-15 13:23:13.698005199 -0600
@@ -109,7 +109,7 @@ static nc_type get_attr_nc_type(AttrType
     
     @param name A filename or URL. */
 NCConnect::NCConnect(const string & name, ClientParams * cp)
-    :AISConnect(name), d_client_params(cp), d_global_attributes(0),
+    :Connect(name), d_client_params(cp), d_global_attributes(0),
     d_constrained_dds(0), d_translated_dds(0), d_factory(0),
     d_ncid(-1), d_nvars(-1), d_recdim(-1), d_ndims(0)
       // Note the trick above where d_factory is initialized to null and null
diff -up libnc-dap-3.7.4/NCConnect.h.AIS libnc-dap-3.7.4/NCConnect.h
--- libnc-dap-3.7.4/NCConnect.h.AIS	2008-02-02 14:31:13.000000000 -0700
+++ libnc-dap-3.7.4/NCConnect.h	2010-07-15 13:23:40.111945076 -0600
@@ -37,7 +37,7 @@
 #ifndef _ncconnect_h
 #define _ncconnect_h 1
 
-#include "AISConnect.h"		// Changed to AISConnect. 03/11/03 jhrg
+#include "Connect.h"		// Changed to Connect. 07/15/2010 Orion Poplawski
 #include "NCTypeFactory.h"
 #include "ClientParams.h"
 #include "nc_util.h"
@@ -58,7 +58,7 @@ using namespace libdap ;
     @todo Update; remove deprecated Connect methods.
 
     @author Reza Nekovei, James Gallagher */
-class NCConnect: public AISConnect {
+class NCConnect: public Connect {
 private:
     ClientParams *d_client_params;
     AttrTable *d_global_attributes;


Index: libnc-dap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnc-dap/devel/libnc-dap.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libnc-dap.spec	15 Jul 2010 17:52:39 -0000	1.30
+++ libnc-dap.spec	15 Jul 2010 19:25:15 -0000	1.31
@@ -9,6 +9,7 @@ Group: Development/Libraries
 License: LGPLv2+
 URL: http://www.opendap.org/
 Source0: http://www.opendap.org/pub/source/libnc-dap-%{version}.tar.gz
+Patch0:  libnc-dap-3.7.4-AIS.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libdap-devel >= 3.8.0 gcc-gfortran
@@ -40,6 +41,7 @@ will use libnc-dap.
 
 %prep
 %setup -q
+%patch0 -p1 -b .AIS
 rm -rf netcdf/.svn
 
 %build
@@ -80,6 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Jul 15 2010 Orion Poplawski <orion at cora.nwra.com> - 3.7.4-3
 - Rebuild for libdap 3.10.2
+- Add patch to change AISConnect to Connect
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild