rpms/gdl/devel gdl-0.9rc2-20090312-antlr.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 gdl.spec, 1.44, 1.45 sources, 1.12, 1.13 gdl-0.9rc2-20090224-antlr.patch, 1.1, NONE
Orion Poplawski
orion at fedoraproject.org
Thu Mar 12 14:56:02 UTC 2009
Author: orion
Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3339
Modified Files:
.cvsignore gdl.spec sources
Added Files:
gdl-0.9rc2-20090312-antlr.patch
Removed Files:
gdl-0.9rc2-20090224-antlr.patch
Log Message:
* Thu Mar 12 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.4.rc2.20090312
- Update to 0.9rc2 cvs 20090312
- Rebase antlr patch
- Rebuild for new ImageMagick
gdl-0.9rc2-20090312-antlr.patch:
--- NEW FILE gdl-0.9rc2-20090312-antlr.patch ---
--- gdl-0.9rc2-20090312/configure.antlr 2009-03-12 08:41:10.000000000 -0600
+++ gdl-0.9rc2-20090312/configure 2009-03-12 08:42:04.000000000 -0600
@@ -22102,7 +22102,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
@@ -22707,7 +22707,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.9rc2-20090312/src/Makefile.in.antlr 2009-02-23 11:24:00.000000000 -0700
+++ gdl-0.9rc2-20090312/src/Makefile.in 2009-02-26 09:00:54.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:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 24 Feb 2009 16:29:04 -0000 1.12
+++ .cvsignore 12 Mar 2009 14:55:31 -0000 1.13
@@ -1 +1 @@
-gdl-0.9rc2-20090224.tar.bz2
+gdl-0.9rc2-20090312.tar.bz2
Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- gdl.spec 26 Feb 2009 16:42:46 -0000 1.44
+++ gdl.spec 12 Mar 2009 14:55:31 -0000 1.45
@@ -2,21 +2,23 @@
Name: gdl
Version: 0.9
-Release: 0.3.rc2.20090224%{?dist}
+Release: 0.4.rc2.20090312%{?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 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
+# 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
Source1: gdl.csh
Source2: gdl.sh
Patch1: gdl-0.9pre5-ppc64.patch
Patch2: gdl-0.9rc1-gcc43.patch
-Patch3: gdl-0.9rc2-20090224-antlr.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
+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
@@ -61,7 +63,7 @@
%prep
-%setup -q -n %{name}-%{version}rc2-20090224
+%setup -q -n %{name}-%{version}rc2-20090312
%patch1 -p1 -b .ppc64
%patch2 -p1 -b .gcc43
%patch3 -p1 -b .antlr
@@ -131,6 +133,11 @@
%changelog
+* Thu Mar 12 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.4.rc2.20090312
+- Update to 0.9rc2 cvs 20090312
+- Rebase antlr patch
+- Rebuild for new ImageMagick
+
* Thu Feb 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.3.rc2.20090224
- Build python module
- Move common code to noarch common sub-package
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 24 Feb 2009 16:29:05 -0000 1.12
+++ sources 12 Mar 2009 14:55:31 -0000 1.13
@@ -1 +1 @@
-8f8bfebdf2011532b68918eee2899c6e gdl-0.9rc2-20090224.tar.bz2
+a3f361a43164617934134300cbe51207 gdl-0.9rc2-20090312.tar.bz2
--- gdl-0.9rc2-20090224-antlr.patch DELETED ---
More information about the fedora-extras-commits
mailing list