rpms/plplot/devel plplot-5.5.3-check.patch, NONE, 1.1 plplot-5.5.3-octave.patch, NONE, 1.1 plplot-5.5.3-x86_64.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27656

Modified Files:
	.cvsignore sources 
Added Files:
	plplot-5.5.3-check.patch plplot-5.5.3-octave.patch 
	plplot-5.5.3-x86_64.patch 
Log Message:
Move from "sources"


plplot-5.5.3-check.patch:

--- NEW FILE plplot-5.5.3-check.patch ---
--- plplot-5.5.3/examples/c/x23c.c.orig	2005-04-27 00:43:51.000000000 -0600
+++ plplot-5.5.3/examples/c/x23c.c	2005-08-11 15:21:10.719597600 -0600
@@ -228,6 +228,6 @@
     plcol0(1);
 
     plend();
-
+    exit(0);
 }
 

plplot-5.5.3-octave.patch:

--- NEW FILE plplot-5.5.3-octave.patch ---
--- plplot-5.5.3/bindings/octave/PLplot/figure.m.orig	2005-08-10 11:56:53.000000000 -0600
+++ plplot-5.5.3/bindings/octave/PLplot/figure.m	2005-08-10 12:00:39.000000000 -0600
@@ -49,9 +49,10 @@
 
   if (!exist("__pl") || !struct_contains (__pl,"inited"))
     v = split(version ,'.');
-    if (! (str2num(v(1,:)) >= 2 &&
-           str2num(v(2,:)) >= 1 &&
-           str2num(v(3,:)) >= 57))
+    if (! ((str2num(v(1,:)) > 2) ||
+           (str2num(v(1,:)) == 2 && str2num(v(2,:)) > 1) ||
+           (str2num(v(1,:)) == 2 && str2num(v(2,:)) == 1 &&
+            str2num(v(3,:)) >= 57)))
         error("The PLplot-Octave scripts need an Octave version \n\
         greater then or equal to 2.1.57.\n");
     endif

plplot-5.5.3-x86_64.patch:

--- NEW FILE plplot-5.5.3-x86_64.patch ---
--- plplot-5.5.3/configure.x86_64	2005-12-22 11:18:39.000000000 -0700
+++ plplot-5.5.3/configure	2005-12-22 11:19:07.000000000 -0700
@@ -24661,6 +24661,7 @@
 $HOME/local/lib \
 $HOME/lib \
 /usr/local/lib \
+/usr/lib64 \
 /usr/lib"
 
 incdirs=$incdirs_default


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Aug 2005 22:23:37 -0000	1.4
+++ .cvsignore	22 Dec 2005 23:37:42 -0000	1.5
@@ -1,4 +1 @@
 plplot-5.5.3.tar.gz
-plplot-5.5.3-x86_64.patch
-plplot-5.5.3-octave.patch
-plplot-5.5.3-check.patch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Aug 2005 22:23:37 -0000	1.4
+++ sources	22 Dec 2005 23:37:42 -0000	1.5
@@ -1,4 +1 @@
 6df3d63cffac28337ff7fa56712da5c7  plplot-5.5.3.tar.gz
-02cc9f8eb72211581aae2bd38670252f  plplot-5.5.3-x86_64.patch
-7970faa7d90fe1e98e19354fd607a309  plplot-5.5.3-octave.patch
-22f2761b863bf1f47fb37b7d7fb9ab85  plplot-5.5.3-check.patch