rpms/grace/devel grace-detect-netcdf.diff, 1.2, 1.3 grace.spec, 1.21, 1.22

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	grace-detect-netcdf.diff grace.spec 
Log Message:
* Wed Jan 23 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.21-8
- correct netcdf detection patch, thanks José.


grace-detect-netcdf.diff:

Index: grace-detect-netcdf.diff
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/grace-detect-netcdf.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grace-detect-netcdf.diff	23 Jan 2008 10:16:20 -0000	1.2
+++ grace-detect-netcdf.diff	23 Jan 2008 19:30:46 -0000	1.3
@@ -5,7 +5,7 @@
          char *vlib;
          vlib = nc_inq_libvers();
 -        if (strcmp(vlib, "3.0") < 0) {
-+        if ((strcmp(vlib, "\"3.0") < 0) && (strcmp(vlib, "3.0" < 0))){
++        if (((vlib[0] == '"') && (strcmp(vlib, "\"3.0") < 0)) || ((vlib[0] != '"') && (strcmp(vlib, "3.0") < 0))){
            exit(1);
          }
          exit(0);


Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/grace.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- grace.spec	23 Jan 2008 10:16:20 -0000	1.21
+++ grace.spec	23 Jan 2008 19:30:46 -0000	1.22
@@ -3,7 +3,7 @@
 
 Name:           grace
 Version:        5.1.21
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -225,9 +225,12 @@
 
 
 %changelog
+* Wed Jan 23 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.21-8
+- correct netcdf detection patch, thanks José.
+
 * Wed Jan 23 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.21-7
-- add support for previous netcdf version (in epel)
-- drop support for monolithic X
+- add support for previous netcdf version (in epel).
+- drop support for monolithic X.
 
 * Tue Jan 22 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.21-6
 - don't add the grace fonts to the X server fonts. Instead use the
@@ -235,8 +238,8 @@
 - use xdg-utils instead of htmlview.
 - use relative links.
 - add links to doc and examples in GRACE_HOME to have correct help.
-- use debian patch
-- clean docs
+- use debian patch.
+- clean docs.
 
 * Fri Sep 28 2007 José Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
 - Correctly detect netcdf (signature has changed).