rpms/dap-hdf4_handler/FC-4 dap-hdf4_handler-gcc41.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 dap-hdf4_handler.spec, 1.2, 1.3 sources, 1.2, 1.3

Patrice Dumas (pertusus) fedora-extras-commits at redhat.com
Fri Mar 3 22:24:40 UTC 2006


Author: pertusus

Update of /cvs/extras/rpms/dap-hdf4_handler/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31582/FC-4

Modified Files:
	.cvsignore dap-hdf4_handler.spec sources 
Added Files:
	dap-hdf4_handler-gcc41.diff 
Log Message:
- add patch for gcc 4.1
- Update to 3.6.0



dap-hdf4_handler-gcc41.diff:

--- NEW FILE dap-hdf4_handler-gcc41.diff ---
diff -u --recursive hdf4_handler-3.6.0-orig/hdfclass/hcstream.h hdf4_handler-3.6.0/hdfclass/hcstream.h
--- hdf4_handler-3.6.0-orig/hdfclass/hcstream.h	2005-10-13 11:23:29.000000000 +0200
+++ hdf4_handler-3.6.0/hdfclass/hcstream.h	2006-03-03 14:42:02.000000000 +0100
@@ -96,11 +96,11 @@
 		 bool reduce_rank = false);
     void setslab(int *start, int *edge, int *stride, bool reduce_rank = false);
     void unsetslab(void) { _slab.set = _slab.reduce_rank = false; }
-    void hdfistream_sds::set_map_ce(const vector<array_ce> &a_ce) {
+    void set_map_ce(const vector<array_ce> &a_ce) {
 	_map_ce_set = true;
 	_map_ce_vec = a_ce;
     }
-    vector<array_ce> hdfistream_sds::get_map_ce() {
+    vector<array_ce> get_map_ce() {
 	return _map_ce_vec;
     }
     bool is_map_ce_set() {
diff -u --recursive hdf4_handler-3.6.0-orig/HDFGrid.h hdf4_handler-3.6.0/HDFGrid.h
--- hdf4_handler-3.6.0-orig/HDFGrid.h	2005-10-10 21:22:29.000000000 +0200
+++ hdf4_handler-3.6.0/HDFGrid.h	2006-03-03 14:55:23.000000000 +0100
@@ -58,7 +58,7 @@
     virtual ~HDFGrid();
     virtual BaseType *ptr_duplicate();
     virtual bool read(const string &dataset);
-    virtual vector<array_ce> HDFGrid::get_map_constraints();
+    virtual vector<array_ce> get_map_constraints();
     virtual bool read_tagref(const string &dataset, int32 tag, int32 ref, int &error);
 };
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Feb 2006 14:19:07 -0000	1.2
+++ .cvsignore	3 Mar 2006 22:24:40 -0000	1.3
@@ -1 +1 @@
-hdf4_handler-3.5.0.tar.gz
+hdf4_handler-3.6.0.tar.gz


Index: dap-hdf4_handler.spec
===================================================================
RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-4/dap-hdf4_handler.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dap-hdf4_handler.spec	20 Feb 2006 14:21:32 -0000	1.2
+++ dap-hdf4_handler.spec	3 Mar 2006 22:24:40 -0000	1.3
@@ -1,10 +1,11 @@
 Summary:         HDF4 data handler for the OPeNDAP Data server
 Name:            dap-hdf4_handler
-Version:         3.5.0
-Release:         1%{?dist}
+Version:         3.6.0
+Release:         2%{?dist}
 License:         LGPL
 Group:           System Environment/Daemons 
 Source0:         ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz
+Patch:           dap-hdf4_handler-gcc41.diff
 URL:             http://www.opendap.org/
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,13 +15,14 @@
 %description
 This is the hdf4 data handler for our data server. It reads HDF4 and HDF-EOS
 files and returns DAP responses that are compatible with DAP2 and the
-dap-server 3.5 software.
+dap-server software.
 
 %prep 
 %setup -q -n hdf4_handler-%{version}
+%patch -p1
 
 %build
-%configure --with-hdf4-libdir=%{_libdir}/hdf --with-hdf4-include=%{_includedir}/hdf
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -37,5 +39,11 @@
 %doc README
 
 %changelog
+* Fri Mar  3 2006 Patrice Dumas <pertusus at free.fr> - 3.6.0-2
+- add patch for gcc 4.1
+
+* Fri Mar  3 2006 Patrice Dumas <pertusus at free.fr> - 3.6.0-1
+- Update to 3.6.0
+
 * Thu Sep 21 2005 James Gallagher <jgallagher at opendap.org> 3.5.0-1
 - initial release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Feb 2006 14:19:07 -0000	1.2
+++ sources	3 Mar 2006 22:24:40 -0000	1.3
@@ -1 +1 @@
-0b3d3ab80d85428a9a9f898dacc4d53e  hdf4_handler-3.5.0.tar.gz
+8aebe63dc38dfbc35f853807b37c070e  hdf4_handler-3.6.0.tar.gz




More information about the fedora-extras-commits mailing list