rpms/pgplot/devel pgplot5.2-pngdriver.patch, NONE, 1.1 pgplot.spec, 1.2, 1.3 pgplot5.2-fsstnd.patch, 1.2, 1.3 pgplot5.2-pngdriver2.patch, 1.1, NONE

[Sergio Pascual]

Author: sergiopr

Update of /cvs/nonfree/rpms/pgplot/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21368

Modified Files:
	pgplot.spec pgplot5.2-fsstnd.patch 
Added Files:
	pgplot5.2-pngdriver.patch 
Removed Files:
	pgplot5.2-pngdriver2.patch 
Log Message:
* Tue Nov 18 2008 Sergio Pascual <sergio.pasra at gmail.com> 5.2.2-28
- Fixing bz #168. There was a typo in patch0


pgplot5.2-pngdriver.patch:

--- NEW FILE pgplot5.2-pngdriver.patch ---
--- pgplot.orig/makemake        2005-04-20 17:11:32.000000000 +0200
+++ pgplot/makemake     2005-04-20 17:11:54.000000000 +0200
@@ -1025,7 +1025,7 @@
 grivas.o : $(DRVDIR)/gadef.h
 grtv00.o : $(DRVDIR)/imdef.h
 pgxwin.o : $(DRVDIR)/pgxwin.h
-pndriv.o : ./png.h ./pngconf.h ./zlib.h ./zconf.h
+pndriv.o :

 x2driv.o figdisp_comm.o: $(DRVDIR)/commands.h


Index: pgplot.spec
===================================================================
RCS file: /cvs/nonfree/rpms/pgplot/devel/pgplot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pgplot.spec	13 Nov 2008 14:13:06 -0000	1.2
+++ pgplot.spec	18 Nov 2008 16:14:51 -0000	1.3
@@ -3,7 +3,7 @@
 Name: pgplot 
 %define lvmajor 5
 Version: 5.2.2
-Release: 27%{?dist}
+Release: 28%{?dist}
 Summary: Graphic library for making simple scientific graphs
 
 Group: Development/Libraries
@@ -24,7 +24,7 @@
 # make the compiler script accept FFLAGS and FC
 Patch2: pgplot5.2-g77_gcc_conf.patch
 # Needed by the png driver
-Patch3: pgplot5.2-pngdriver2.patch
+Patch3: pgplot5.2-pngdriver.patch
 # Needed to have a loadable tcl package
 Patch4: pgplot5.2-tclpackage.patch
 
@@ -222,6 +222,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Nov 18 2008 Sergio Pascual <sergio.pasra at gmail.com> 5.2.2-28
+- Fixing bz #168. There was a typo in patch0
+
 * Thu Nov 13 2008 Sergio Pascual <sergio.pasra at gmail.com> 5.2.2-27
 - Patch0 adapted to the buildsystem of fedora 10
 

pgplot5.2-fsstnd.patch:

Index: pgplot5.2-fsstnd.patch
===================================================================
RCS file: /cvs/nonfree/rpms/pgplot/devel/pgplot5.2-fsstnd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pgplot5.2-fsstnd.patch	13 Nov 2008 14:13:06 -0000	1.2
+++ pgplot5.2-fsstnd.patch	18 Nov 2008 16:14:51 -0000	1.3
@@ -5,7 +5,7 @@
      };
  #else
      if((exe=find_exe(getenv("PGPLOT_DIR"), PGXWIN_SERVER))==NULL &&
-+       (exe=find_exe(getenv("/usr/libexec/pgplot"), PGXWIN_SERVER))==NULL &&
++       (exe=find_exe("/usr/libexec/pgplot", PGXWIN_SERVER))==NULL &&
         (exe=find_exe(getenv("PATH"), PGXWIN_SERVER))==NULL) {
        fprintf(stderr,
  	  "%s: Couldn't find program \"%s\" in the directory named\n",


--- pgplot5.2-pngdriver2.patch DELETED ---