rpms/gdl/devel plplot-0.9rc1-automake.patch, NONE, 1.1 gdl.spec, 1.33, 1.34

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20688

Modified Files:
	gdl.spec 
Added Files:
	plplot-0.9rc1-automake.patch 
Log Message:
Add patch to fixup bad makefile.in that lists plot3d_nr twice.


plplot-0.9rc1-automake.patch:

--- NEW FILE plplot-0.9rc1-automake.patch ---
--- src/Makefile.in.orig	2008-04-03 16:09:26.000000000 -0600
+++ src/Makefile.in	2008-04-05 23:09:23.000000000 -0600
@@ -225,8 +225,7 @@
 	gdl-arrayindex.$(OBJEXT) gdl-fftw.$(OBJEXT) gdl-mpi.$(OBJEXT) \
 	gdl-plot3d_nr.$(OBJEXT)
 @BUILDASLIBRARY_FALSE at am_gdl_OBJECTS = $(am__objects_2) \
- at BUILDASLIBRARY_FALSE@	gdl-gdl.$(OBJEXT) \
- at BUILDASLIBRARY_FALSE@	gdl-plot3d_nr.$(OBJEXT)
+ at BUILDASLIBRARY_FALSE@	gdl-gdl.$(OBJEXT)
 gdl_OBJECTS = $(am_gdl_OBJECTS)
 @BUILDASLIBRARY_FALSE at gdl_DEPENDENCIES =  \
 @BUILDASLIBRARY_FALSE@	$(top_builddir)/src/antlr/libantlr.a
@@ -423,7 +422,7 @@
 		gdlzstream.cpp gdlzstream.hpp gdlwidget.hpp arrayindexlistt.hpp arrayindex.cpp \
 		fftw.cpp fftw.hpp mpi.cpp mpi.hpp plot3d_nr.cpp
 
- at BUILDASLIBRARY_FALSE@gdl_SOURCES = $(cpp_hpp_files) gdl.cpp plot3d_nr.cpp
+ at BUILDASLIBRARY_FALSE@gdl_SOURCES = $(cpp_hpp_files) gdl.cpp
 # trigger basename generation
 @BUILDASLIBRARY_FALSE at gdl_CXXFLAGS = $(AM_CXXFLAGS)
 # the library search path.


Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gdl.spec	6 Apr 2008 04:22:34 -0000	1.33
+++ gdl.spec	6 Apr 2008 05:13:25 -0000	1.34
@@ -9,6 +9,7 @@
 Source0:        http://downloads.sourceforge.net/gnudatalanguage/%{name}-%{version}rc1.tar.gz
 Source1:        gdl.csh
 Source2:        gdl.sh
+Patch0:         gdl-0.9rc1-automake.patch
 Patch1:		gdl-0.9pre5-ppc64.patch
 Patch2:		gdl-0.9pre6-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}rc1
+%patch0 -p0 -b .automake
 %patch1 -p1 -b .ppc64
 %patch2 -p1 -b .gcc43