rpms/ncarg/EL-4 ncarg-4.4.2-ppc64.patch, NONE, 1.1 ncarg-4.4.2-uint32.patch, NONE, 1.1 Site.local, 1.5, 1.6 ncarg.spec, 1.14, 1.15 sources, 1.2, 1.3 ncarg-4.4.1-config.patch, 1.2, NONE ncarg-4.4.1-include.patch, 1.1, NONE

Fri Apr 11 17:07:09 UTC 2008

Author: orion

Update of /cvs/pkgs/rpms/ncarg/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20726

Modified Files:
	Site.local ncarg.spec sources 
Added Files:
	ncarg-4.4.2-ppc64.patch ncarg-4.4.2-uint32.patch 
Removed Files:
	ncarg-4.4.1-config.patch ncarg-4.4.1-include.patch 
Log Message:
* Thu Apr 10 2008 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-1
- Update to 4.4.2
- Add Requires libXext-devel to -devel package
- Update license tag to GPLv2+
- Add patch to fix handling of raster images on 64-bit platforms
- Add missing defattr to devel package


ncarg-4.4.2-ppc64.patch:

--- NEW FILE ncarg-4.4.2-ppc64.patch ---
--- ncarg-4.4.2/config/ymake.ppc64	2006-05-02 08:16:20.000000000 -0600
+++ ncarg-4.4.2/config/ymake	2007-06-27 10:28:13.000000000 -0600
@@ -364,19 +364,13 @@
         case    x*86:
         case    i*64:
         case    x*64:
-        case    p*64:
+        case    ppc*:
         case    alpha:
             set model   = $mach
             set arch    = $mach
             set sysincs = LINUX
             set vendor  = IBM
             breaksw
-        case    ppc:
-            set model   = $mach
-            set arch    = $mach
-            set sysincs = YDLINUX
-            set vendor  = APPLE
-            breaksw
         default:
             echo "$0 : Unknown machine type" > /dev/tty
             exit 1

ncarg-4.4.2-uint32.patch:

--- NEW FILE ncarg-4.4.2-uint32.patch ---
--- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sgiraster.c.uint32	2000-08-22 09:12:18.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sgiraster.c	2008-04-11 09:29:45.000000000 -0600
@@ -315,8 +315,8 @@
 		just to be safe.
 		*/
 
