diff --git a/.gitignore b/.gitignore index 1232960..07cbcc6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ ncl_ncarg_src-5.2.1.tar.gz /ncl_ncarg-6.1.0.tar.gz /ncl_ncarg-6.1.2.tar.gz /ncl_ncarg-6.2.0.tar.gz +/ncl_ncarg-6.2.1.tar.gz diff --git a/ncl-format.patch b/ncl-format.patch deleted file mode 100644 index 5b15e3e..0000000 --- a/ncl-format.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff -up ncl_ncarg-6.1.2/common/src/libncarg_c/options.c.format ncl_ncarg-6.1.2/common/src/libncarg_c/options.c ---- ncl_ncarg-6.1.2/common/src/libncarg_c/options.c.format 2013-02-06 20:27:58.000000000 -0700 -+++ ncl_ncarg-6.1.2/common/src/libncarg_c/options.c 2014-01-31 22:43:55.271324335 -0700 -@@ -869,7 +869,7 @@ void PrintOptionHelp(od, fp) - sprintf(sbf," arg0 .. arg%d",odr[i].arg_count-1); - (void) strcat(buf, sbf); - } -- (void) fprintf(fp, buf); -+ (void) fprintf(fp, "%s", buf); - for(j=strlen(buf); jpage_number-1; i++) { -@@ -1795,7 +1795,7 @@ int PDFCloseWorkstation(GKSC *gksc) - byte_count += 16; - - tstring = ">>\nendobj\n"; -- fprintf(fp,tstring); -+ fprintf(fp,"%s",tstring); - byte_count += strlen(tstring); - - /* -@@ -3645,7 +3645,7 @@ void PDFPutStream(FILE *fp) { - fprintf(fp, "%6d 0 obj\n<< /Length %10d >>\nstream\n",object_number+1, - stream_size); - for (i = 0; i < num_page_lines+1; i++) { -- fprintf(fp,page_lines[i]); -+ fprintf(fp, "%s",page_lines[i]); - fflush(fp); - } - fprintf(fp, "endstream\nendobj\n"); -diff -up ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/ps.c.format ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/ps.c ---- ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/ps.c.format 2013-02-06 20:27:01.000000000 -0700 -+++ ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/ps.c 2014-01-31 22:45:29.039294483 -0700 -@@ -3418,8 +3418,8 @@ void ps_NcarLogo(GKSC *gksc,float x,floa - scaling*(psa->dspace.urx), scaling*(psa->dspace.ury)); - } - -- (void) fprintf(fp, translate); -- (void) fprintf(fp, scale); -+ (void) fprintf(fp, "%s", translate); -+ (void) fprintf(fp, "%s", scale); - (void) fprintf(fp, "-40 33 translate\n"); - (void) fprintf(fp, "1 -1 scale\n"); - free(scale); -diff -up ncl_ncarg-6.1.2/ni/src/mkwrap/wrapit_main.c.format ncl_ncarg-6.1.2/ni/src/mkwrap/wrapit_main.c ---- ncl_ncarg-6.1.2/ni/src/mkwrap/wrapit_main.c.format 2013-02-06 20:28:03.000000000 -0700 -+++ ncl_ncarg-6.1.2/ni/src/mkwrap/wrapit_main.c 2014-01-31 22:46:38.570497183 -0700 -@@ -267,7 +267,7 @@ main(int argc,char* argv[]) - char *type = "NclANY"; - - -- fprintf(stdout,initial_fmt); -+ fprintf(stdout,"%s",initial_fmt); - if(!yyparse()) { - /* - tmp = wrap_list; -@@ -277,7 +277,7 @@ main(int argc,char* argv[]) - - } - */ -- fprintf(stdout,init_fmt); -+ fprintf(stdout,"%s",init_fmt); - tmp = wrap_list; - while(tmp!= NULL) { - fprintf(stdout,"\tnargs = 0;\n"); -@@ -357,7 +357,7 @@ main(int argc,char* argv[]) - } - tmp = tmp->next; - } -- fprintf(stdout,endf_fmt); -+ fprintf(stdout,"%s",endf_fmt); - exit(0); - } else { - fprintf(stdout,"Everything is NOT ok!\n"); -diff -up ncl_ncarg-6.1.2/ni/src/ncl/NclGRIB.c.format ncl_ncarg-6.1.2/ni/src/ncl/NclGRIB.c ---- ncl_ncarg-6.1.2/ni/src/ncl/NclGRIB.c.format 2013-02-06 20:28:47.000000000 -0700 -+++ ncl_ncarg-6.1.2/ni/src/ncl/NclGRIB.c 2014-01-31 22:16:00.870421500 -0700 -@@ -2282,7 +2282,7 @@ GribFileRecord *therec; - if (cp && ! strcmp(cp,"_hours")) { - if ((NrmQuark)therec->options[GRIB_INITIAL_TIME_COORDINATE_TYPE_OPT].values == NrmStringToQuark("numeric")) - continue; -- sprintf(buffer,NrmQuarkToString(dimq)); -+ sprintf(buffer,"%s",NrmQuarkToString(dimq)); - cp = strrchr(buffer,'_'); - *cp = '\0'; - newdimq = NrmStringToQuark(buffer); diff --git a/ncl-hdf5.patch b/ncl-hdf5.patch deleted file mode 100644 index f44795f..0000000 --- a/ncl-hdf5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ncl_ncarg-6.2.0/ni/src/ncl/NclNewHDF5.c.hdf5 ncl_ncarg-6.2.0/ni/src/ncl/NclNewHDF5.c ---- ncl_ncarg-6.2.0/ni/src/ncl/NclNewHDF5.c.hdf5 2014-03-31 20:23:16.000000000 -0600 -+++ ncl_ncarg-6.2.0/ni/src/ncl/NclNewHDF5.c 2014-04-04 14:06:02.352612375 -0600 -@@ -2549,7 +2549,7 @@ NrmQuark* _get_refquarks(hid_t dset, hid - - f_space = H5Dget_space(dset); - -- if (f_space == FAIL) -+ if (0 > f_space) - { - fprintf(stderr, "\nfile: %s, line: %d\n", __FILE__, __LINE__); - fprintf(stderr, "\tH5Dget_space failed.\n"); diff --git a/ncl.spec b/ncl.spec index 796972e..006f842 100644 --- a/ncl.spec +++ b/ncl.spec @@ -1,6 +1,6 @@ Name: ncl -Version: 6.2.0 -Release: 3%{?dist} +Version: 6.2.1 +Release: 1%{?dist} Summary: NCAR Command Language and NCAR Graphics Group: Applications/Engineering @@ -31,11 +31,6 @@ Patch1: ncarg-4.4.1-deps.patch Patch2: ncl-5.1.0-ppc64.patch # Add needed -lm to ictrans build, remove unneeded -lrx -lidn -ldl from ncl Patch3: ncl-libs.patch -# Fix build with -Werror=format-security -# https://bugzilla.redhat.com/show_bug.cgi?id=1037211 -Patch4: ncl-format.patch -# Fix 6.2.0 compilation without EOS support -Patch5: ncl-hdf5.patch # don't have the installation target depends on the build target since # for library it implies running ranlib and modifying the library timestamp Patch10: ncl-5.0.0-no_install_dep.patch @@ -127,8 +122,6 @@ Example programs and data using NCL. %patch1 -p1 -b .deps %patch2 -p1 -b .ppc64 %patch3 -p1 -b .libs -%patch4 -p1 -b .format -%patch5 -p1 -b .hdf5 %patch10 -p1 -b .no_install_dep %patch11 -p1 -b .build_n_scripts %patch12 -p1 -b .netcdff @@ -345,6 +338,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 5 2014 Orion Poplawski - 6.2.1-1 +- Update to 6.2.1 + * Sun Aug 17 2014 Fedora Release Engineering - 6.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index d12d57c..fc6b720 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10e17772120a17f3ff30ffd79ea43a7a ncl_ncarg-6.2.0.tar.gz +b2b8147e88e26acf52a411d788eb47f9 ncl_ncarg-6.2.1.tar.gz