rpms/pgplot/devel pgplot.spec, 1.1, 1.2 pgplot5.2-fsstnd.patch, 1.1, 1.2

[Sergio Pascual]

Author: sergiopr

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

Modified Files:
	pgplot.spec pgplot5.2-fsstnd.patch 
Log Message:
* Thu Nov 13 2008 Sergio Pascual <sergio.pasra at gmail.com> 5.2.2-27
- Patch0 adapted to the buildsystem of fedora 10



Index: pgplot.spec
===================================================================
RCS file: /cvs/nonfree/rpms/pgplot/devel/pgplot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pgplot.spec	13 Nov 2008 10:30:54 -0000	1.1
+++ pgplot.spec	13 Nov 2008 14:13:06 -0000	1.2
@@ -3,7 +3,7 @@
 Name: pgplot 
 %define lvmajor 5
 Version: 5.2.2
-Release: 26%{?dist}
+Release: 27%{?dist}
 Summary: Graphic library for making simple scientific graphs
 
 Group: Development/Libraries
@@ -125,12 +125,12 @@
 %build
 ./makemake . linux g77_gcc
 # Parallel make not supported
-%{__make} FC=f95 CC=%{__cc} CFLAGS="%{optflags}" FFLAGS="%{optflags}" \
+%{__make} FC="f95" CC="%{__cc}" CFLAGS="%{optflags}" FFLAGS="%{optflags}" \
    NLIBS="-lgfortran -lm -lX11 -lpng"
 
 # Creating dynamic library for C
 %{__make}  %{?_smp_mflags} \
-   FC=f95 CC=%{__cc} CFLAGS="%{optflags}" FFLAGS="%{optflags}" cpg
+   FC=f95 CC="%{__cc}" CFLAGS="%{optflags}" FFLAGS="%{optflags}" cpg
 %{__ar} x libcpgplot.a
 %{__cc} %{optflags} -shared -o libc%{name}.so.%{version} \
     -Wl,-soname,libc%{name}.so.%{lvmajor} \
@@ -222,10 +222,13 @@
 %{_bindir}/*
 
 %changelog
-* Thu Nov 13 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-26
+* Thu Nov 13 2008 Sergio Pascual <sergio.pasra at gmail.com> 5.2.2-27
+- Patch0 adapted to the buildsystem of fedora 10
+
+* Thu Nov 13 2008 Sergio Pascual <sergio.pasra at gmail.com> 5.2.2-26
 - Provides includes release
 
-* Wed Nov 12 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-25
+* Wed Nov 12 2008 Sergio Pascual <sergio.pasra at gmail.com> 5.2.2-25
 - Fixed non-standard-executable-perm in libcpgplot and libtkpgplot
 - Included version files in one Changelog
 - Parallel make works only with make cpg
@@ -234,14 +237,14 @@
 - Patched tk driver to have a loadable package
 - Tk driver follows tcl guidelines
 
-* Sun Nov 09 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-24
+* Sun Nov 09 2008 Sergio Pascual <sergio.pasra at gmail.com> 5.2.2-24
 - Using sed to enable the drivers instead of patch
 - Removed docs package
 - Added pkgconfig files
 - Package tcl renamed as tk
 - Create pdf doc from latex routines description
 
-* Wed Nov 05 2008 Sergio Pascual <spr at astrax.fis.ucm.es> 5.2.2-23
+* Wed Nov 05 2008 Sergio Pascual <sergio.pasra at gmail.com> 5.2.2-23
 - Fixing weak symbols in libcpgplot
 - Poststages for libtkpgplot
 - pgplot-tcl-devel requires pgplot-tcl

pgplot5.2-fsstnd.patch:

Index: pgplot5.2-fsstnd.patch
===================================================================
RCS file: /cvs/nonfree/rpms/pgplot/devel/pgplot5.2-fsstnd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pgplot5.2-fsstnd.patch	13 Nov 2008 10:30:54 -0000	1.1
+++ pgplot5.2-fsstnd.patch	13 Nov 2008 14:13:06 -0000	1.2
@@ -1,17 +1,33 @@
-diff -ur pgplot.orig/drivers/xwdriv.c pgplot/drivers/xwdriv.c
---- pgplot.orig/drivers/xwdriv.c	2000-12-13 02:30:18.000000000 +0100
-+++ pgplot/drivers/xwdriv.c	2003-02-28 13:22:32.000000000 +0100
+diff -ur pgplot/drivers/xwdriv.c pgplot.new/drivers/xwdriv.c
+--- pgplot/drivers/xwdriv.c	2000-12-13 02:30:18.000000000 +0100
++++ pgplot.new/drivers/xwdriv.c	2008-11-13 13:00:32.000000000 +0100
 @@ -3344,6 +3344,7 @@
      };
  #else
      if((exe=find_exe(getenv("PGPLOT_DIR"), PGXWIN_SERVER))==NULL &&
-+       (exe=find_exe("/usr/libexec/pgplot", PGXWIN_SERVER))==NULL &&
++       (exe=find_exe(getenv("/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",
-diff -ur pgplot.orig/src/grgfil.f pgplot/src/grgfil.f
---- pgplot.orig/src/grgfil.f 1995-06-14 03:23:31.000000000 +0200
-+++ pgplot/src/grgfil.f    2005-04-20 16:22:43.000000000 +0200
+ 	  "%s: Couldn't find program \"%s\" in the directory named\n",
+diff -ur pgplot/src/grgfil.f pgplot.new/src/grgfil.f
+--- pgplot/src/grgfil.f	1995-06-14 03:23:31.000000000 +0200
++++ pgplot.new/src/grgfil.f	2008-11-13 13:01:36.000000000 +0100
+@@ -10,13 +10,13 @@
+ C     file specified by PGPLOT_FONT
+ C     file "grfont.dat" in directory specified by PGPLOT_DIR
+ C                       (with or without '/' appended)
+-C     file "grfont.dat" in directory /usr/local/pgplot/
++C     file "grfont.dat" in directory /usr/share/pgplot/
+ C
+ C 2. The color-name database: try the following in order:
+ C     file specified by PGPLOT_RGB
+ C     file "rgb.txt" in directory specified by PGPLOT_DIR
+ C                       (with or without '/' appended)
+-C     file "rgb.txt" in directory /usr/local/pgplot/
++C     file "rgb.txt" in directory /usr/share/pgplot/
+ C
+ C Arguments:
+ C  TYPE (input)  : either 'FONT' or 'RGB' to request the corresponding
 @@ -26,7 +26,7 @@
  C  2-Dec-1994 - new routine [TJP].
  C-----------------------------------------------------------------------