rpms/grace/devel grace-detect-netcdf.diff, 1.1, 1.2 grace.spec, 1.20, 1.21

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	grace-detect-netcdf.diff grace.spec 
Log Message:
* 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


grace-detect-netcdf.diff:

Index: grace-detect-netcdf.diff
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/grace-detect-netcdf.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grace-detect-netcdf.diff	28 Sep 2007 23:22:58 -0000	1.1
+++ grace-detect-netcdf.diff	23 Jan 2008 10:16:20 -0000	1.2
@@ -5,7 +5,7 @@
          char *vlib;
          vlib = nc_inq_libvers();
 -        if (strcmp(vlib, "3.0") < 0) {
-+        if (strcmp(vlib, "\"3.0\"") < 0) {
++        if ((strcmp(vlib, "\"3.0") < 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- grace.spec	23 Jan 2008 09:26:08 -0000	1.20
+++ grace.spec	23 Jan 2008 10:16:20 -0000	1.21
@@ -3,7 +3,7 @@
 
 Name:           grace
 Version:        5.1.21
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -27,11 +27,11 @@
 # to be able to generate FontDataBase
 BuildRequires:  urw-fonts
 
-%if "%{fedora}" < "5"
-BuildRequires: xorg-x11-devel
-%else
+#%if "%{fedora}" < "5"
+#BuildRequires: xorg-x11-devel
+#%else
 BuildRequires: libXpm-devel
-%endif
+#%endif
 
 Requires:      nedit
 Requires:      xdg-utils
@@ -83,6 +83,7 @@
     --with-x \
     --with-f77=gfortran \
     --with-extra-incpath=%{_includedir}/netcdf-3 \
+    --with-extra-ldpath=%{_libdir}/netcdf-3 \
     --with-bundled-xbae=no
     
 make %{?_smp_mflags}
@@ -224,6 +225,10 @@
 
 
 %changelog
+* 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
+
 * 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
   urw fonts. Regenerate the FontDataBase based on the urw fonts.