The package rpms/gdl.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gdl.git/commit/?id=cfdb7e2fe2faf4....
Change:
+%ifarch ppc64le
Thanks.
Full change:
============
commit cfdb7e2fe2faf4f21b938471ee2ee7cba92036ff
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Fri Jul 27 23:03:31 2018 -0600
Ignore failing tests
diff --git a/gdl.spec b/gdl.spec
index 784ba1b..342d5af 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -197,11 +197,12 @@
failing_tests='test_(bytscl|fft_leak|file_delete|finite|fix|formats|idlneturl|ma
failing_tests="$failing_tests|test_fix"
%endif
%ifarch aarch64
-failing_tests="$failing_tests|test_(l64|wait|xdr)"
+# new test failues - indgen, list -
https://github.com/gnudatalanguage/gdl/issues/372
+failing_tests="$failing_tests|test_(file_lines|indgen|list|l64|wait|xdr)"
%endif
%ifarch %{arm}
# These fail on 32-bit: test_formats test_xdr
-failing_tests="$failing_tests|test_(fix|formats|l64|wait|xdr)"
+failing_tests="$failing_tests|test_(file_lines|fix|formats|indgen|list|l64|wait|xdr)"
%endif
%ifarch %{ix86}
# binfmt -
https://github.com/gnudatalanguage/gdl/issues/332
@@ -209,12 +210,15 @@
failing_tests="$failing_tests|test_(fix|formats|l64|wait|xdr)"
failing_tests="$failing_tests|test_(formats|l64|sem|xdr)"
%endif
%ifarch ppc64
-# new test failues -
https://github.com/gnudatalanguage/gdl/issues/372
-failing_tests="$failing_tests|test_(save_restore|wait|window_background)"
+# new test failues - indgen, list -
https://github.com/gnudatalanguage/gdl/issues/372
+failing_tests="$failing_tests|test_(file_lines|indgen|list|save_restore|wait|window_background)"
%endif
+%ifarch ppc64le
# ppc64le - test_file_lines
https://github.com/gnudatalanguage/gdl/issues/373
+failing_tests="$failing_tests|test_(file_lines|indgen|list)"
+%endif
%ifarch s390x
-failing_tests="$failing_tests|test_(save_restore|window_background)"
+failing_tests="$failing_tests|test_(file_lines|indgen|list|save_restore|window_background)"
%endif
make check VERBOSE=1 ARGS="-V -E '$failing_tests'"
%ifnarch ppc64 s390x
commit 6b687d8f088f517697853165b9965365f6dbf957
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Mon Jul 23 22:07:02 2018 -0600
Fixup and upload source
diff --git a/.gitignore b/.gitignore
index b6391d0..cf56935 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ gdl-0.9rc4.tar.gz
/gdl-0.9.6v2.tgz
/gdl-0.9.7.tgz
/gdl-0.9.8.tgz
+/gdl-0.9.8-git-f3b6e01.tar.gz
diff --git a/gdl.spec b/gdl.spec
index 2b48fa0..784ba1b 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,15 +1,16 @@
%global commit f3b6e012ff645c93268cfb9da7f61792630c34ee
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: gdl
Version: 0.9.8
-Release: 4%{?dist}.20180723gitf3b6e01
+Release: 4%{?dist}.20180723git%{shortcommit}
Summary: GNU Data Language
Group: Applications/Engineering
License: GPLv2+
URL:
http://gnudatalanguage.sourceforge.net/
#Source0:
http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}.tgz
-Source0:
https://github.com/gnudatalanguage/gdl/archive/%{commit}/gdl-%{version}-g...
+Source0:
https://github.com/gnudatalanguage/gdl/archive/%{commit}/gdl-%{version}-g...
Source1: gdl.csh
Source2: gdl.sh
Source4: xorg.conf
diff --git a/sources b/sources
index f616f2e..950ef58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gdl-0.9.8.tgz) =
df7728b6e79a8e812ed022f7fb60d23ad331337d15a77c94d1666a5a1ab63e14c1607520a752ceff999eb65bbde12fa9fffd8d82806455b1c0651cb5f2d92a10
+SHA512 (gdl-0.9.8-git-f3b6e01.tar.gz) =
da07cd62f36e8c392bb45952a77982a3d55c1b0740debfcb277576130983d882c0502056efab1700c7f495b920567f86a8740aae61341ea403e438c55f3d103c
commit c11025f2ff9c240bbe37ea919039e11e11af313b
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Mon Jul 23 21:57:48 2018 -0600
Update to latest git
Switch to eccodes from grib_api for Fedora 28+
diff --git a/gdl-alias.patch b/gdl-alias.patch
deleted file mode 100644
index 39db1c1..0000000
--- a/gdl-alias.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -up gdl-0.9.8/src/basic_pro_jmg.cpp.alias gdl-0.9.8/src/basic_pro_jmg.cpp
---- gdl-0.9.8/src/basic_pro_jmg.cpp.alias 2018-04-11 19:20:07.670748377 -0600
-+++ gdl-0.9.8/src/basic_pro_jmg.cpp 2018-04-12 09:01:16.578294989 -0600
-@@ -23,6 +23,7 @@
-
- #include "envt.hpp"
- #include "dinterpreter.hpp"
-+#include "prognode.hpp"
- #include "basic_pro_jmg.hpp"
-
- #define MAXNDLL 40
-@@ -38,8 +39,8 @@ namespace lib {
-
- using namespace std;
-
-- void (*dynPro[MAXNDLL/2])( EnvT* e);
-- BaseGDL*(*dynFun[MAXNDLL/2])( EnvT* e);
-+ LibPro dynPro[MAXNDLL/2];
-+ LibFun dynFun[MAXNDLL/2];
-
- void point_lun( EnvT* e)
- {
-@@ -141,11 +142,11 @@ namespace lib {
-
- #if defined(_WIN32) && !defined(__CYGWIN__)
- if (funcType == 0) {
-- (void* &) dynPro[count_pro] =
-- (void *) GetProcAddress(module[count], entryName.c_str());
-+ dynPro[count_pro] =
-+ (LibPro) GetProcAddress(module[count], entryName.c_str());
- } else if (funcType == 1) {
-- (BaseGDL* &) dynFun[count_fun] =
-- (BaseGDL*) GetProcAddress(module[count], entryName.c_str());
-+ dynFun[count_fun] =
-+ (LibFun) GetProcAddress(module[count], entryName.c_str());
- } else {
- printf("Improper function type: %d\n", funcType);
- FreeLibrary(module[count]);
-@@ -153,11 +154,11 @@ namespace lib {
- }
- #else
- if (funcType == 0) {
-- (void* &) dynPro[count_pro] =
-- (void *) dlsym(module[count], entryName.c_str());
-+ dynPro[count_pro] =
-+ (LibPro) dlsym(module[count], entryName.c_str());
- } else if (funcType == 1) {
-- (BaseGDL* &) dynFun[count_fun] =
-- (BaseGDL*) dlsym(module[count], entryName.c_str());
-+ dynFun[count_fun] =
-+ (LibFun) dlsym(module[count], entryName.c_str());
- } else {
- printf("Improper function type: %d\n", funcType);
- dlclose(module[count]);
diff --git a/gdl-catch.patch b/gdl-catch.patch
deleted file mode 100644
index a3eb1e9..0000000
--- a/gdl-catch.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -up gdl-0.9.8/src/basic_fun.cpp.catch gdl-0.9.8/src/basic_fun.cpp
---- gdl-0.9.8/src/basic_fun.cpp.catch 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/basic_fun.cpp 2018-03-26 16:54:13.508994366 -0600
-@@ -1505,7 +1505,7 @@ namespace lib {
- if( !compileFlags) GDLInterpreter::ReportCompileError( ex);
- return new DIntGDL( 0);
- }
-- catch( ANTLRException ex)
-+ catch( ANTLRException& ex)
- {
- if( !compileFlags) cerr << "EXECUTE: Lexer/Parser exception: " <<
- ex.getMessage() << endl;
-@@ -1529,7 +1529,7 @@ namespace lib {
- return new DIntGDL( 0);
- }
-
-- catch( ANTLRException ex)
-+ catch( ANTLRException& ex)
- {
- if( !compileFlags) cerr << "EXECUTE: Compiler exception: " <<
- ex.getMessage() << endl;
-@@ -1570,7 +1570,7 @@ namespace lib {
- ex.getMessage() << endl;
- return new DIntGDL( 0);
- }
-- catch( ANTLRException ex)
-+ catch( ANTLRException& ex)
- {
- caller->ResizeForLoops( nForLoopsIn);
-
-@@ -6456,7 +6456,7 @@ template <typename Ty, typename T2> sta
- try {
- oStruct = e->GetObjHeap( objRef);
- }
-- catch ( GDLInterpreter::HeapException )
-+ catch ( GDLInterpreter::HeapException& )
- { // non valid object
- if( count)
- e->SetKW( countIx, new DLongGDL( 0));
-diff -up gdl-0.9.8/src/dinterpreter.cpp.catch gdl-0.9.8/src/dinterpreter.cpp
---- gdl-0.9.8/src/dinterpreter.cpp.catch 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/dinterpreter.cpp 2018-03-26 16:53:15.635298830 -0600
-@@ -143,7 +143,7 @@ DStructGDL* GDLInterpreter::ObjectStruct
- try {
- oStructGDL= GetObjHeap( o);
- }
-- catch ( HeapException)
-+ catch ( HeapException&)
- {
- throw GDLException( mp, "Object not valid: "+Name(self));
- }
-@@ -578,12 +578,12 @@ bool GDLInterpreter::CompileFile(const s
- return false;
- }
- }
-- catch( GDLException e)
-+ catch( GDLException& e)
- {
- ReportCompileError( e, f);
- return false;
- }
-- catch( ANTLRException e)
-+ catch( ANTLRException& e)
- {
- cerr << "Lexer/Parser exception: " << e.getMessage()
<< endl;
- return false;
-@@ -612,13 +612,13 @@ bool GDLInterpreter::CompileFile(const s
-
- if( treeParser.ActiveProCompiled()) RetAll();
- }
-- catch( GDLException e)
-+ catch( GDLException& e)
- {
- ReportCompileError( e, f);
- if( treeParser.ActiveProCompiled()) RetAll();
- return false;
- }
-- catch( ANTLRException e)
-+ catch( ANTLRException& e)
- {
- cerr << "Compiler exception: " << e.getMessage() <<
endl;
- if( treeParser.ActiveProCompiled()) RetAll();
-@@ -705,7 +705,7 @@ DInterpreter::CommandCode DInterpreter::
- // default is more verbose
- CompileFile( argstr); //, origstr);
- }
-- catch( RetAllException)
-+ catch( RetAllException&)
- {
- // delay the RetAllException until finished
- retAll = true;
-@@ -771,7 +771,7 @@ DInterpreter::CommandCode DInterpreter::
- // default is more verbose
- CompileFile( argstr); //, origstr);
- }
-- catch( RetAllException)
-+ catch( RetAllException&)
- {
- // delay the RetAllException until finished
- retAll = true;
-diff -up gdl-0.9.8/src/getfmtast.cpp.catch gdl-0.9.8/src/getfmtast.cpp
---- gdl-0.9.8/src/getfmtast.cpp.catch 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/getfmtast.cpp 2018-03-26 16:54:32.793899215 -0600
-@@ -68,15 +68,15 @@ RefFMTNode GetFMTAST( DString fmtString)
- cout << endl;
- #endif
- }
-- catch( GDLException ex)
-+ catch( GDLException& ex)
- {
- throw GDLException("Format: "+ex.getMessage());
- }
-- catch( antlr::ANTLRException ex)
-+ catch( antlr::ANTLRException& ex)
- {
- throw GDLException("Format parser: "+ex.getMessage());
- }
-- catch( exception ex)
-+ catch( exception& ex)
- {
- throw GDLException("Format exception: "+string(ex.what()));
- }
diff --git a/gdl-cxx11thread.patch b/gdl-cxx11thread.patch
deleted file mode 100644
index 9b9aa5a..0000000
--- a/gdl-cxx11thread.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Ole Streicher <olebole(a)debian.org>
-Description: Fix problems in the release candidate.
---- a/src/dinterpreter.cpp
-+++ b/src/dinterpreter.cpp
-@@ -1270,7 +1270,14 @@
- void *inputThread(void*) {
- #endif
- while (1) {
-- char ch = getchar(); if (ch==EOF) return NULL;
-+ char ch = getchar();
-+ if (ch==EOF) {
-+#ifdef HAVE_CXX11THREAD
-+ return;
-+#else
-+ return NULL;
-+#endif
-+ }
- inputstr += ch;
- if (ch == '\n')
- break;
diff --git a/gdl-return.patch b/gdl-return.patch
deleted file mode 100644
index f506877..0000000
--- a/gdl-return.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-diff -up gdl-0.9.8/src/basic_fun.cpp.return gdl-0.9.8/src/basic_fun.cpp
---- gdl-0.9.8/src/basic_fun.cpp.return 2018-04-11 16:33:39.117920749 -0600
-+++ gdl-0.9.8/src/basic_fun.cpp 2018-04-11 16:33:39.124920716 -0600
-@@ -4420,6 +4420,7 @@ BaseGDL* where_fun(EnvT* e) {
- }
- }
- }
-+ return NULL; // should not reach
- }
- // uses MergeSort
- // 2 parts in the code: without "width" or with "width" (limited
to 1D and 2D)
-@@ -6249,6 +6250,7 @@ template <typename Ty, typename T2> sta
- }
-
- } else e->Throw("Operand must be integer:" + e->GetParString(0));
-+ return NULL; // should not reach
- }
-
- BaseGDL* shift_fun( EnvT* e) {
-@@ -6544,6 +6546,7 @@ template <typename Ty, typename T2> sta
- }
- return res;
- } else e->Throw("Object reference type required in this context: " +
e->GetParString(0));
-+ return NULL; // should not reach
- }
-
- BaseGDL* n_tags( EnvT* e)
-@@ -8328,6 +8331,7 @@ template <typename Ty, typename T2> sta
- }
- }
- e->Throw("Expecting string or byte array as a first parameter");
-+ return NULL; // should not reach
- }
-
- BaseGDL* get_drive_list(EnvT* e)
-@@ -8442,6 +8446,7 @@ template <typename Ty, typename T2> sta
- return res;
-
- }
-+ return NULL; // should not reach
- }
-
- // note: changes here MUST be reflected in scope_varfetch_reference() as well
-diff -up gdl-0.9.8/src/basic_pro_jmg.cpp.return gdl-0.9.8/src/basic_pro_jmg.cpp
---- gdl-0.9.8/src/basic_pro_jmg.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/basic_pro_jmg.cpp 2018-04-11 19:20:07.670748377 -0600
-@@ -589,6 +589,7 @@ namespace lib {
- break;
- }
- assert( false);
-+ return NULL; // Silence warning
- }
-
-
-diff -up gdl-0.9.8/src/graphicsdevice.hpp.return gdl-0.9.8/src/graphicsdevice.hpp
---- gdl-0.9.8/src/graphicsdevice.hpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/graphicsdevice.hpp 2018-04-11 19:21:25.832376682 -0600
-@@ -220,8 +220,8 @@ public:
- virtual void MaxXYSize(DLong *xsize, DLong *ysize) {
- *xsize=1200, *ysize=800; return;}
- virtual DLong GetDecomposed() { return -1;}
-- virtual BaseGDL* GetFontnames() { ThrowGDLException("DEVICE:
Keyword GET_FONTNAMES not allowed for call to: DEVICE" );}//{return NULL;}
-- virtual DLong GetFontnum() { ThrowGDLException("DEVICE:
Keyword GET_FONTNUM not allowed for call to: DEVICE" );}//{return -1;}
-+ virtual BaseGDL* GetFontnames() { ThrowGDLException("DEVICE:
Keyword GET_FONTNAMES not allowed for call to: DEVICE" ); return NULL;}
-+ virtual DLong GetFontnum() { ThrowGDLException("DEVICE:
Keyword GET_FONTNUM not allowed for call to: DEVICE" ); return -1;}
- virtual bool SetFont(DString f) {static int warning_sent=1; if
(warning_sent) {Warning("SET_FONT not active for this device (FIXME).");
warning_sent=0;} return true;}
- virtual DString GetCurrentFont() {return NULL;}
- virtual DLong GetGraphicsFunction() { return -1;}
-@@ -360,8 +360,8 @@ public:
- bool UnsetFocus();
- bool Decomposed(bool value);
- DLong GetDecomposed();
-- BaseGDL* GetFontnames(){ ThrowGDLException("DEVICE: Keyword GET_FONTNAMES not
allowed for call to: DEVICE" );}//{return NULL;}
-- DLong GetFontnum(){ ThrowGDLException("DEVICE: Keyword GET_FONTNUM not allowed
for call to: DEVICE" );}//{return -1;}
-+ BaseGDL* GetFontnames(){ ThrowGDLException("DEVICE: Keyword GET_FONTNAMES not
allowed for call to: DEVICE" ); return NULL;}
-+ DLong GetFontnum(){ ThrowGDLException("DEVICE: Keyword GET_FONTNUM not allowed
for call to: DEVICE" ); return -1;}
- bool SetFont(DString f) {fontname=f; return true;}
- DString GetCurrentFont() {return fontname;}
- bool SetBackingStore(int value);
-diff -up gdl-0.9.8/src/gzstream.hpp.return gdl-0.9.8/src/gzstream.hpp
---- gdl-0.9.8/src/gzstream.hpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/gzstream.hpp 2018-04-11 16:33:39.125920711 -0600
-@@ -75,9 +75,9 @@ public:
- std::streampos pubseekoff(std::streamoff off, std::ios_base::seekdir way,
std::ios_base::openmode which=std::ios_base::in|std::ios_base::out);
- //hacks for not being lost with input gzipped streams
- std::streampos getPosition(){return position;}
-- std::streampos setPosition(long pos){position=pos;}
-- std::streampos incrementPosition(long pos=1){position+=pos;}
-- std::streampos decrementPosition(long pos=1){position-=pos;}
-+ void setPosition(long pos){position=pos;}
-+ void incrementPosition(long pos=1){position+=pos;}
-+ void decrementPosition(long pos=1){position-=pos;}
- };
-
- class gzstreambase : virtual public std::ios {
-diff -up gdl-0.9.8/src/hdf_fun.cpp.return gdl-0.9.8/src/hdf_fun.cpp
---- gdl-0.9.8/src/hdf_fun.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/hdf_fun.cpp 2018-04-11 19:22:44.477002324 -0600
-@@ -106,6 +106,7 @@ namespace lib {
- return new DLongGDL( Vattach(hdf_id, vg_ref, "r"));
- else if (e->KeywordSet( writeIx ))
- return new DLongGDL( Vattach(hdf_id, vg_ref, "w"));
-+ return NULL;
- }
-
-
-diff -up gdl-0.9.8/src/hdf_pro.cpp.return gdl-0.9.8/src/hdf_pro.cpp
---- gdl-0.9.8/src/hdf_pro.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/hdf_pro.cpp 2018-04-11 16:33:39.126920706 -0600
-@@ -34,7 +34,7 @@ namespace lib {
- using namespace std;
-
- template< typename T>
-- BaseGDL* hdf_sd_getdata_template( EnvT* e, dimension dim, int32 sds_id,
-+ void hdf_sd_getdata_template( EnvT* e, dimension dim, int32 sds_id,
- int32 start[], int32 edges[], int32 stride[],
- DLongGDL* strideKW)
- {
-@@ -622,7 +622,7 @@ namespace lib {
- }
-
- template< typename T>
-- BaseGDL* hdf_sd_getdscl_template(EnvT* e, DLong dim_size, int32 dim_id)
-+ void hdf_sd_getdscl_template(EnvT* e, DLong dim_size, int32 dim_id)
- {
- T* data = new T(dimension(dim_size), BaseGDL::NOZERO);
- SDgetdimscale(dim_id, data->DataAddr());
-diff -up gdl-0.9.8/src/list.cpp.return gdl-0.9.8/src/list.cpp
---- gdl-0.9.8/src/list.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/list.cpp 2018-04-11 19:24:14.900571515 -0600
-@@ -149,6 +149,7 @@
- {
- ThrowFromInternalUDSub( e, "SELF object ID <"+i2s(selfID)+">
not found.");
- }
-+ return NULL;
- }
-
- void LIST__ToStream( DStructGDL* oStructGDL, std::ostream& o, SizeT w, SizeT*
actPosPtr)
-diff -up gdl-0.9.8/src/magick_cl.cpp.return gdl-0.9.8/src/magick_cl.cpp
---- gdl-0.9.8/src/magick_cl.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/magick_cl.cpp 2018-04-11 19:27:37.564602966 -0600
-@@ -125,6 +125,7 @@ namespace lib {
- } catch (Exception &error_) {
- e->Throw(error_.what());
- }
-+ return NULL;
- }
-
- BaseGDL * magick_ping(EnvT* e) {
-@@ -332,6 +333,7 @@ namespace lib {
- } catch (Exception &error_) {
- e->Throw(error_.what());
- }
-+ return NULL;
- }
-
- //CLOSE, magic_id
-@@ -411,6 +413,7 @@ namespace lib {
- } catch (Exception &error_) {
- e->Throw(error_.what());
- }
-+ return NULL;
- }
-
- //MAGICK_READCOLORMAPRGB, mid, red, green, blue
-@@ -572,6 +575,7 @@ namespace lib {
- } catch (Exception &error_) {
- e->Throw(error_.what());
- }
-+ return NULL;
- }
-
- // MAGICK_WRITE, mid, gdlImageArray, rgb=rgb
-@@ -706,6 +710,7 @@ namespace lib {
- } catch (Exception &error_) {
- e->Throw(error_.what());
- }
-+ return NULL;
- }
-
- //magickNumber=MAGICK_MAGICK(mid [, "imageType"])
-@@ -727,6 +732,7 @@ namespace lib {
- } catch (Exception &error_) {
- e->Throw(error_.what());
- }
-+ return NULL;
- }
-
- //nrows=MAGICK_ROWS(mid)
-@@ -740,6 +746,7 @@ namespace lib {
- } catch (Exception &error_) {
- e->Throw(error_.what());
- }
-+ return NULL;
- }
-
- //ncols=MAGICK_COLUMNS(mid)
-@@ -753,6 +760,7 @@ namespace lib {
- } catch (Exception &error_) {
- e->Throw(error_.what());
- }
-+ return NULL;
- }
- //bool=MAGICK_INDEXEDCOLOR(mid)
- BaseGDL* magick_IndexedColor(EnvT* e) {
-@@ -769,7 +777,7 @@ namespace lib {
- } catch (Exception &error_) {
- e->Throw(error_.what());
- }
--
-+ return NULL;
- }
-
- //MAGICK_QUALITY, mid, quality
-diff -up gdl-0.9.8/src/math_fun_jmg.cpp.return gdl-0.9.8/src/math_fun_jmg.cpp
---- gdl-0.9.8/src/math_fun_jmg.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/math_fun_jmg.cpp 2018-04-11 19:29:36.258031486 -0600
-@@ -288,6 +288,7 @@ extern "C" {
- return res;
- }
- assert( false);
-+ return NULL;
- }
- };
-
-diff -up gdl-0.9.8/src/math_fun_ng.cpp.return gdl-0.9.8/src/math_fun_ng.cpp
---- gdl-0.9.8/src/math_fun_ng.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/math_fun_ng.cpp 2018-04-11 19:30:57.610639792 -0600
-@@ -371,6 +371,7 @@ namespace lib {
- return Yout;
- }
- assert( false);
-+ return NULL;
- }// RK4_fun
-
- }//namespace
-diff -up gdl-0.9.8/src/plotting_convert_coord.cpp.return
gdl-0.9.8/src/plotting_convert_coord.cpp
---- gdl-0.9.8/src/plotting_convert_coord.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/plotting_convert_coord.cpp 2018-04-11 20:42:10.177037332 -0600
-@@ -368,6 +368,7 @@ namespace lib {
- delete res;
- return res1;
- }
-+ return NULL; // Should not reach
- }
-
- //THE FOLLOWING ARE POSSIBLY THE WORST WAY TO DO THE JOB. At least they are to be used
*only*
-diff -up gdl-0.9.8/src/pythongdl.cpp.return gdl-0.9.8/src/pythongdl.cpp
---- gdl-0.9.8/src/pythongdl.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/pythongdl.cpp 2018-04-11 16:33:39.127920702 -0600
-@@ -272,6 +272,7 @@ int GDLEventHandlerPy()
- GDLEventHandler();
- if( oldInputHook != NULL)
- (*oldInputHook)();
-+ return 0;
- }
-
- // Execute a GDL subroutine
-diff -up gdl-0.9.8/src/triangulation.cpp.return gdl-0.9.8/src/triangulation.cpp
---- gdl-0.9.8/src/triangulation.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/triangulation.cpp 2018-04-11 20:43:03.965777173 -0600
-@@ -1108,6 +1108,7 @@ namespace lib {
- BaseGDL* qgrid3_fun ( EnvT* e)
- {
- e->Throw("Please Write this function in GDL.");
-+ return NULL;
- }
- #endif
- }
-diff -up gdl-0.9.8/src/widget.cpp.return gdl-0.9.8/src/widget.cpp
---- gdl-0.9.8/src/widget.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/widget.cpp 2018-04-11 20:45:36.447036861 -0600
-@@ -45,6 +45,7 @@ wxRealPoint GetRequestedUnitConversionFa
- if (the_units==0) return wxRealPoint(1,1);
- if (the_units==1) return wxRealPoint(sx*25.4,sy*25.4);
- if (the_units==2) return wxRealPoint(sx*10.0,sy*10.0);
-+ return wxRealPoint(0,0); // Should not reach
- }
-
- void GDLWidget::ChangeUnitConversionFactor( EnvT* e)
-@@ -2231,6 +2232,7 @@ endwait:
- }
- } while (infinity);
- #endif
-+ return NULL; // Should not reach
- }
-
- void widget_control( EnvT* e ) {
diff --git a/gdl-saverestore.patch b/gdl-saverestore.patch
deleted file mode 100644
index ffaff91..0000000
--- a/gdl-saverestore.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up gdl-0.9.8/src/saverestore.cpp.return gdl-0.9.8/src/saverestore.cpp
---- gdl-0.9.8/src/saverestore.cpp.return 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/saverestore.cpp 2018-04-11 16:33:39.129920693 -0600
-@@ -164,6 +164,7 @@ namespace lib {
-
- uint32_t writeEnd(XDR *xdrs) {
- uint32_t cur=writeNewRecordHeader(xdrs, 6);
-+ return cur;
- }
-
- int getVersion(XDR* xdrs) {
diff --git a/gdl-sign.patch b/gdl-sign.patch
deleted file mode 100644
index 2f459eb..0000000
--- a/gdl-sign.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -up gdl-0.9.8/src/dinterpreter.cpp.sign gdl-0.9.8/src/dinterpreter.cpp
---- gdl-0.9.8/src/dinterpreter.cpp.sign 2018-04-14 20:29:23.612484457 -0600
-+++ gdl-0.9.8/src/dinterpreter.cpp 2018-04-14 20:29:23.628484629 -0600
-@@ -666,7 +666,7 @@ DInterpreter::CommandCode DInterpreter::
- DInterpreter::CommandCode DInterpreter::CmdCompile( const string& command)
- {
- string cmdstr = command;
-- int sppos = cmdstr.find(" ",0);
-+ size_t sppos = cmdstr.find(" ",0);
- if (sppos == string::npos)
- {
- cout << "Interactive COMPILE not implemented yet." << endl;
-@@ -676,7 +676,7 @@ DInterpreter::CommandCode DInterpreter::
- bool retAll = false; // Remember if Retall is needed
-
- // Parse each file name
-- int pos = sppos + 1;
-+ size_t pos = sppos + 1;
- while (pos < command.length())
- {
- sppos = command.find(" ",pos);
-@@ -737,7 +737,7 @@ DInterpreter::CommandCode DInterpreter::
- bool retAll = false; // Remember if Retall is needed
-
- // Parse each file name
-- int pos = sppos + 1;
-+ size_t pos = sppos + 1;
- while (pos < command.length())
- {
- sppos = command.find(" ",pos);
-@@ -799,7 +799,7 @@ DInterpreter::CommandCode DInterpreter::
- {
- string cmdstr = command;
- string args;
-- int sppos = cmdstr.find(" ",0);
-+ size_t sppos = cmdstr.find(" ",0);
- if (sppos != string::npos) {
- args = cmdstr.substr(sppos+1);
- cmdstr = cmdstr.substr(0, sppos);
-diff -up gdl-0.9.8/src/GDLLexer.cpp.sign gdl-0.9.8/src/GDLLexer.cpp
---- gdl-0.9.8/src/GDLLexer.cpp.sign 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/GDLLexer.cpp 2018-04-14 20:30:05.656936102 -0600
-@@ -434,7 +434,7 @@ void GDLLexer::mINCLUDE(bool _createToke
- std::string name = f->getText();
-
- // find comments on the same line
-- long pos = name.find_first_of(';', 0);
-+ size_t pos = name.find_first_of(';', 0);
- if( pos != std::string::npos) // remove them
- name = name.substr(0, pos);
-
-diff -up gdl-0.9.8/src/GDLParser.cpp.sign gdl-0.9.8/src/GDLParser.cpp
---- gdl-0.9.8/src/GDLParser.cpp.sign 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/GDLParser.cpp 2018-04-14 20:29:23.630484650 -0600
-@@ -6773,7 +6773,7 @@ void GDLParser::arrayindex_list() {
- antlr::ASTPair currentAST;
- RefDNode arrayindex_list_AST = RefDNode(antlr::nullAST);
-
-- int rank = 1;
-+ SizeT rank = 1;
-
-
- if ((LA(1) == LSQUARE)) {
diff --git a/gdl-std.patch b/gdl-std.patch
deleted file mode 100644
index d60ec37..0000000
--- a/gdl-std.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up gdl-0.9.8/src/basic_fun.cpp.std gdl-0.9.8/src/basic_fun.cpp
---- gdl-0.9.8/src/basic_fun.cpp.std 2018-04-11 09:17:16.200257202 -0600
-+++ gdl-0.9.8/src/basic_fun.cpp 2018-04-11 09:20:12.854448333 -0600
-@@ -111,6 +111,7 @@ namespace lib {
- std::vector<char*> command_line_args;
-
- // using namespace std;
-+ using std::isinf;
- using std::isnan;
- using namespace antlr;
-
diff --git a/gdl-uninit.patch b/gdl-uninit.patch
deleted file mode 100644
index 002ec09..0000000
--- a/gdl-uninit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gdl-0.9.8/src/GDLInterpreter.cpp.uninit gdl-0.9.8/src/GDLInterpreter.cpp
---- gdl-0.9.8/src/GDLInterpreter.cpp.uninit 2018-04-11 16:33:42.112906758 -0600
-+++ gdl-0.9.8/src/GDLInterpreter.cpp 2018-04-11 22:14:29.401901171 -0600
-@@ -2905,7 +2905,7 @@ void GDLInterpreter::tag_array_expr(Prog
- BaseGDL* GDLInterpreter::r_dot_indexable_expr(ProgNodeP _t,
- DotAccessDescT* aD
- ) {
-- BaseGDL* res;
-+ BaseGDL* res = NULL;
- ProgNodeP r_dot_indexable_expr_AST_in = (_t == ProgNodeP(ASTNULL)) ?
ProgNodeP(antlr::nullAST) : _t;
-
- switch ( _t->getType()) {
diff --git a/gdl-vector.patch b/gdl-vector.patch
deleted file mode 100644
index a183dd9..0000000
--- a/gdl-vector.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up gdl-0.9.8/src/medianfilter.cpp.vector gdl-0.9.8/src/medianfilter.cpp
---- gdl-0.9.8/src/medianfilter.cpp.vector 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/medianfilter.cpp 2018-05-20 15:19:38.072948145 -0600
-@@ -673,8 +673,8 @@ static inline void histogram_add( const
- #elif defined(__ALTIVEC__)
- static inline void histogram_add( const uint16_t x[16], uint16_t y[16] )
- {
-- *(vector unsigned short*) &y[0] = vec_add( *(vector unsigned short*) &y[0],
*(vector unsigned short*) &x[0] );
-- *(vector unsigned short*) &y[8] = vec_add( *(vector unsigned short*) &y[8],
*(vector unsigned short*) &x[8] );
-+ *(__vector unsigned short*) &y[0] = vec_add( *(__vector unsigned short*)
&y[0], *(__vector unsigned short*) &x[0] );
-+ *(__vector unsigned short*) &y[8] = vec_add( *(__vector unsigned short*)
&y[8], *(__vector unsigned short*) &x[8] );
- }
- #else
- static inline void histogram_add( const uint16_t x[16], uint16_t y[16] )
-@@ -707,8 +707,8 @@ static inline void histogram_sub( const
- #elif defined(__ALTIVEC__)
- static inline void histogram_sub( const uint16_t x[16], uint16_t y[16] )
- {
-- *(vector unsigned short*) &y[0] = vec_sub( *(vector unsigned short*) &y[0],
*(vector unsigned short*) &x[0] );
-- *(vector unsigned short*) &y[8] = vec_sub( *(vector unsigned short*) &y[8],
*(vector unsigned short*) &x[8] );
-+ *(__vector unsigned short*) &y[0] = vec_sub( *(__vector unsigned short*)
&y[0], *(__vector unsigned short*) &x[0] );
-+ *(__vector unsigned short*) &y[8] = vec_sub( *(__vector unsigned short*)
&y[8], *(__vector unsigned short*) &x[8] );
- }
- #else
- static inline void histogram_sub( const uint16_t x[16], uint16_t y[16] )
diff --git a/gdl-warnings.patch b/gdl-warnings.patch
deleted file mode 100644
index 1ffab49..0000000
--- a/gdl-warnings.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up gdl-0.9.8/src/gdlc.g.warnings gdl-0.9.8/src/gdlc.g
---- gdl-0.9.8/src/gdlc.g.warnings 2018-03-26 03:57:27.000000000 -0600
-+++ gdl-0.9.8/src/gdlc.g 2018-04-14 21:04:41.196663086 -0600
-@@ -1217,7 +1217,7 @@ numeric_constant!//
-
- arrayindex_list
- {
-- int rank = 1;
-+ SizeT rank = 1;
- }
- : LSQUARE! arrayindex ({++rank <= MAXRANK}? COMMA! arrayindex)* RSQUARE!
- | { IsRelaxed()}? LBRACE! arrayindex
-@@ -1948,7 +1948,7 @@ tokens {
- {
- // Stuff for include files (@filename)
- private:
-- std::auto_ptr<std::ifstream> inputFile; // stores ifsteam* and deletes
-+ std::unique_ptr<std::ifstream> inputFile; // stores ifsteam* and deletes
- // it when it is deleted itself
-
- antlr::TokenStreamSelector* selector;
-@@ -2071,7 +2071,7 @@ INCLUDE!
- std::string name = f->getText();
-
- // find comments on the same line
-- long pos = name.find_first_of(';', 0);
-+ size_t pos = name.find_first_of(';', 0);
- if( pos != std::string::npos) // remove them
- name = name.substr(0, pos);
-
diff --git a/gdl.spec b/gdl.spec
index 724e961..2b48fa0 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,39 +1,21 @@
+%global commit f3b6e012ff645c93268cfb9da7f61792630c34ee
+
Name: gdl
Version: 0.9.8
-Release: 3%{?dist}
+Release: 4%{?dist}.20180723gitf3b6e01
Summary: GNU Data Language
Group: Applications/Engineering
License: GPLv2+
URL:
http://gnudatalanguage.sourceforge.net/
-Source0:
http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}.tgz
+#Source0:
http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}.tgz
+Source0:
https://github.com/gnudatalanguage/gdl/archive/%{commit}/gdl-%{version}-g...
Source1: gdl.csh
Source2: gdl.sh
-Source3: makecvstarball
Source4: xorg.conf
# Build with system antlr library. Request for upstream change here:
#
https://sourceforge.net/tracker/index.php?func=detail&aid=2685215&...
Patch1: gdl-antlr.patch
-# Catch by reference
-#
https://github.com/gnudatalanguage/gdl/pull/5
-Patch2: gdl-catch.patch
-#
https://github.com/gnudatalanguage/gdl/pull/142
-Patch3: gdl-std.patch
-# Silence some (harmless) warnings about return values
-Patch4: gdl-return.patch
-#
https://github.com/gnudatalanguage/gdl/pull/274
-Patch5: gdl-sign.patch
-#
https://github.com/gnudatalanguage/gdl/pull/275
-Patch6: gdl-uninit.patch
-# Fix -Wstrict-aliasing warning
-#
https://github.com/gnudatalanguage/gdl/pull/162
-Patch7: gdl-alias.patch
-#
https://github.com/gnudatalanguage/gdl/pull/276
-Patch8: gdl-warnings.patch
-#
-Patch9: gdl-vector.patch
-# Fix test_save_restore segfault with gcc 8
-Patch10: gdl-saverestore.patch
#RHEL5 doesn't have the needed antlr version/headers, has old plplot
%if 0%{?rhel} == 5
@@ -56,20 +38,24 @@ BuildRequires: gsl-devel, plplot-devel, GraphicsMagick-c++-devel
BuildRequires: netcdf-devel, hdf5-devel, libjpeg-devel
BuildRequires: python2-devel, python2-numpy, python2-matplotlib
BuildRequires: fftw-devel, hdf-static
-%if 0%{?fedora} >= 21
+%if 0%{?fedora}
+%if 0%{?fedora} >= 28
+%else
+BuildRequires: eccodes-devel
+%endif
BuildRequires: grib_api-devel
%else
-%if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: grib_api-static
%endif
-%endif
BuildRequires: eigen3-static
+BuildRequires: libgeotiff-devel
+BuildRequires: libtiff-devel
BuildRequires: libtirpc-devel
#TODO - Build with mpi support
#BuildRequires: mpich2-devel
BuildRequires: pslib-devel
# qhull too old on Fedora 24 and EPEL7
-%if 0%{?fedora} >= 25 || 0%{?rhel} >= 8
+%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: qhull-devel
%global cmake_qhull -DQHULL=ON
%endif
@@ -97,9 +83,7 @@ Systems Inc.
Summary: Common files for GDL
Group: Applications/Engineering
Requires: %{name}-runtime = %{version}-%{release}
-%if 0%{?fedora} || 0%{?rhel} >= 6
BuildArch: noarch
-%endif
%description common
Common files for GDL
@@ -123,20 +107,9 @@ Provides: %{name}-runtime = %{version}-%{release}
%prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{commit}
rm -rf src/antlr
%patch1 -p1 -b .antlr
-%patch2 -p1 -b .catch
-%patch3 -p1 -b .std
-%patch4 -p1 -b .return
-%patch5 -p1 -b .sign
-%patch6 -p1 -b .uninit
-%patch7 -p1 -b .alias
-%patch8 -p1 -b .warnings
-%patch9 -p1 -b .vector
-%patch10 -p1 -b .saverestore
-# Stray link
-rm src/gdl
pushd src
for f in *.g
@@ -147,6 +120,7 @@ popd
%global cmake_opts \\\
-DWXWIDGETS=ON \\\
+ -DGEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \\\
-DUDUNITS=ON \\\
-DUDUNITS_INCLUDE_DIR=%{_includedir}/udunits2 \\\
-DGRIB=ON \\\
@@ -159,8 +133,6 @@ popd
# --with-mpich=%{_libdir}/mpich2 \
%build
-export CFLAGS="%{optflags} -I%{_includedir}/tirpc -ltirpc"
-export CXXFLAGS="%{optflags} -I%{_includedir}/tirpc -ltirpc"
mkdir build build-python
#Build the standalone executable
pushd build
@@ -206,17 +178,17 @@ export DISPLAY=:99
metacity &
sleep 2
+# bytscl -
https://github.com/gnudatalanguage/gdl/issues/159
# fft_leak -
https://github.com/gnudatalanguage/gdl/issues/147
# file_delete -
https://github.com/gnudatalanguage/gdl/issues/148
# fix -
https://github.com/gnudatalanguage/gdl/issues/149
# formats -
https://github.com/gnudatalanguage/gdl/issues/144
# n_tags -
https://github.com/gnudatalanguage/gdl/issues/150
-# obj_isa -
https://github.com/gnudatalanguage/gdl/issues/151
# parse_url -
https://github.com/gnudatalanguage/gdl/issues/153
# resolve_routine -
https://github.com/gnudatalanguage/gdl/issues/146
# rounding -
https://github.com/gnudatalanguage/gdl/issues/154
# total -
https://github.com/gnudatalanguage/gdl/issues/155
-failing_tests='test_(fft_leak|file_delete|finite|fix|formats|idlneturl|make_dll|n_tags|obj_isa|parse_url|resolve_routine|rounding|total)'
+failing_tests='test_(bytscl|fft_leak|file_delete|finite|fix|formats|idlneturl|make_dll|n_tags|parse_url|resolve_routine|rounding|total)'
%ifarch aarch64 ppc %{power64}
# test_fix fails currently on arm
#
https://sourceforge.net/p/gnudatalanguage/bugs/622/
@@ -231,19 +203,22 @@ failing_tests="$failing_tests|test_(l64|wait|xdr)"
failing_tests="$failing_tests|test_(fix|formats|l64|wait|xdr)"
%endif
%ifarch %{ix86}
+# binfmt -
https://github.com/gnudatalanguage/gdl/issues/332
# These fail on 32-bit: test_formats test_xdr
failing_tests="$failing_tests|test_(formats|l64|sem|xdr)"
%endif
%ifarch ppc64
+# new test failues -
https://github.com/gnudatalanguage/gdl/issues/372
failing_tests="$failing_tests|test_(save_restore|wait|window_background)"
%endif
+# ppc64le - test_file_lines
https://github.com/gnudatalanguage/gdl/issues/373
%ifarch s390x
failing_tests="$failing_tests|test_(save_restore|window_background)"
%endif
-make check ARGS="-V -E '$failing_tests'"
+make check VERBOSE=1 ARGS="-V -E '$failing_tests'"
%ifnarch ppc64 s390x
# test_save_restore hangs on ppc64 s390x
-make check ARGS="-V -R '$failing_tests'" || :
+make check VERBOSE=1 ARGS="-V -R '$failing_tests'" || :
%endif
kill %1 || :
cat xorg.log
@@ -251,7 +226,7 @@ cat xorg.log
%files
%license COPYING
-%doc AUTHORS ChangeLog HACKING NEWS README TODO
+%doc AUTHORS ChangeLog HACKING NEWS README
%config(noreplace) %{_sysconfdir}/profile.d/gdl.*sh
%{_bindir}/gdl
%{_mandir}/man1/gdl.1*
@@ -264,6 +239,10 @@ cat xorg.log
%changelog
+* Mon Jul 23 2018 Orion Poplawski <orion(a)nwra.com> - 0.9.8-4.20180723gitf3b6e01
+- Update to latest git
+- Switch to eccodes from grib_api for Fedora 28+
+
* Sun Jul 22 2018 Scott Talbert <swt(a)techie.net> - 0.9.8-3
- Rebuild with wxWidgets 3.0
diff --git a/makecvstarball b/makecvstarball
deleted file mode 100755
index 5dcd66c..0000000
--- a/makecvstarball
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-ver=$1
-date=`date +%Y%m%d`
-cvs -z3 -d
:pserver:anonymous@gnudatalanguage.cvs.sourceforge.net:/cvsroot/gnudatalanguage export -D
${date} -d gdl-${ver}-${date} gdl
-tar caf gdl-${ver}-${date}.tar.xz gdl-${ver}-${date}
commit 6b930442c5e88a62745f17abfb160a04d08ed00d
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Sun Jul 22 22:39:21 2018 -0600
Fix date
diff --git a/gdl.spec b/gdl.spec
index 5fda38f..724e961 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -264,7 +264,7 @@ cat xorg.log
%changelog
-* Sat Jul 07 2018 Scott Talbert <swt(a)techie.net> - 0.9.8-3
+* Sun Jul 22 2018 Scott Talbert <swt(a)techie.net> - 0.9.8-3
- Rebuild with wxWidgets 3.0
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.8-2
commit 061f64a7e526ba6c075859b8a1b428fc38d8210d
Author: Scott Talbert <swt(a)techie.net>
Date: Sat Jul 7 00:41:30 2018 -0400
Rebuild with wxWidgets 3.0
diff --git a/gdl.spec b/gdl.spec
index d090075..5fda38f 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,6 +1,6 @@
Name: gdl
Version: 0.9.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -74,7 +74,7 @@ BuildRequires: qhull-devel
%global cmake_qhull -DQHULL=ON
%endif
BuildRequires: udunits2-devel
-BuildRequires: wxGTK-devel
+BuildRequires: wxGTK3-devel
BuildRequires: cmake
# For tests
BuildRequires: xorg-x11-drv-dummy
@@ -264,6 +264,9 @@ cat xorg.log
%changelog
+* Sat Jul 07 2018 Scott Talbert <swt(a)techie.net> - 0.9.8-3
+- Rebuild with wxWidgets 3.0
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.8-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 74b9a3fe63743f1952a9181d0d017b2abb5eb6b3
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 01:14:11 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/gdl.spec b/gdl.spec
index ddd0c36..d090075 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -1,6 +1,6 @@
Name: gdl
Version: 0.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@@ -264,6 +264,9 @@ cat xorg.log
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.8-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Sun May 20 2018 Orion Poplawski <orion(a)cora.nwra.com> - 0.9.8-1
- Update to 0.9.8
- Drop parallel make for now
commit ecfd361e6a9976e99876e56647dcecc2c7422915
Author: Igor Gnatenko <ignatenko(a)redhat.com>
Date: Mon Jul 9 19:06:44 2018 +0200
add BuildRequires: gcc-c++
Reference:
https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
diff --git a/gdl.spec b/gdl.spec
index 7972a45..ddd0c36 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -42,6 +42,7 @@ Patch10: gdl-saverestore.patch
%global plplot_config %{nil}
%endif
%if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires: gcc-c++
BuildRequires: antlr-C++
BuildRequires: antlr-tool
BuildRequires: java-devel
commit 0c2aa245c2a7fcadc571180f2580f3fcd31caa8d
Author: Orion Poplawski <orion(a)cora.nwra.com>
Date: Mon May 21 21:51:17 2018 -0600
More failing tests
diff --git a/gdl.spec b/gdl.spec
index 42a6b0f..7972a45 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -234,7 +234,7 @@
failing_tests="$failing_tests|test_(fix|formats|l64|wait|xdr)"
failing_tests="$failing_tests|test_(formats|l64|sem|xdr)"
%endif
%ifarch ppc64
-failing_tests="$failing_tests|test_(save_restore|window_background)"
+failing_tests="$failing_tests|test_(save_restore|wait|window_background)"
%endif
%ifarch s390x
failing_tests="$failing_tests|test_(save_restore|window_background)"