rpms/gdl
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.9.3

Browse Source 
Rebase antlr-auto patch
This commit is contained in:
Orion Poplawski 2012-12-27 16:31:31 -07:00
parent f7a91f8db4
commit 4ed52cc12f
5 changed files with 23 additions and 56389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ gdl-0.9rc4.tar.gz
/gdl-0.9.tar.gz
/gdl-0.9.1.tar.gz
/gdl-0.9.2.tar.gz
/gdl-0.9.3.tar.gz

56371
gdl-0.9.2-cvs.patch
View File

File diff suppressed because it is too large Load Diff

26
gdl-antlr-auto.patch
View File

@ -1,27 +1,27 @@
diff -up gdl-0.9.1/configure.in.antlr-auto gdl-0.9.1/configure.in
--- gdl-0.9.1/configure.in.antlr-auto 2011-10-25 16:29:31.908423227 -0600
+++ gdl-0.9.1/configure.in 2011-10-25 16:29:32.705394481 -0600
@@ -1108,7 +1108,7 @@ dnl AC_CHECK_FUNCS(strdup strtod strtol
diff -up gdl-0.9.3/configure.in.antlr-auto gdl-0.9.3/configure.in
--- gdl-0.9.3/configure.in.antlr-auto 2012-12-27 09:22:45.000000000 -0700
+++ gdl-0.9.3/configure.in 2012-12-27 16:29:27.602699881 -0700
@@ -1180,7 +1180,7 @@ dnl AC_CHECK_FUNCS(strdup strtod strtol
dnl perform program name transformation
dnl AC_ARG_PROGRAM
-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile src/pro/Makefile src/pro/dicom/Makefile src/pro/envi/Makefile testsuite/Makefile doc/Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile src/pro/Makefile src/pro/dicom/Makefile src/pro/envi/Makefile testsuite/Makefile doc/Makefile)
AC_OUTPUT
dnl == summary table =======================================
diff -up gdl-0.9.1/src/Makefile.am.antlr-auto gdl-0.9.1/src/Makefile.am
--- gdl-0.9.1/src/Makefile.am.antlr-auto 2011-10-25 16:29:32.521401116 -0600
+++ gdl-0.9.1/src/Makefile.am 2011-10-25 16:29:59.176439745 -0600
diff -up gdl-0.9.3/src/Makefile.am.antlr-auto gdl-0.9.3/src/Makefile.am
--- gdl-0.9.3/src/Makefile.am.antlr-auto 2012-12-27 09:22:44.000000000 -0700
+++ gdl-0.9.3/src/Makefile.am 2012-12-27 16:29:41.153584841 -0700
@@ -1,6 +1,6 @@
# set the include path found by configure
INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr pro
+SUBDIRS = pro
cpp_hpp_files = allix.hpp allix.cpp prognode.hpp prognodeexpr.hpp \
accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
@@ -61,7 +61,7 @@ gdl_SOURCES = $(cpp_hpp_files) gdl.cpp l
cpp_hpp_files = overload.hpp overload.cpp nullgdl.hpp nullgdl.cpp allix.hpp allix.cpp prognode.hpp \
prognodeexpr.hpp accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
@@ -65,7 +65,7 @@ gdl_SOURCES = $(cpp_hpp_files) gdl.cpp l
gdl_CXXFLAGS = $(AM_CXXFLAGS)
# the library search path.
gdl_LDFLAGS = $(all_libraries)
@ -30,7 +30,7 @@ diff -up gdl-0.9.1/src/Makefile.am.antlr-auto gdl-0.9.1/src/Makefile.am
endif
# build as library (for python module)
@@ -77,6 +77,6 @@ else
@@ -81,6 +81,6 @@ else
libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
endif

12
gdl.spec
View File

@ -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.2
Release: 10.cvs20120717%{?dist}
Version: 0.9.3
Release: 1%{?dist}
Summary: GNU Data Language
Group: Applications/Engineering
@ -12,7 +12,7 @@ Source0: http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{versi
Source1: gdl.csh
Source2: gdl.sh
Source3: makecvstarball
Patch0: gdl-0.9.2-cvs.patch
#Patch0: gdl-0.9.2-cvs.patch
# 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
@ -82,7 +82,7 @@ Provides: %{name}-runtime = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .cvs
#patch0 -p1 -b .cvs
%if 0%{?fedora}
%patch1 -p1 -b .antlr-auto
rm -rf src/antlr
@ -177,6 +177,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Dec 27 2012 Orion Poplawski <orion@cora.nwra.com> - 0.9.3-1
- Update to 0.9.3
- Rebase antlr-auto patch
* Mon Dec 3 2012 Orion Poplawski <orion@cora.nwra.com> - 0.9.2-10.cvs20120717
- Rebuild for hdf5 1.8.10

2
sources
View File

@ -1 +1 @@
7178304e6737a8dca910d2c1061ff63c gdl-0.9.2.tar.gz
f4a8f64e90dec5de1c89a2aca42d9e75 gdl-0.9.3.tar.gz