rpms/gdl/F-11 gdl-0.9rc2-20090504-antlr-auto.patch, NONE, 1.1 gdl-0.9rc3-antlr.patch, NONE, 1.1 import.log, NONE, 1.1 makecvstarball, NONE, 1.1 .cvsignore, 1.13, 1.14 gdl.spec, 1.47, 1.48 sources, 1.13, 1.14 gdl-0.9pre5-ppc64.patch, 1.1, NONE gdl-0.9pre6-plplot.patch, 1.1, NONE gdl-0.9rc1-gcc43.patch, 1.2, NONE gdl-0.9rc2-20090224-friend.patch, 1.1, NONE gdl-0.9rc2-20090312-antlr.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/gdl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20626/F-11

Modified Files:
	.cvsignore gdl.spec sources 
Added Files:
	gdl-0.9rc2-20090504-antlr-auto.patch gdl-0.9rc3-antlr.patch 
	import.log makecvstarball 
Removed Files:
	gdl-0.9pre5-ppc64.patch gdl-0.9pre6-plplot.patch 
	gdl-0.9rc1-gcc43.patch gdl-0.9rc2-20090224-friend.patch 
	gdl-0.9rc2-20090312-antlr.patch 
Log Message:
Update to 0.9rc3 from devel

gdl-0.9rc2-20090504-antlr-auto.patch:
 configure.in    |    2 +-
 src/Makefile.am |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE gdl-0.9rc2-20090504-antlr-auto.patch ---
--- gdl-0.9rc2-20090504/configure.in.antlr-auto	2009-04-30 16:07:55.000000000 -0600
+++ gdl-0.9rc2-20090504/configure.in	2009-05-04 16:17:25.000000000 -0600
@@ -842,7 +842,7 @@
 dnl perform program name transformation
 dnl AC_ARG_PROGRAM
 
-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile)
 
 AC_OUTPUT
 
--- gdl-0.9rc2-20090504/src/Makefile.am.antlr-auto	2009-03-03 16:32:14.000000000 -0700
+++ gdl-0.9rc2-20090504/src/Makefile.am	2009-05-04 16:17:18.000000000 -0600
@@ -1,6 +1,5 @@
 # set the include path found by configure
 INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr
 noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
 
 cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
@@ -53,7 +52,7 @@
 gdl_CXXFLAGS = $(AM_CXXFLAGS)
 # the library search path.
 gdl_LDFLAGS = $(all_libraries)
-gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 endif
 
 # build as library (for python module)
@@ -69,6 +68,6 @@
 libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
 endif 
 
-libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 endif
 

gdl-0.9rc3-antlr.patch:
 configure       |    3 +--
 src/Makefile.in |    9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

--- NEW FILE gdl-0.9rc3-antlr.patch ---
--- gdl-0.9rc3/configure.antlr	2009-09-11 10:04:09.000000000 -0600
+++ gdl-0.9rc3/configure	2009-10-15 11:11:06.707875846 -0600
@@ -23525,7 +23525,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/antlr/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -24130,7 +24130,6 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/antlr/Makefile") CONFIG_FILES="$CONFIG_FILES src/antlr/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--- gdl-0.9rc3/src/Makefile.in.antlr	2009-09-11 10:04:09.000000000 -0600
+++ gdl-0.9rc3/src/Makefile.in	2009-10-15 11:10:12.689817337 -0600
@@ -55,7 +55,7 @@
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 @BUILDASLIBRARY_TRUE at libgdl_la_DEPENDENCIES =  \
- at BUILDASLIBRARY_TRUE@	$(top_builddir)/src/antlr/libantlr.la
+ at BUILDASLIBRARY_TRUE@	-lantlr
 am__libgdl_la_SOURCES_DIST = accessdesc.hpp arrayindex.hpp \
 	assocdata.cpp assocdata.hpp basegdl.hpp basic_fun_cl.cpp \
 	basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp basic_fun_jmg.cpp \
@@ -236,7 +236,7 @@
 @BUILDASLIBRARY_FALSE@	gdl-gdl.$(OBJEXT)
 gdl_OBJECTS = $(am_gdl_OBJECTS)
 @BUILDASLIBRARY_FALSE at gdl_DEPENDENCIES =  \
- at BUILDASLIBRARY_FALSE@	$(top_builddir)/src/antlr/libantlr.a
+ at BUILDASLIBRARY_FALSE@	-lantlr
 gdl_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(gdl_CXXFLAGS) $(CXXFLAGS) \
 	$(gdl_LDFLAGS) $(LDFLAGS) -o $@
@@ -395,7 +395,6 @@
 
 # set the include path found by configure
 INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr
 noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
 cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
 		basegdl.hpp basic_fun_cl.cpp basic_fun_cl.hpp basic_fun.cpp basic_fun.hpp \
@@ -442,7 +441,7 @@
 @BUILDASLIBRARY_FALSE at gdl_CXXFLAGS = $(AM_CXXFLAGS)
 # the library search path.
 @BUILDASLIBRARY_FALSE at gdl_LDFLAGS = $(all_libraries)
- at BUILDASLIBRARY_FALSE@gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+ at BUILDASLIBRARY_FALSE@gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 
 # build as library (for python module)
 @BUILDASLIBRARY_TRUE at lib_LTLIBRARIES = libgdl.la
@@ -452,7 +451,7 @@
 # netCDF and HDF define some same symbols
 # hence -z muldefs has to be passed to the linker
 @BUILDASLIBRARY_TRUE@@DARWIN_TRUE at libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m
- at BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
+ at BUILDASLIBRARY_TRUE@libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
 all: all-recursive
 
 .SUFFIXES:


