dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: libdap
-# $Id$
-NAME := libdap
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

libdap-3.7.10-gcc43.patch

@@ -0,0 +1,160 @@
+diff -up libdap-3.7.10/AISDatabaseParser.cc.gcc43 libdap-3.7.10/AISDatabaseParser.cc
+--- libdap-3.7.10/AISDatabaseParser.cc.gcc43	2007-05-10 18:09:07.000000000 +0200
++++ libdap-3.7.10/AISDatabaseParser.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
++#include <cstring>
+ 
+ #ifdef WIN32
+ #define vsnprintf _vsnprintf
+diff -up libdap-3.7.10/cgi_util.cc.gcc43 libdap-3.7.10/cgi_util.cc
+--- libdap-3.7.10/cgi_util.cc.gcc43	2007-09-21 19:44:27.000000000 +0200
++++ libdap-3.7.10/cgi_util.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -44,6 +44,7 @@ static char rcsid[] not_used =
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <cstring>
+ 
+ #ifndef TM_IN_SYS_TIME
+ #include <time.h>
+diff -up libdap-3.7.10/Connect.cc.gcc43 libdap-3.7.10/Connect.cc
+--- libdap-3.7.10/Connect.cc.gcc43	2007-08-27 21:16:51.000000000 +0200
++++ libdap-3.7.10/Connect.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -46,6 +46,7 @@ static char rcsid[] not_used =
+ #ifndef WIN32
+ #include <unistd.h>
+ #endif
++#include <cstring>
+ 
+ #include <fstream>
+ #include <algorithm>
+diff -up libdap-3.7.10/dds.y.gcc43 libdap-3.7.10/dds.y
+--- libdap-3.7.10/dds.y.gcc43	2007-08-13 22:01:09.000000000 +0200
++++ libdap-3.7.10/dds.y	2008-05-22 00:33:55.000000000 +0200
+@@ -53,6 +53,7 @@ static char rcsid[] not_used = {"$Id: dd
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
++#include <cstring>
+ 
+ #include <iostream>
+ #include <stack>
+diff -up libdap-3.7.10/DDXParser.cc.gcc43 libdap-3.7.10/DDXParser.cc
+--- libdap-3.7.10/DDXParser.cc.gcc43	2007-03-28 23:42:19.000000000 +0200
++++ libdap-3.7.10/DDXParser.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
++#include <cstring>
+ 
+ #include "BaseType.h"
+ #include "Constructor.h"
+diff -up libdap-3.7.10/GeoConstraint.cc.gcc43 libdap-3.7.10/GeoConstraint.cc
+--- libdap-3.7.10/GeoConstraint.cc.gcc43	2007-08-21 01:39:01.000000000 +0200
++++ libdap-3.7.10/GeoConstraint.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -37,9 +37,7 @@ static char id[] not_used =
+ 
+ #include <iostream>
+ #include <sstream>
+-#ifdef WIN32
+ #include <algorithm>  //  for find_if
+-#endif
+ 
+ //#define DODS_DEBUG2
+ 
+diff -up libdap-3.7.10/getdap.cc.gcc43 libdap-3.7.10/getdap.cc
+--- libdap-3.7.10/getdap.cc.gcc43	2007-10-24 21:39:50.000000000 +0200
++++ libdap-3.7.10/getdap.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -47,6 +47,7 @@ static char rcsid[] not_used =
+ 
+ #include <GetOpt.h>
+ #include <string>
++#include <cstring>
+ 
+ #include "AISConnect.h"
+ #include "Response.h"
+diff -up libdap-3.7.10/HTTPCache.cc.gcc43 libdap-3.7.10/HTTPCache.cc
+--- libdap-3.7.10/HTTPCache.cc.gcc43	2007-11-28 22:20:52.000000000 +0100
++++ libdap-3.7.10/HTTPCache.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -27,6 +27,11 @@
+ 
+ #include <stdio.h>
+ #include <pthread.h>
++#include <cstring>
++#include <limits.h>
++#include <unistd.h>   // for stat
++#include <sys/types.h>  // for stat and mkdir
++#include <sys/stat.h>
+ 
+ #include <iostream>
+ #include <sstream>
+diff -up libdap-3.7.10/parser-util.cc.gcc43 libdap-3.7.10/parser-util.cc
+--- libdap-3.7.10/parser-util.cc.gcc43	2007-03-28 23:42:19.000000000 +0200
++++ libdap-3.7.10/parser-util.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -44,6 +44,7 @@ static char rcsid[] not_used =
+ #include <assert.h>
+ #include <math.h>
+ #include <errno.h>
++#include <cstring>
+ 
+ #include <iostream>
+ #include <sstream>
+diff -up libdap-3.7.10/RCReader.cc.gcc43 libdap-3.7.10/RCReader.cc
+--- libdap-3.7.10/RCReader.cc.gcc43	2007-03-28 23:42:19.000000000 +0200
++++ libdap-3.7.10/RCReader.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -42,6 +42,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <cstring>
+ 
+ #ifdef WIN32
+ #define FALSE 0
+diff -up libdap-3.7.10/tests/TestArray.cc.gcc43 libdap-3.7.10/tests/TestArray.cc
+--- libdap-3.7.10/tests/TestArray.cc.gcc43	2008-05-22 00:38:33.000000000 +0200
++++ libdap-3.7.10/tests/TestArray.cc	2008-05-22 00:38:51.000000000 +0200
+@@ -42,6 +42,7 @@
+ #include <fcntl.h>
+ #include <process.h>
+ #endif
++#include <cstring>
+ 
+ //#define DODS_DEBUG
+ 
+diff -up libdap-3.7.10/util.cc.gcc43 libdap-3.7.10/util.cc
+--- libdap-3.7.10/util.cc.gcc43	2007-11-28 22:20:52.000000000 +0100
++++ libdap-3.7.10/util.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -48,6 +48,7 @@ static char rcsid[] not_used =
+ #else
+ #include <sys/time.h>
+ #endif
++#include <cstring>
+ 
+ #ifndef WIN32
+ #include <unistd.h>
+diff -up libdap-3.7.10/util_mit.cc.gcc43 libdap-3.7.10/util_mit.cc
+--- libdap-3.7.10/util_mit.cc.gcc43	2007-03-28 23:42:19.000000000 +0200
++++ libdap-3.7.10/util_mit.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -37,6 +37,7 @@ static char rcsid[] not_used =
+ #include <stdlib.h>
+ #include <string>
+ #include <ctype.h>
++#include <cstring>
+ 
+ #ifndef TM_IN_SYS_TIME
+ #include <time.h>
+diff -up libdap-3.7.10/Vector.cc.gcc43 libdap-3.7.10/Vector.cc
+--- libdap-3.7.10/Vector.cc.gcc43	2007-11-27 00:18:58.000000000 +0100
++++ libdap-3.7.10/Vector.cc	2008-05-22 00:33:55.000000000 +0200
+@@ -43,6 +43,7 @@ static char rcsid[] not_used =
+ //#define DODS_DEBUG
+ 
+ #include <algorithm>
++#include <cstring>
+ 
+ #include "Vector.h"
+ #include "escaping.h"

libdap.spec

@@ -10,6 +10,7 @@ URL: http://www.opendap.org/
 Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
 
 Patch0: libdap-3.7.8-nolibdir.patch
+Patch1: libdap-3.7.10-gcc43.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,6 +62,7 @@ Documentation of the libdap library.
 %prep
 %setup -q
 %patch0 -p1 -b .nolibdir
+%patch1 -p1 -b .gcc43
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@@ -68,7 +70,8 @@ mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
 
 %build
 %configure --disable-static --disable-dependency-tracking
-make %{?_smp_mflags}
+# not parallel safe when rebuilding parsers
+make #%{?_smp_mflags}
 
 make docs