commit 41bcadafb4afeb8bdd2af59ed44cfb3e4512e954
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Sep 30 10:42:28 2013 -0600
Update to 0.9.4
- Update build patch - drop automake components
- New python patch to fix python build
.gitignore | 1 +
gdl-build.patch | 12 -
gdl-cvs.patch |76781 ------------------------------------------------------
gdl-python.patch | 12 +
gdl.spec | 17 +-
sources | 2 +-
6 files changed, 25 insertions(+), 76800 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d12c58..2529a50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ gdl-0.9rc4.tar.gz
/gdl-0.9.1.tar.gz
/gdl-0.9.2.tar.gz
/gdl-0.9.3.tar.gz
+/gdl-0.9.4.tar.gz
diff --git a/gdl-build.patch b/gdl-build.patch
index 750d4d7..6997995 100644
--- a/gdl-build.patch
+++ b/gdl-build.patch
@@ -1,15 +1,3 @@
-diff -up gdl-0.9.2/testsuite/Makefile.am.build gdl-0.9.2/testsuite/Makefile.am
---- gdl-0.9.2/testsuite/Makefile.am.build 2012-05-10 15:11:37.730137963 -0600
-+++ gdl-0.9.2/testsuite/Makefile.am 2012-05-10 16:15:25.312948418 -0600
-@@ -2,7 +2,7 @@ check_LTLIBRARIES = libtest_ce.la
- libtest_ce_la_SOURCES = libtest_ce.cpp
- libtest_ce_la_LDFLAGS = -rpath $(abs_srcdir)/testsuite/.libs
-
--TESTS_ENVIRONMENT = $(top_srcdir)/testsuite/try $(top_srcdir)
-+TESTS_ENVIRONMENT = $(top_srcdir)/testsuite/try $(top_srcdir) $(top_builddir)
- TESTS = \
- test_angles.pro \
- test_base64.pro \
diff -up gdl-0.9.2/testsuite/try.build gdl-0.9.2/testsuite/try
--- gdl-0.9.2/testsuite/try.build 2011-05-02 05:00:47.000000000 -0600
+++ gdl-0.9.2/testsuite/try 2012-05-10 16:16:14.218180027 -0600
diff --git a/gdl-python.patch b/gdl-python.patch
new file mode 100644
index 0000000..709f8c1
--- /dev/null
+++ b/gdl-python.patch
@@ -0,0 +1,12 @@
+diff -up gdl-0.9.4/src/pythongdl.cpp.python gdl-0.9.4/src/pythongdl.cpp
+--- gdl-0.9.4/src/pythongdl.cpp.python 2013-07-26 03:30:32.000000000 -0600
++++ gdl-0.9.4/src/pythongdl.cpp 2013-09-30 10:24:27.092666180 -0600
+@@ -373,7 +373,7 @@ PyObject *GDLSub( PyObject *self, PyObje
+ if( libCall)
+ e = new EnvT( NULL, sub);
+ else
+- e = new EnvUDT( NULL, sub);
++ e = new EnvUDT( NULL, static_cast<DSubUD*>(sub));
+
+ Guard< EnvBaseT> e_guard( e);
+
diff --git a/gdl.spec b/gdl.spec
index 7c548ab..a3af7b2 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,8 +1,8 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: gdl
-Version: 0.9.3
-Release: 10.cvs20130731%{?dist}
+Version: 0.9.4
+Release: 1%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -12,7 +12,6 @@ Source0:
http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{versi
Source1: gdl.csh
Source2: gdl.sh
Source3: makecvstarball
-Patch0: gdl-cvs.patch
# Build with system antlr library. Request for upstream change here:
#
https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&...
Patch1: gdl-antlr-auto.patch
@@ -23,6 +22,9 @@ Patch3: gdl-build.patch
# Patch to support plplot's new width() function
#
https://sourceforge.net/p/gnudatalanguage/patches/70/
Patch4: gdl-plwidth.patch
+# Fix python build
+#
https://sourceforge.net/p/gnudatalanguage/bugs/552/
+Patch5: gdl-python.patch
Patch13: gdl-0.9-antlr-cmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,7 +100,6 @@ Provides: %{name}-runtime = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .cvs
rm -rf src/antlr
%patch13 -p1 -b .antlr
pushd src
@@ -110,8 +111,7 @@ popd
%patch2 -p1 -b .shared
%patch3 -p1 -b .build
%patch4 -p1 -b .plwidth
-rm ltmain.sh
-rm -r CMakeFiles
+%patch5 -p1 -b .python
%global cmake_opts \\\
-DWXWIDGETS=ON \\\
@@ -196,6 +196,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Sep 30 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.9.4-1
+- Update to 0.9.4
+- Update build patch - drop automake components
+- New python patch to fix python build
+
* Tue Aug 27 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.9.3-10.cvs20130804
- Add patch to support new width() method in plplot
diff --git a/sources b/sources
index 2ad5818..9111d52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4a8f64e90dec5de1c89a2aca42d9e75 gdl-0.9.3.tar.gz
+5d8d5783a387cca264fe8edb09e04f10 gdl-0.9.4.tar.gz