rpms/ncl/devel ncl-5.0.0-includes.patch, NONE, 1.1 ncl-5.0.0-hdf.patch, 1.1, 1.2 ncl.spec, 1.1, 1.2
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Thu Mar 27 22:47:39 UTC 2008
- Previous message (by thread): rpms/iverilog/devel .cvsignore, 1.5, 1.6 iverilog.spec, 1.5, 1.6 sources, 1.5, 1.6
- Next message (by thread): rpms/abiword/devel abiword-2.6.0-boolean.patch, NONE, 1.1 abiword-2.6.0-desktop.patch, NONE, 1.1 abiword-2.6.0-libabiword.patch, NONE, 1.1 abiword-2.6.0-textbox.patch, NONE, 1.1 abiword-2.6.0-windowshelppaths.patch, NONE, 1.1 abiword-extras-2.6.0-destdir.patch, NONE, 1.1 abiword-plugins-2.6.0-boolean.patch, NONE, 1.1 abiword-plugins-2.6.0-regression.patch, NONE, 1.1 abiword-plugins-2.6.0-xmpp.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 abiword.spec, 1.51, 1.52 sources, 1.16, 1.17 abiword-2.0.9-windowshelppaths.patch, 1.1, NONE abiword-2.4.4-desktop.patch, 1.1, NONE abiword-2.4.6-boolean.patch, 1.1, NONE abiword-2.4.6-fontmanager.patch, 1.1, NONE abiword-2.4.6-goffice04.patch, 1.1, NONE abiword-2.4.6-goffice06.patch, 1.1, NONE abiword-2.4.6-toc-layout.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/ncl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2859
Modified Files:
ncl-5.0.0-hdf.patch ncl.spec
Added Files:
ncl-5.0.0-includes.patch
Log Message:
* Thu Mar 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-10
- Add patch to fixup some missing includes
- Define _ISOC99_SOURCE to expose vsnprintf prototype
- Update hdf patch to remove hdf/netcdf.h include
ncl-5.0.0-includes.patch:
--- NEW FILE ncl-5.0.0-includes.patch ---
--- ncl_ncarg-5.0.0/common/src/libncarg_c/bcopyswap.c.includes 2000-08-21 22:03:31.000000000 -0600
+++ ncl_ncarg-5.0.0/common/src/libncarg_c/bcopyswap.c 2008-03-21 11:01:12.000000000 -0600
@@ -33,6 +33,7 @@
* of 4.
*/
#include <stdio.h>
+#include <stdlib.h>
bcopyswap(b1, b2, size)
char *b1;
--- ncl_ncarg-5.0.0/common/src/bin/ncargpath/ncargpath.c.includes 2000-08-21 22:04:15.000000000 -0600
+++ ncl_ncarg-5.0.0/common/src/bin/ncargpath/ncargpath.c 2008-03-21 11:02:16.000000000 -0600
@@ -41,6 +41,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <ncarg/c.h>
--- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/plotchar/bofred.c.includes 2000-08-22 09:05:20.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/plotchar/bofred.c 2008-03-21 11:04:17.000000000 -0600
@@ -25,6 +25,10 @@
************************************************************************/
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
#include <stdio.h>
#include <ncarg/c.h>
--- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/areasC/c_argeti.c.includes 2000-08-22 09:02:06.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/areasC/c_argeti.c 2008-03-21 11:05:46.000000000 -0600
@@ -24,6 +24,7 @@
* *
************************************************************************/
+#include <string.h>
#include <ncarg/ncargC.h>
extern void NGCALLF(argeti,ARGETI)(NGstring,int*,int);
--- ncl_ncarg-5.0.0/ncarg2d/src/libncarg/ncargC.h.includes 2008-03-21 11:10:43.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg/ncargC.h 2008-03-21 11:10:25.000000000 -0600
@@ -176,6 +176,12 @@
#endif
);
+extern void NGCALLF(agback,AGBACK)(
+#ifdef NeedFuncProto
+ void
+#endif
+);
+
extern char *c_agbnch(
#ifdef NeedFuncProto
int idsh
--- ncl_ncarg-5.0.0/ncarg2d/src/libncarg_gks/zlib/gzio.c.includes 2005-12-04 13:52:16.000000000 -0700
+++ ncl_ncarg-5.0.0/ncarg2d/src/libncarg_gks/zlib/gzio.c 2008-03-21 11:15:20.000000000 -0600
@@ -8,6 +8,7 @@
/* @(#) $Id: gzio.c,v 1.2 2005/12/04 20:52:16 haley Exp $ */
#include <stdio.h>
+#include <stdarg.h>
#include "zutil.h"
ncl-5.0.0-hdf.patch:
Index: ncl-5.0.0-hdf.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl-5.0.0-hdf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ncl-5.0.0-hdf.patch 28 Feb 2008 22:11:41 -0000 1.1
+++ ncl-5.0.0-hdf.patch 27 Mar 2008 22:47:30 -0000 1.2
@@ -1,6 +1,14 @@
--- ncl_ncarg-5.0.0/ni/src/ncl/NclHDF.c.hdf 2007-06-20 19:35:32.000000000 -0600
-+++ ncl_ncarg-5.0.0/ni/src/ncl/NclHDF.c 2007-12-13 12:43:33.000000000 -0700
-@@ -63,7 +63,7 @@
++++ ncl_ncarg-5.0.0/ni/src/ncl/NclHDF.c 2008-03-21 13:18:13.000000000 -0600
+@@ -24,7 +24,6 @@
+ #include "defs.h"
+ #define HAVE_NETCDF
+ #include <hdf/mfhdf.h>
+-#include <hdf/netcdf.h>
+ #include "NclData.h"
+ #include "NclFileInterfaces.h"
+ #include <math.h>
+@@ -63,7 +62,7 @@
NclQuark var_path;
nc_type data_type;
int n_dims;
@@ -9,7 +17,7 @@
int natts;
HDFAttInqRecList *att_list;
};
-@@ -308,9 +308,9 @@
+@@ -308,9 +307,9 @@
#endif
{
@@ -21,7 +29,7 @@
strncpy(buffer,hdf_name,len);
cp = tp = buffer;
-@@ -342,7 +342,7 @@
+@@ -342,7 +341,7 @@
*cp = '\0';
if (ncl_class) {
@@ -30,7 +38,7 @@
strncat(cp,"__",len);
cp += 2;
*cp = '\0';
-@@ -460,9 +460,9 @@
+@@ -460,9 +459,9 @@
int32 sd_id, sds_id, sds_ref;
intn status;
int32 n_datasets, n_file_attrs, index;
@@ -42,7 +50,7 @@
/********************* End of variable declaration ***********************/
/* * Open the file and initialize the SD interface. */
sd_id = SDstart (path, DFACC_READ);
-@@ -647,8 +647,8 @@
+@@ -647,8 +646,8 @@
HDFFileRecord *tmp = (HDFFileRecord*) rec;
int cdfid;
int dummy;
@@ -53,7 +61,7 @@
int i,j,has_scalar_dim = 0,nvars = 0;
long tmp_size;
HDFAttInqRecList **stepalptr;
-@@ -1247,7 +1247,7 @@
+@@ -1247,7 +1246,7 @@
int cdfid = -1;
int ret = -1,i;
int no_stride = 1;
@@ -62,7 +70,7 @@
stepvl = rec->vars;
while(stepvl != NULL) {
-@@ -1467,7 +1467,7 @@
+@@ -1467,7 +1466,7 @@
HDFFileRecord *rec = (HDFFileRecord*)therec;
int cdfid;
HDFVarInqRecList *stepvl;
@@ -71,7 +79,7 @@
int i,n_elem = 1,no_stride = 1;
int ret;
-@@ -1950,7 +1950,7 @@
+@@ -1950,7 +1949,7 @@
HDFVarInqRecList *stepvl = NULL;
int cdfid,i,ret;
nc_type *the_data_type;
Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ncl.spec 28 Feb 2008 22:11:41 -0000 1.1
+++ ncl.spec 27 Mar 2008 22:47:30 -0000 1.2
@@ -1,6 +1,6 @@
Name: ncl
Version: 5.0.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: NCAR Command Language and NCAR Graphics
Group: Applications/Engineering
@@ -40,6 +40,7 @@
# is all
Patch11: ncl-5.0.0-build_n_scripts.patch
Patch12: ncl-5.0.0-netcdff.patch
+Patch13: ncl-5.0.0-includes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel >= 4.2r2, libjpeg-devel
@@ -107,6 +108,7 @@
%patch10 -p1 -b .no_install_dep
%patch11 -p1 -b .build_n_scripts
%patch12 -p1 -b .netcdff
+%patch13 -p1 -b .includes
#Move wrapit.c to wrapit77.c to avoid flex make rule issues
#This works in combination with the wrapit patch
@@ -117,8 +119,8 @@
cp config/LINUX.ppc32.GNU config/LINUX
%endif
-#Fixup LINUX config
-sed -i -e '/StdDefines/s/-DSYSV//' config/LINUX
+#Fixup LINUX config (to expose vsnprintf prototype)
+sed -i -e '/StdDefines/s/-DSYSV/-D_ISOC99_SOURCE/' config/LINUX
#Fixup libdir for atlas lib locations
sed -i -e s,%LIBDIR%,%{_libdir}, config/Project
@@ -148,6 +150,8 @@
# (cd ./config; make -f Makefile.ini clean all)
# ./config/ymake -config ./config -Curdir . -Topdir .
+#make Build CCOPTIONS="$RPM_OPT_FLAGS -fPIC -Werror-implicit-function-declaration" F77=gfortran F77_LD=gfortran\
+
make Build CCOPTIONS="$RPM_OPT_FLAGS -fPIC" F77=gfortran F77_LD=gfortran\
CTOFLIBS="-lgfortran" FCOPTIONS="$RPM_OPT_FLAGS -fPIC -fno-second-underscore -fno-range-check" \
COPT= FOPT=
@@ -282,6 +286,11 @@
%changelog
+* Thu Mar 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-10
+- Add patch to fixup some missing includes
+- Define _ISOC99_SOURCE to expose vsnprintf prototype
+- Update hdf patch to remove hdf/netcdf.h include
+
* Mon Feb 18 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-9
- Rename Site.local to Site.local.ncl
- Add comment for imake BR
- Previous message (by thread): rpms/iverilog/devel .cvsignore, 1.5, 1.6 iverilog.spec, 1.5, 1.6 sources, 1.5, 1.6
- Next message (by thread): rpms/abiword/devel abiword-2.6.0-boolean.patch, NONE, 1.1 abiword-2.6.0-desktop.patch, NONE, 1.1 abiword-2.6.0-libabiword.patch, NONE, 1.1 abiword-2.6.0-textbox.patch, NONE, 1.1 abiword-2.6.0-windowshelppaths.patch, NONE, 1.1 abiword-extras-2.6.0-destdir.patch, NONE, 1.1 abiword-plugins-2.6.0-boolean.patch, NONE, 1.1 abiword-plugins-2.6.0-regression.patch, NONE, 1.1 abiword-plugins-2.6.0-xmpp.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 abiword.spec, 1.51, 1.52 sources, 1.16, 1.17 abiword-2.0.9-windowshelppaths.patch, 1.1, NONE abiword-2.4.4-desktop.patch, 1.1, NONE abiword-2.4.6-boolean.patch, 1.1, NONE abiword-2.4.6-fontmanager.patch, 1.1, NONE abiword-2.4.6-goffice04.patch, 1.1, NONE abiword-2.4.6-goffice06.patch, 1.1, NONE abiword-2.4.6-toc-layout.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list