[gdl/cvs] Use latest cvs

[Orion Poplawski]

commit bb6a78ff2931e454fb763da97dae00e8a03ff19f
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Sep 2 10:41:36 2014 -0600

    Use latest cvs

 gdl-0.9-antlr-cmake.patch |   14 +++++++-------
 gdl.spec                  |   23 +++++++----------------
 makecvstarball            |   10 ++++++++--
 3 files changed, 22 insertions(+), 25 deletions(-)
---
diff --git a/gdl-0.9-antlr-cmake.patch b/gdl-0.9-antlr-cmake.patch
index 3d8b27c..fbd9748 100644
--- a/gdl-0.9-antlr-cmake.patch
+++ b/gdl-0.9-antlr-cmake.patch
@@ -1,7 +1,7 @@
-diff -up gdl-0.9.3/src/CMakeLists.txt.antlr gdl-0.9.3/src/CMakeLists.txt
---- gdl-0.9.3/src/CMakeLists.txt.antlr	2012-12-27 09:22:44.000000000 -0700
-+++ gdl-0.9.3/src/CMakeLists.txt	2013-02-25 16:57:37.808871375 -0700
-@@ -237,9 +237,7 @@ gtdhelper.hpp
+diff -up gdl-0.9.5-20140902/src/CMakeLists.txt.antlr gdl-0.9.5-20140902/src/CMakeLists.txt
+--- gdl-0.9.5-20140902/src/CMakeLists.txt.antlr	2014-08-20 13:56:26.000000000 -0600
++++ gdl-0.9.5-20140902/src/CMakeLists.txt	2014-09-02 10:04:44.067977813 -0600
+@@ -253,9 +253,7 @@ devicewin.hpp
  )
  endif(WIN32 AND NOT CYGWIN)
  
@@ -12,11 +12,11 @@ diff -up gdl-0.9.3/src/CMakeLists.txt.antlr gdl-0.9.3/src/CMakeLists.txt
  link_directories(${LINK_DIRECTORIES})
  
  if(PYTHON_MODULE) #libgdl
-@@ -250,7 +248,6 @@ else(PYTHON_MODULE) #gdl
+@@ -266,7 +264,6 @@ else(PYTHON_MODULE) #gdl
  	add_executable(gdl ${SOURCES})
  endif(PYTHON_MODULE)
  
 -add_dependencies(gdl antlr) # be sure that antlr is built before gdl
  target_link_libraries(gdl antlr) # link antlr against gdl
- target_link_libraries(gdl ${LIBRARIES})
- add_definitions(-DHAVE_CONFIG_H)
+ if (MINGW)
+ target_link_libraries(gdl ws2_32)
diff --git a/gdl.spec b/gdl.spec
index a823437..89bb999 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,20 +1,18 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           gdl
-Version:        0.9.4
-Release:        6%{?dist}
+Version:        0.9.5
+Release:        0.1.cvs20140902%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://gnudatalanguage.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}-20140902.tar.bz2
 Source1:        gdl.csh
 Source2:        gdl.sh
 Source3:        makecvstarball
-# Build with system antlr library.  Request for upstream change here:
-# https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&group_id=97659&atid=618686
-Patch1:         gdl-antlr-auto.patch
+Patch1:         gdl-format.patch
 # Force build of libgdl.so
 Patch2:         gdl-shared.patch
 # Patch to allow make check to work for out of tree builds
@@ -111,7 +109,7 @@ Provides:       %{name}-runtime = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-20140902
 rm -rf src/antlr
 %patch13 -p1 -b .antlr
 pushd src
@@ -120,14 +118,7 @@ do
   antlr $f
 done
 popd
-%patch2 -p1 -b .shared
-%patch3 -p1 -b .build
-%patch4 -p1 -b .plwidth
-%patch5 -p1 -b .python
-%patch6 -p1 -b .gsl
-%patch7 -p1 -b .eigen
-%patch8 -p1 -b .reorder
-%patch9 -p1 -b .find_python
+%patch1 -p1 -b .format
 
 %global cmake_opts \\\
    -DWXWIDGETS=ON \\\
@@ -185,7 +176,7 @@ cd build
 # https://bugzilla.redhat.com/show_bug.cgi?id=990749
 make check ARGS="-V -E 'test_execute|test_finite|test_fix'"
 %else
-make check ARGS="-V -E 'test_execute'"
+make check ARGS="-V -E 'test_execute|test_bug_3147146'"
 %endif
 
 %clean
diff --git a/makecvstarball b/makecvstarball
index 00f9bf9..5c92e78 100755
--- a/makecvstarball
+++ b/makecvstarball
@@ -5,5 +5,11 @@ then
 else
    date=`date +%Y%m%d`
 fi
-cvs -z3 -d :pserver:anonymous at gnudatalanguage.cvs.sourceforge.net:/cvsroot/gnudatalanguage export -D ${date} -d gdl-0.9rc4-${date} gdl
-tar cjf gdl-0.9rc4-${date}.tar.bz2 gdl-0.9rc4-${date}
+if [ -n "$2" ]
+then
+   rel=$2
+else
+   rel=0.9.5
+fi
+cvs -z3 -d :pserver:anonymous at gnudatalanguage.cvs.sourceforge.net:/cvsroot/gnudatalanguage export -D ${date} -d gdl-${rel}-${date} gdl
+tar cjf gdl-${rel}-${date}.tar.bz2 gdl-${rel}-${date}