-		sgiinfo->tmpbuf = (UInt16_T *) ras_calloc(3*header->xsize, 1);
-		if (sgiinfo->tmpbuf == (UInt16_T *) NULL) {
+		sgiinfo->tmpbuf = (uint16_t *) ras_calloc(3*header->xsize, 1);
+		if (sgiinfo->tmpbuf == (uint16_t *) NULL) {
 			(void) ESprintf(errno, "malloc(%d)", (3*header->xsize));
 			return(RAS_ERROR);
 		}
--- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sgiraster.h.uint32	2000-08-21 21:30:25.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sgiraster.h	2008-04-11 10:02:33.000000000 -0600
@@ -27,6 +27,7 @@
 #ifndef	__SGIRASTER_H__
 #define	__SGIRASTER_H__
 
+#include <stdint.h>
 
 #define SGI_FORMAT_NAME		"sgi"
 #define SGI_MAGIC 		0732
@@ -65,18 +66,6 @@
 is not (yet) that large.
 */
 
-#ifdef	alpha
-typedef	unsigned int	UInt32_T;
-typedef	unsigned short	UInt16_T;
-typedef	int		Int32_T;
-typedef	short		Int16_T;
-#else
-typedef	unsigned long	UInt32_T;
-typedef	unsigned short	UInt16_T;
-typedef	long		Int32_T;
-typedef	short		Int16_T;
-#endif
-
 #define RAS_SGI_RESERVED	512
 
 /*
@@ -84,15 +73,15 @@
 **
 */
 typedef	struct	{
-	UInt16_T	imagic B16;
-	UInt16_T 	type B16;
-	UInt16_T 	dim B16;
-	UInt16_T 	xsize B16;
-	UInt16_T 	ysize B16;
-	UInt16_T 	zsize B16;
-	UInt32_T 	min B32;
-	UInt32_T 	max B32;
-	UInt32_T	wastebytes B32;	
+	uint16_t	imagic B16;
+	uint16_t 	type B16;
+	uint16_t 	dim B16;
+	uint16_t 	xsize B16;
+	uint16_t 	ysize B16;
+	uint16_t 	zsize B16;
+	uint32_t 	min B32;
+	uint32_t 	max B32;
+	uint32_t	wastebytes B32;	
 	char 		name[80];
 	SgiColormapType	colormap B32;
 } SGIFileHeader_T;
--- ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sunraster.h.uint32	2000-08-21 21:30:25.000000000 -0600
+++ ncl_ncarg-5.0.0/ncarview/src/lib/libncarg_ras/sunraster.h	2008-04-11 10:02:46.000000000 -0600
@@ -27,13 +27,9 @@
 #ifndef _RASTER_SUN_
 #define _RASTER_SUN_
 
-#define RAS_SUN_ESC	128
+#include <stdint.h>
 
-#ifdef	alpha
-typedef	unsigned int	UInt32_T;
-#else
-typedef	unsigned long	UInt32_T;
-#endif
+#define RAS_SUN_ESC	128
 
 /* Sun image encoding types. */
 
@@ -55,14 +51,14 @@
 #define SUN_HEADER_SIZE	32
 
 typedef struct SunInfoStruct {
-	UInt32_T	ras_magic B32;	/* magic number */
-	UInt32_T	ras_width B32;	/* width (pixels) of image */
-	UInt32_T	ras_height B32;	/* height (pixels) of image */
-	UInt32_T	ras_depth B32;	/* depth - 1,8,24 bits */
-	UInt32_T	ras_length B32;	/* length (bytes) of image */
+	uint32_t	ras_magic B32;	/* magic number */
+	uint32_t	ras_width B32;	/* width (pixels) of image */
+	uint32_t	ras_height B32;	/* height (pixels) of image */
+	uint32_t	ras_depth B32;	/* depth - 1,8,24 bits */
+	uint32_t	ras_length B32;	/* length (bytes) of image */
 	SunEncodingType	ras_type B32;
 	SunColormapType	ras_maptype B32;
-	UInt32_T	ras_maplength B32;/* length (bytes) of following map */
+	uint32_t	ras_maplength B32;/* length (bytes) of following map */
 } SunInfo;
 
 #define	RAS_MAGIC	0x59a66a95


Index: Site.local
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-4/Site.local,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Site.local	24 May 2007 16:58:57 -0000	1.5
+++ Site.local	11 Apr 2008 17:06:26 -0000	1.6
@@ -1,26 +1,11 @@
-/*
- *	This file was created by the Configure script.
- */
-
-#ifdef FirstSite
-
-#endif /* FirstSite */
-
-
-#ifdef SecondSite
-
 #define YmakeRoot $(RPM_BUILD_ROOT)/usr
 #define ManRoot $(RPM_BUILD_ROOT)/usr/share/man
 #define LibRoot $(RPM_BUILD_ROOT)/usr/@LIB@/ncarg
 
-
-
-#define CcOptions $(RPM_OPT_FLAGS)
-#define FcOptions $(RPM_OPT_FLAGS)
 #define BuildWithF90 TRUE
-#define FCompiler g77
-#define CtoFLibraries -lg2c -lm
-#define LibSearch -L/usr/@LIB@/hdf -L/usr/X11R6/@LIB@
+#define FCompiler gfortran
+#define CtoFLibraries -lgfortran -lm
+#define LibSearch -L/usr/@LIB@/hdf
 
 #define BuildUdunits FALSE
 #define UdUnitslib
@@ -28,6 +13,3 @@
 #define HDFEOSlib
 #define BuildV5D TRUE
 #define BuildDODS FALSE
-
-
-#endif /* SecondSite */


Index: ncarg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-4/ncarg.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ncarg.spec	24 May 2007 16:58:57 -0000	1.14
+++ ncarg.spec	11 Apr 2008 17:06:26 -0000	1.15
@@ -1,22 +1,23 @@
 Name:           ncarg
-Version:        4.4.1
-Release:        9%{?dist}
+Version:        4.4.2
+Release:        1%{?dist}
 Summary:        A Fortran and C based software package for scientific visualization
 Group:          Development/Libraries
-License:        GPL
-URL:            http://ngwww.ucar.edu/ng4.4/index.html
-Source0:        http://ngwww.ucar.edu/ngbin/ncarg-%{version}.src.tar.gz
+License:        GPLv2+
+URL:            http://www.ncarg.ucar.edu/ng/index.html
+Source0:        http://www.ncarg.ucar.edu/ngbin/ncarg_src-%{version}.tar.gz
 Source1:        Site.local
 Source2:        ncarg.csh
 Source3:        ncarg.sh
-Patch1:         ncarg-4.4.1-config.patch
-Patch2:         ncarg-4.4.1-include.patch
+Patch0:         ncarg-4.4.2-uint32.patch
 Patch3:         ncarg-4.4.1-rpmroot.patch
 Patch4:         ncarg-4.4.1-deps.patch
+Patch5:         ncarg-4.4.2-ppc64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  /bin/csh, gcc-g77, hdf-devel, libjpeg-devel
-BuildRequires:  xorg-x11-sdk, xorg-x11-devel
+BuildRequires:  /bin/csh, gcc-gfortran >= 4.1.0, hdf-devel, libjpeg-devel
+BuildRequires:  imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel
+
 
 %description
 NCAR Graphics is a Fortran and C based software package for scientific
@@ -26,20 +27,30 @@
 Summary:        A Fortran and C based software package for scientific visualization
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       libXext-devel
 
 %description devel
 Include files and libraries for NCAR Graphics
 
+
 %prep
 %setup -q
-%patch1 -p 1 -b .config
-%patch2 -p 1 -b .include
+%patch0 -p 1 -b .uint32
 %patch3 -p 1 -b .rpmroot
 %patch4 -p 1 -b .deps
+%patch5 -p 1 -b .ppc64
 cp %{SOURCE1} config
 #Fix up the lib install dir
 cp %{SOURCE2} %{SOURCE3} .
 sed -i -e s, at LIB@,%{_lib},g config/Site.local ncarg.csh ncarg.sh
+#Use ppc config if needed
+%ifarch ppc ppc64
+cp config/LINUX.ppc32.GNU config/LINUX
+%endif
+#Remove -DSYSV from StdDefines
+sed -i -e /StdDefines/s/-DSYSV// config/LINUX
+#Add RPM_OPT_FLAGS
+sed -i -e '/cOptions/s/$/ $(RPM_OPT_FLAGS)/' config/LINUX
 
 
 %build
@@ -113,6 +124,7 @@
 %{_bindir}/tlocal
 %dir %{_libdir}/ncarg
 %dir %{_libdir}/ncarg/ncarg
+%{_libdir}/ncarg/ncarg/data/
 %{_libdir}/ncarg/ncarg/database/
 %{_libdir}/ncarg/ncarg/fontcaps/
 %{_libdir}/ncarg/ncarg/graphcaps/
@@ -123,6 +135,7 @@
 %{_mandir}/man5/*.gz
 
 %files devel
+%defattr(-,root,root,-)
 %{_bindir}/ncargcc
 %{_bindir}/ncargex
 %{_bindir}/ncargf90
@@ -140,14 +153,21 @@
 
 
 %changelog
+* Thu Apr 10 2008 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-1
+- Update to 4.4.2
+- Add Requires libXext-devel to -devel package
+- Update license tag to GPLv2+
+- Add patch to fix handling of raster images on 64-bit platforms
+- Add missing defattr to devel package
+
 * Mon Feb 12 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.1-9
 - Fix up the source files that were modified then checked in :-(.
 
 * Fri Feb 09 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.1-8
 - Don't modify SOURCE files directly
 
-* Mon Jan 29 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.1-7
-- Bump release
+* Fri Jan 26 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.1-7
+- Bump release to try to get fixed version out for bug #223420
 
 * Mon Jan 22 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.1-6
 - Revert to 4.4.1, no 4.4.2 ever was released into the wild.
@@ -155,6 +175,9 @@
 - Add patch to fix dependency in fontcap.
 - Tweak compile defines
 
+* Fri Jan 19 2007 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-3
+- Never seemed to make it into FC6
+
 * Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 4.4.2-2
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Feb 2006 17:12:53 -0000	1.2
+++ sources	11 Apr 2008 17:06:26 -0000	1.3
@@ -1 +1 @@
-f62f226acc8b5588ff3537f28ac85a7d  ncarg-4.4.1.src.tar.gz
+141a49fc1f3070ddc788a81193012e2f  ncarg_src-4.4.2.tar.gz


--- ncarg-4.4.1-config.patch DELETED ---


--- ncarg-4.4.1-include.patch DELETED ---


