rpms/pgplot/devel pgplot5.2-formaterror.patch, NONE, 1.1 pgplot5.2-tcl86.patch, NONE, 1.1 pgplot.spec, 1.10, 1.11

[Sergio Pascual]

Author: sergiopr

Update of /cvs/nonfree/rpms/pgplot/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8433

Modified Files:
	pgplot.spec 
Added Files:
	pgplot5.2-formaterror.patch pgplot5.2-tcl86.patch 
Log Message:
* Mon Sep 01 2014 Sergio Pascual <sergio.pasra at gmail.com> - 5.2.2-36
- Fix wrong dates in changelog
- Fix compilation errors


pgplot5.2-formaterror.patch:
 pgtkdemo.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE pgplot5.2-formaterror.patch ---
diff -ur pgplot/drivers/xtk/pgtkdemo.c pgplot.tcl86/drivers/xtk/pgtkdemo.c
--- pgplot/drivers/xtk/pgtkdemo.c	1998-06-06 02:21:36.000000000 +0200
+++ pgplot.tcl86/drivers/xtk/pgtkdemo.c	2014-09-01 19:54:22.629584363 +0200
@@ -195,7 +195,7 @@
  * script file.
  */
   if(argc < 2 || *argv[1] == '-' || !valid_demo_script(argv[1])) {
-    fprintf(stderr, usage);
+    fprintf(stderr, "%s", usage);
     return 1;
   };
 /*


pgplot5.2-tcl86.patch:
 tkpgplot.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE pgplot5.2-tcl86.patch ---
diff -ur pgplot/drivers/xtk/tkpgplot.c pgplot.tcl86/drivers/xtk/tkpgplot.c
--- pgplot/drivers/xtk/tkpgplot.c	2014-09-01 19:54:53.597831875 +0200
+++ pgplot.tcl86/drivers/xtk/tkpgplot.c	2014-09-01 19:50:32.158743239 +0200
@@ -2139,7 +2139,8 @@
     tkpg->border = bd;
     tkpg_draw_3d_border(tkpg);
   } else {
-    fprintf(stderr, "Tk_Get3DBorder failed: %s\n", tkpg->interp->result);
+    /*fprintf(stderr, "Tk_Get3DBorder failed: %s\n", tkpg->interp->result);*/
+    fprintf(stderr, "%s\n", "Tk_Get3DBorder failed");
   };
 }
 


Index: pgplot.spec
===================================================================
RCS file: /cvs/nonfree/rpms/pgplot/devel/pgplot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pgplot.spec	12 Mar 2013 21:42:26 -0000	1.10
+++ pgplot.spec	1 Sep 2014 21:18:24 -0000	1.11
@@ -3,7 +3,7 @@
 Name: pgplot 
 %define lvmajor 5
 Version: 5.2.2
-Release: 35%{?dist}
+Release: 36%{?dist}
 Summary: Graphic library for making simple scientific graphs
 
 Group: Development/Libraries
@@ -28,6 +28,9 @@
 Patch3: pgplot5.2-pngdriver.patch
 # Needed to have a loadable tcl package
 Patch4: pgplot5.2-tclpackage.patch
+# Fix format error 
+Patch5: pgplot5.2-formaterror.patch
+Patch6: pgplot5.2-tcl86.patch
 
 BuildRequires: tk-devel libX11-devel gcc-gfortran
 BuildRequires: perl
@@ -92,6 +95,8 @@
 # PNG disabled
 #%patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 cp %{SOURCE1} .
 cp %{SOURCE2} .
@@ -214,6 +219,10 @@
 %{_bindir}/*
 
 %changelog
+* Mon Sep 01 2014 Sergio Pascual <sergio.pasra at gmail.com> - 5.2.2-36
+- Fix wrong dates in changelog
+- Fix compilation errors
+
 * Tue Mar 12 2013 Nicolas Chauvet <kwizart at gmail.com> - 5.2.2-35
 - https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -318,7 +327,7 @@
 - Minor fixes.
 - Excluded static libraries.
 
-* Tue Nov 28 2005 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-8
+* Mon Nov 28 2005 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-8
 - Adding soname to the shared libs.
 - Minor fixes.
 
@@ -334,7 +343,7 @@
 * Tue Feb 25 2003 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-4
 - Added demos.
 
-* Thu Feb 12 2003 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-3
+* Wed Feb 12 2003 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-3
 - Splited devel part.
 
 * Tue Feb 11 2003 Nicolas Cardiel <ncl at astrax.fis.ucm.es> 5.2.2-2