rpms/ncarg/EL-5 ncarg-4.4.2-ppc64.patch, NONE, 1.1 ncarg-4.4.2-uint32.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 Site.local, 1.2, 1.3 ncarg.csh, 1.4, 1.5 ncarg.sh, 1.4, 1.5 ncarg.spec, 1.13, 1.14 sources, 1.4, 1.5 ncarg-4.4.1-config.patch, 1.2, NONE ncarg-4.4.1-include.patch, 1.1, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Fri Apr 11 17:06:17 UTC 2008
- Previous message (by thread): rpms/desktop-backgrounds/devel .cvsignore, 1.20, 1.21 desktop-backgrounds.spec, 1.56, 1.57 sources, 1.28, 1.29
- Next message (by thread): 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/ncarg/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20563
Modified Files:
.cvsignore Site.local ncarg.csh ncarg.sh 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 19 Jan 2007 22:23:40 -0000 1.4
+++ .cvsignore 11 Apr 2008 17:05:25 -0000 1.5
@@ -1 +1 @@
-ncarg-4.4.1.src.tar.gz
+ncarg_src-4.4.2.tar.gz
Index: Site.local
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-5/Site.local,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Site.local 3 Oct 2006 21:59:30 -0000 1.2
+++ Site.local 11 Apr 2008 17:05:25 -0000 1.3
@@ -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 LibRoot $(RPM_BUILD_ROOT)/usr/@LIB@/ncarg
-
-
-#define CcOptions $(RPM_OPT_FLAGS)
-#define FcOptions $(RPM_OPT_FLAGS)
#define BuildWithF90 TRUE
#define FCompiler gfortran
#define CtoFLibraries -lgfortran -lm
-#define LibSearch -L/usr/lib64/hdf -L/usr/lib/hdf
+#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.csh
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-5/ncarg.csh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ncarg.csh 12 Feb 2007 23:03:53 -0000 1.4
+++ ncarg.csh 11 Apr 2008 17:05:25 -0000 1.5
@@ -1,2 +1,2 @@
setenv NCARG_ROOT /usr
-setenv NCARG_LIB /usr/LIB/ncarg
+setenv NCARG_LIB /usr/@LIB@/ncarg
Index: ncarg.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-5/ncarg.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ncarg.sh 12 Feb 2007 23:03:53 -0000 1.4
+++ ncarg.sh 11 Apr 2008 17:05:25 -0000 1.5
@@ -1,2 +1,2 @@
export NCARG_ROOT=/usr
-export NCARG_LIB=/usr/LIB/ncarg
+export NCARG_LIB=/usr/@LIB@/ncarg
Index: ncarg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-5/ncarg.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ncarg.spec 12 Feb 2007 23:03:53 -0000 1.13
+++ ncarg.spec 11 Apr 2008 17:05:25 -0000 1.14
@@ -1,23 +1,24 @@
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-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
visualization.
@@ -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,/LIB/,/%{_lib}/, config/Site.local ncarg.csh ncarg.sh
+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,6 +153,13 @@
%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 :-(.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncarg/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 19 Jan 2007 22:23:40 -0000 1.4
+++ sources 11 Apr 2008 17:05:25 -0000 1.5
@@ -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 ---
- Previous message (by thread): rpms/desktop-backgrounds/devel .cvsignore, 1.20, 1.21 desktop-backgrounds.spec, 1.56, 1.57 sources, 1.28, 1.29
- Next message (by thread): 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list