--- NEW FILE import.log ---
gdl-0_9-0_7_rc3_fc13:F-11:gdl-0.9-0.7.rc3.fc13.src.rpm:1255641791


--- NEW FILE makecvstarball ---
#!/bin/sh
if [ -n "$" ]
then
   date=$1
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.9rc2-${date} gdl
tar cjf gdl-0.9rc2-${date}.tar.bz2 gdl-0.9rc2-${date}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	12 Mar 2009 14:55:31 -0000	1.13
+++ .cvsignore	15 Oct 2009 21:23:25 -0000	1.14
@@ -1 +1 @@
-gdl-0.9rc2-20090312.tar.bz2
+gdl-0.9rc3.tar.gz


Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-11/gdl.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- gdl.spec	16 Mar 2009 15:21:05 -0000	1.47
+++ gdl.spec	15 Oct 2009 21:23:25 -0000	1.48
@@ -2,34 +2,37 @@
 
 Name:           gdl
 Version:        0.9
-Release:        0.5.rc2.20090312%{?dist}
+Release:        0.7.rc3%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://gnudatalanguage.sourceforge.net/
-#Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2.tar.bz2
-# cvs -z3 -d :pserver:anonymous at gnudatalanguage.cvs.sourceforge.net:/cvsroot/gnudatalanguage export -D 20090312 -d gdl-0.9rc2-20090312 gdl
-# tar cjf gdl-0.9rc2-20090312.tar.bz2 gdl-0.9rc2-20090312
-Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2-20090312.tar.bz2
+Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc3.tar.gz
+# Made with makecvstarball
+#Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2-20090603.tar.bz2
 Source1:        gdl.csh
 Source2:        gdl.sh
-Patch1:         gdl-0.9pre5-ppc64.patch
-Patch2:         gdl-0.9rc1-gcc43.patch
+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
-Patch3:         gdl-0.9rc2-20090312-antlr.patch
-# gcc 4.4.0 catches more class issues - add needed friend
-# https://sourceforge.net/tracker/index.php?func=detail&aid=2634356&group_id=97659&atid=618683
-Patch4:         gdl-0.9rc2-20090224-friend.patch
+Patch3:         gdl-0.9rc3-antlr.patch
+Patch4:         gdl-0.9rc2-20090504-antlr-auto.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+#RHEL doesn't have the needed antlr version/headers, old plplot
+%if !0%{?rhel}
 BuildRequires:  antlr
+%define plplot_config %{nil}
+%else
+%define plplot_config --enable-oldplplot
+%endif
 BuildRequires:  readline-devel, ncurses-devel
 BuildRequires:  gsl-devel, plplot-devel, ImageMagick-c++-devel
 BuildRequires:  netcdf-devel, hdf5-devel, libjpeg-devel
 BuildRequires:  python-devel, python-numarray, python-matplotlib
 BuildRequires:  fftw-devel, hdf-devel, proj-devel
+BuildRequires:  autoconf, automake, libtool
 # Needed to pull in drivers
 Requires:       plplot
 Requires:       %{name}-common = %{version}-%{release}
@@ -46,25 +49,31 @@ Systems Inc.
 Summary:        Common files for GDL
 Group:          Applications/Engineering
 Requires:       %{name}-runtime = %{version}-%{release}
+%if !0%{?rhel}
 BuildArch:      noarch
+%endif
 
 %description    common
 Common files for GDL
 
 
 %prep
-%setup -q -n %{name}-%{version}rc2-20090312
-%patch1 -p1 -b .ppc64
-%patch2 -p1 -b .gcc43
+%setup -q -n %{name}-%{version}rc3
+%if !0%{?rhel}
 %patch3 -p1 -b .antlr
-%patch4 -p1 -b .friend
+%patch4 -p1 -b .antlr-auto
+%endif
+%if !0%{?rhel}
 rm -rf src/antlr
+%endif
+rm ltmain.sh
+autoreconf --install
 
 
 %build
 export CPPFLAGS="-DH5_USE_16_API"
-%global _configure ../configure
 %configure --disable-dependency-tracking --disable-static --with-fftw \
+           %{plplot_config} \
            INCLUDES="-I/usr/include/netcdf -I/usr/include/hdf" \
            LIBS="-L%{_libdir}/hdf"
 make %{?_smp_mflags}
@@ -85,6 +94,11 @@ install -m 0644 %SOURCE1 $RPM_BUILD_ROOT
 install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
 
 
+%check
+cd testsuite
+echo ".r test_suite" | ../src/gdl
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -101,6 +115,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 15 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.7.rc3
+- Update to 0.9rc3
+- Drop gcc43, ppc64, friend patches fixed upstream
+- Add source for makecvstarball
+- Rebase antlr patch, add automake source version
+- Add conditionals for EPEL builds
+- Add %%check section
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-0.6.rc2.20090312
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Mar 16 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.5.rc2.20090312
 - Back off building python module until configure macro is updated
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-11/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Mar 2009 14:55:31 -0000	1.13
+++ sources	15 Oct 2009 21:23:25 -0000	1.14
@@ -1 +1 @@
-a3f361a43164617934134300cbe51207  gdl-0.9rc2-20090312.tar.bz2
+94a29e13ec5d71e664659b32e421b02e  gdl-0.9rc3.tar.gz


--- gdl-0.9pre5-ppc64.patch DELETED ---


--- gdl-0.9pre6-plplot.patch DELETED ---


--- gdl-0.9rc1-gcc43.patch DELETED ---


--- gdl-0.9rc2-20090224-friend.patch DELETED ---


--- gdl-0.9rc2-20090312-antlr.patch DELETED ---