rpms/ncl
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix format patch

Browse Source
This commit is contained in:
Orion Poplawski 2020-06-04 21:28:38 -06:00
parent a02df23d7b
commit b97ae9c0b1
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ncl-format.patch
View File

@ -1,5 +1,5 @@
diff --git a/ni/src/lib/nfp/ripW.c b/ni/src/lib/nfp/ripW.c
index a06b1b6..7df335b 100644
index a06b1b6..4b31c54 100644
--- a/ni/src/lib/nfp/ripW.c
+++ b/ni/src/lib/nfp/ripW.c
@@ -533,7 +533,7 @@ NhlErrorTypes rip_cape_3d_W( void )
@ -7,7 +7,7 @@ index a06b1b6..7df335b 100644
/* Terminate if there was an error */
if (errstat != 0) {
- fprintf(stderr, errmsg);
+ fputs(stderr, errmsg);
+ fputs(errmsg, stderr);
exit(errstat);
}
@ -16,12 +16,12 @@ index a06b1b6..7df335b 100644
/* Terminate if there was an error */
if (errstat != 0) {
- fprintf(stderr, errmsg);
+ fputs(stderr, errmsg);
+ fputs(errmsg, stderr);
exit(errstat);
}
diff --git a/ni/src/lib/nfp/wrfW.c b/ni/src/lib/nfp/wrfW.c
index 6d0ffca..1f34366 100644
index 6d0ffca..edd7211 100644
--- a/ni/src/lib/nfp/wrfW.c
+++ b/ni/src/lib/nfp/wrfW.c
@@ -1514,7 +1514,7 @@ NhlErrorTypes wrf_slp_W( void )
@ -29,7 +29,7 @@ index 6d0ffca..1f34366 100644
/* Terminate if there was an error */
if (errstat != 0) {
- fprintf(stderr, errmsg);
+ fputs(stderr, errmsg);
+ fputs(errmsg, stderr);
exit(errstat);
}
/*
@ -38,7 +38,7 @@ index 6d0ffca..1f34366 100644
/* Terminate if there was an error */
if (errstat != 0) {
- fprintf(stderr, errmsg);
+ fputs(stderr, errmsg);
+ fputs(errmsg, stderr);
exit(errstat);
}
@ -47,7 +47,7 @@ index 6d0ffca..1f34366 100644
/* Terminate if there was an error */
if (errstat != 0) {
- fprintf(stderr, errmsg);
+ fputs(stderr, errmsg);
+ fputs(errmsg, stderr);
exit(errstat);
}
@ -56,7 +56,7 @@ index 6d0ffca..1f34366 100644
/* Terminate if there was an error */
if (errstat != 0) {
- fprintf(stderr, errmsg);
+ fputs(stderr, errmsg);
+ fputs(errmsg, stderr);
exit(errstat);
}
@ -65,7 +65,7 @@ index 6d0ffca..1f34366 100644
/* Terminate if there was an error */
if (errstat != 0) {
- fprintf(stderr, errmsg);
+ fputs(stderr, errmsg);
+ fputs(errmsg, stderr);
exit(errstat);
}
/*
@ -74,12 +74,12 @@ index 6d0ffca..1f34366 100644
/* Terminate if there was an error */
if (errstat != 0) {
- fprintf(stderr, errmsg);
+ fputs(stderr, errmsg);
+ fputs(errmsg, stderr);
exit(errstat);
}
diff --git a/ni/src/lib/nfp/wrf_vinterpW.c b/ni/src/lib/nfp/wrf_vinterpW.c
index d2d146f..1a2d463 100644
index d2d146f..7e1a4e2 100644
--- a/ni/src/lib/nfp/wrf_vinterpW.c
+++ b/ni/src/lib/nfp/wrf_vinterpW.c
@@ -819,7 +819,7 @@ NclBasicDataTypes type_ter;
@ -87,7 +87,7 @@ index d2d146f..1a2d463 100644
/* Terminate if there was an error */
if (errstat != 0) {
- fprintf(stderr, errmsg);
+ fputs(stderr, errmsg);
+ fputs(errmsg, stderr);
exit(errstat);
}

6
ncl.spec
View File

@ -1,6 +1,6 @@
Name: ncl
Version: 6.6.2
Release: 8%{?dist}
Release: 9%{?dist}
Summary: NCAR Command Language and NCAR Graphics
License: BSD
@ -30,6 +30,7 @@ Patch2: ncl-5.1.0-ppc64.patch
# Add needed -lm to ictrans build, remove unneeded -lrx -lidn -ldl from ncl
Patch3: ncl-libs.patch
# -Werror=format-security
# https://github.com/NCAR/ncl/pull/108
Patch4: ncl-format.patch
# Fix use of BOZ constans
Patch5: ncl-boz.patch
@ -335,6 +336,9 @@ done
%changelog
* Thu Jun 4 2020 Orion Poplawski <orion@nwra.com> - 6.6.2-9
- Fix format patch
* Thu May 21 2020 Sandro Mani <manisandro@gmail.com> - 6.6.2-8
- Rebuild (gdal)