rpms/gdl/F-10 gdl-0.9rc2-20090224-antlr.patch, NONE, 1.1 gdl-0.9rc2-20090224-friend.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.10, 1.11 gdl-0.9rc1-gcc43.patch, 1.1, 1.2 gdl.spec, 1.38, 1.39 sources, 1.10, 1.11 gdl-0.9pre6-plplot.patch, 1.1, NONE gdl-0.9rc1-cvs.patch, 1.1, NONE gdl-0.9rc1-magick.patch, 1.1, NONE

Orion Poplawski orion at fedoraproject.org
Wed Feb 25 19:02:56 UTC 2009 

Author: orion

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

Modified Files:
	.cvsignore gdl-0.9rc1-gcc43.patch gdl.spec sources 
Added Files:
	gdl-0.9rc2-20090224-antlr.patch 
	gdl-0.9rc2-20090224-friend.patch import.log 
Removed Files:
	gdl-0.9pre6-plplot.patch gdl-0.9rc1-cvs.patch 
	gdl-0.9rc1-magick.patch 
Log Message:
sync to devel

gdl-0.9rc2-20090224-antlr.patch:

--- NEW FILE gdl-0.9rc2-20090224-antlr.patch ---
--- gdl-0.9rc2-20090224/configure.antlr	2009-02-24 09:46:08.000000000 -0700
+++ gdl-0.9rc2-20090224/configure	2009-02-24 09:47:32.000000000 -0700
@@ -22313,7 +22313,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
@@ -22950,7 +22950,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" ;;
 
   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--- gdl-0.9rc2-20090224/src/Makefile.in.antlr	2009-02-23 11:24:00.000000000 -0700
+++ gdl-0.9rc2-20090224/src/Makefile.in	2009-02-24 09:53:18.000000000 -0700
@@ -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 \
@@ -233,7 +233,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 $@
@@ -391,7 +391,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 \
@@ -438,7 +437,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
@@ -448,7 +447,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:

gdl-0.9rc2-20090224-friend.patch:

--- NEW FILE gdl-0.9rc2-20090224-friend.patch ---
--- gdl-0.9rc2-20090224/src/envt.hpp.friend	2008-06-10 14:43:43.000000000 -0600
+++ gdl-0.9rc2-20090224/src/envt.hpp	2009-02-25 11:38:48.000000000 -0700
@@ -162,6 +162,8 @@
     if( ix >= env.size()) return false;
     return ( env.Env( ix) != NULL);
   }
+
+  friend class DInterpreter;
 };
 
 // for UD subroutines (written in GDL) ********************************


--- NEW FILE import.log ---
gdl-0_9-0_2_rc2_20090224_fc11:F-10:gdl-0.9-0.2.rc2.20090224.fc11.src.rpm:1235588249


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Apr 2008 04:22:34 -0000	1.10
+++ .cvsignore	25 Feb 2009 19:02:26 -0000	1.11
@@ -1 +1 @@
-gdl-0.9rc1.tar.gz
+gdl-0.9rc2-20090224.tar.bz2

gdl-0.9rc1-gcc43.patch:

Index: gdl-0.9rc1-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-10/gdl-0.9rc1-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdl-0.9rc1-gcc43.patch	6 Sep 2008 04:17:49 -0000	1.1
+++ gdl-0.9rc1-gcc43.patch	25 Feb 2009 19:02:26 -0000	1.2
@@ -8,17 +8,6 @@
  #include <iostream>
  #include <stdio.h>
  
---- gdl-0.9rc1/src/antlr/CharScanner.hpp.gcc43	2008-09-05 22:06:20.000000000 -0600
-+++ gdl-0.9rc1/src/antlr/CharScanner.hpp	2008-09-05 22:06:20.000000000 -0600
-@@ -14,6 +14,8 @@
- #include <cstring>
- #include <cstdlib>
- 
-+#include <cstdlib>
-+#include <cstring>
- #include <map>
- 
- #ifdef HAS_NOT_CCTYPE_H
 --- gdl-0.9rc1/src/antlr/Parser.cpp.gcc43	2008-04-03 16:09:26.000000000 -0600
 +++ gdl-0.9rc1/src/antlr/Parser.cpp	2008-09-05 22:06:20.000000000 -0600
 @@ -11,6 +11,7 @@


Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-10/gdl.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gdl.spec	6 Sep 2008 04:17:49 -0000	1.38
+++ gdl.spec	25 Feb 2009 19:02:26 -0000	1.39
@@ -1,26 +1,31 @@
 Name:           gdl
 Version:        0.9
-Release:        0.rc1.4%{?dist}
+Release:        0.2.rc2.20090224%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://gnudatalanguage.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc1.tar.gz
+#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 20090224 -d gdl-0.9rc2-20090224 gdl
+# tar cjf gdl-0.9rc2-20090224.tar.bz2 gdl-0.9rc2-20090224
+Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc2-20090224.tar.bz2
 Source1:        gdl.csh
 Source2:        gdl.sh
-Patch0:         gdl-0.9rc1-cvs.patch
 Patch1:         gdl-0.9pre5-ppc64.patch
 Patch2:         gdl-0.9rc1-gcc43.patch
-Patch3:         gdl-0.9rc1-magick.patch
+Patch3:         gdl-0.9rc2-20090224-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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  antlr
 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
-
 # Needed to pull in drivers
 Requires:       plplot
 
@@ -32,11 +37,12 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}rc1
-%patch0 -p1 -b .cvs
+%setup -q -n %{name}-%{version}rc2-20090224
 %patch1 -p1 -b .ppc64
 %patch2 -p1 -b .gcc43
-%patch3 -p1 -b .magick
+%patch3 -p1 -b .antlr
+%patch4 -p1 -b .friend
+rm -rf src/antlr
 
 
 %build
@@ -75,6 +81,19 @@
 
 
 %changelog
+* Tue Feb 24 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.2.rc2.20090224
+- Update to 0.9rc2 cvs 20090224
+- Fix release tag
+- Drop ImageMagick patch fixed upstream
+- Add patch to compile with gcc 4.4.0 - needs new friend statement
+- Don't build included copy of antlr, use system version
+
+* Fri Jan 23 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc2.1
+- Update to 0.9rc2 based cvs
+
+* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.9-0.rc1.4.1
+- Rebuild for Python 2.6
+
 * Fri Sep  5 2008 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.rc1.4
 - Add a requires on plplot to pull in drivers (bug#458277)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Apr 2008 04:22:34 -0000	1.10
+++ sources	25 Feb 2009 19:02:26 -0000	1.11
@@ -1 +1 @@
-9cf6c3603b71988761d5d2c4551ecb10  gdl-0.9rc1.tar.gz
+8f8bfebdf2011532b68918eee2899c6e  gdl-0.9rc2-20090224.tar.bz2


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


--- gdl-0.9rc1-cvs.patch DELETED ---


--- gdl-0.9rc1-magick.patch DELETED ---

More information about the fedora-extras-commits mailing list