[packages/libdap] - updated to 3.14.0 - added flex patch (FlexLexer types inconsistency with current flex)

[qboosh]

commit d48519922e87b0eaa5017eb9e39c11fedf41489a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jul 7 17:50:33 2015 +0200

    - updated to 3.14.0
    - added flex patch (FlexLexer types inconsistency with current flex)

 libdap-flex.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 libdap.spec       | 14 ++++++++++----
 2 files changed, 56 insertions(+), 4 deletions(-)
---
diff --git a/libdap.spec b/libdap.spec
index b09dc3d..112be85 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -5,17 +5,20 @@
 Summary:	OPeNDAP C++ implementation of the Data Access Protocol
 Summary(pl.UTF-8):	OPeNDAP - implementacja w C++ protokołu DAP (Data Access Protocol)
 Name:		libdap
-Version:	3.13.3
-Release:	2
+Version:	3.14.0
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://www.opendap.org/pub/source/%{name}-%{version}.tar.gz
-# Source0-md5:	eda3d6c68abc93734a84f680eb546e6a
+# Source0-md5:	83ac4c6eb4aa8e485587de94b9757d01
+Patch0:		%{name}-flex.patch
 URL:		http://opendap.org/
-BuildRequires:	autoconf >= 2.62
+BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
+BuildRequires:	bison >= 3.0
 %{?with_tests:BuildRequires:	cppunit-devel >= 1.12.0}
 BuildRequires:	curl-devel >= 7.19.0
+BuildRequires:	flex
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libuuid-devel
@@ -83,6 +86,7 @@ Statyczna biblioteka OPeNDAP.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -116,6 +120,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc COPYRIGHT_* NEWS README*
 %attr(755,root,root) %{_bindir}/getdap
+%attr(755,root,root) %{_bindir}/getdap4
 %attr(755,root,root) %{_libdir}/libdap.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdap.so.17
 %attr(755,root,root) %{_libdir}/libdapclient.so.*.*.*
@@ -123,6 +128,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libdapserver.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdapserver.so.7
 %{_mandir}/man1/getdap.1*
+%{_mandir}/man1/getdap4.1*
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/libdap-flex.patch b/libdap-flex.patch
new file mode 100644
index 0000000..9d5c75c
--- /dev/null
+++ b/libdap-flex.patch
@@ -0,0 +1,46 @@
+--- libdap-3.14.0/d4_ce/lex.d4_ce.cc.orig	2015-04-07 08:45:50.000000000 +0200
++++ libdap-3.14.0/d4_ce/lex.d4_ce.cc	2015-07-07 16:01:01.470481885 +0200
+@@ -1276,9 +1276,9 @@ void yyFlexLexer::switch_streams( std::i
+ }
+ 
+ #ifdef YY_INTERACTIVE
+-size_t yyFlexLexer::LexerInput( char* buf, size_t /* max_size */ )
++int yyFlexLexer::LexerInput( char* buf, int /* max_size */ )
+ #else
+-size_t yyFlexLexer::LexerInput( char* buf, size_t max_size )
++int yyFlexLexer::LexerInput( char* buf, int max_size )
+ #endif
+ {
+ 	if ( yyin->eof() || yyin->fail() )
+@@ -1305,7 +1305,7 @@ size_t yyFlexLexer::LexerInput( char* bu
+ #endif
+ }
+ 
+-void yyFlexLexer::LexerOutput( const char* buf, size_t size )
++void yyFlexLexer::LexerOutput( const char* buf, int size )
+ {
+ 	(void) yyout->write( buf, size );
+ }
+--- libdap-3.14.0/d4_ce/lex.d4_function.cc.orig	2015-04-04 06:47:36.000000000 +0200
++++ libdap-3.14.0/d4_ce/lex.d4_function.cc	2015-07-07 16:02:33.813811327 +0200
+@@ -1303,9 +1303,9 @@ void yyFlexLexer::switch_streams( std::i
+ }
+ 
+ #ifdef YY_INTERACTIVE
+-size_t yyFlexLexer::LexerInput( char* buf, size_t /* max_size */ )
++int yyFlexLexer::LexerInput( char* buf, int /* max_size */ )
+ #else
+-size_t yyFlexLexer::LexerInput( char* buf, size_t max_size )
++int yyFlexLexer::LexerInput( char* buf, int max_size )
+ #endif
+ {
+ 	if ( yyin->eof() || yyin->fail() )
+@@ -1332,7 +1332,7 @@ size_t yyFlexLexer::LexerInput( char* bu
+ #endif
+ }
+ 
+-void yyFlexLexer::LexerOutput( const char* buf, size_t size )
++void yyFlexLexer::LexerOutput( const char* buf, int size )
+ {
+ 	(void) yyout->write( buf, size );
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdap.git/commitdiff/d48519922e87b0eaa5017eb9e39c11fedf41489a