rpms/ncl/devel ncl-5.0.0-udunits.patch, NONE, 1.1 Site.local.ncl, 1.2, 1.3 ncl.spec, 1.5, 1.6
Orion Poplawski
orion at fedoraproject.org
Fri Nov 28 03:21:57 UTC 2008
- Previous message: rpms/ncl/F-10 ncl-5.0.0-udunits.patch, NONE, 1.1 Site.local.ncl, 1.2, 1.3 ncl.spec, 1.5, 1.6
- Next message: rpms/python-virtualenv/devel .cvsignore, 1.3, 1.4 python-virtualenv.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/ncl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17155/devel
Modified Files:
Site.local.ncl ncl.spec
Added Files:
ncl-5.0.0-udunits.patch
Log Message:
* Thu Nov 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-13
- Enable udunits support add use system udunits.dat
ncl-5.0.0-udunits.patch:
--- NEW FILE ncl-5.0.0-udunits.patch ---
--- ncl_ncarg-5.0.0/ni/src/lib/nfp/udunitsW.c.udunits 2006-12-10 19:07:06.000000000 -0700
+++ ncl_ncarg-5.0.0/ni/src/lib/nfp/udunitsW.c 2008-11-27 08:41:11.000000000 -0700
@@ -23,21 +23,7 @@
*/
path = getenv("UDUNITS_PATH");
if ((void *)path == (void *)NULL) {
- path = _NGGetNCARGEnv("udunits");
- if ((void *)path != (void *)NULL) {
- strcpy(udunits_file,path);
- strcat(udunits_file,_NhlPATHDELIMITER);
- strcat(udunits_file,"udunits.dat");
- utret = utInit(udunits_file);
- }
- else {
-/*
- * Use path built-in at compile time. It's not a good thing if we reach
- * this point, because the "_NGGetNCARGEnv" call above should have
- * returned a valid path.
- */
- utret = utInit("");
- }
+ path = "/etc/udunits.dat";
}
else {
/*
Index: Site.local.ncl
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/Site.local.ncl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Site.local.ncl 11 Sep 2008 15:47:38 -0000 1.2
+++ Site.local.ncl 28 Nov 2008 03:21:27 -0000 1.3
@@ -7,8 +7,6 @@
#define IncSearch -I/usr/include/netcdf
#define LibSearch -L at libdir@/hdf
-#define BuildUdunits TRUE
-#define UdUnitslib
#define BuildV5D FALSE
#define BuildHDFEOS FALSE
#define BuildTRIANGLE 0
Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ncl.spec 11 Sep 2008 16:31:11 -0000 1.5
+++ ncl.spec 28 Nov 2008 03:21:27 -0000 1.6
@@ -1,6 +1,6 @@
Name: ncl
Version: 5.0.0
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: NCAR Command Language and NCAR Graphics
Group: Applications/Engineering
@@ -42,6 +42,8 @@
Patch12: ncl-5.0.0-netcdff.patch
Patch13: ncl-5.0.0-includes.patch
Patch14: ncl-5.0.0-uint32.patch
+# Use /etc/udunits.dat
+Patch15: ncl-5.0.0-udunits.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel >= 4.2r2, libjpeg-devel
@@ -49,6 +51,8 @@
# imake needed for makedepend
BuildRequires: imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel
BuildRequires: byacc, flex
+BuildRequires: udunits-devel
+Requires: udunits
Provides: ncarg = %{version}-%{release}
Obsoletes: ncarg < %{version}-%{release}
@@ -144,6 +148,7 @@
done
popd
+
%build
# short-cicuit:
./config/ymkmf
@@ -171,6 +176,8 @@
manname=`basename $manpage`
mv $manpage $RPM_BUILD_ROOT%{_mandir}/man3/%{name}_$manname
done
+# Use system udunits
+rm -r $RPM_BUILD_ROOT%{_datadir}/ncarg/udunits
# Remove $RPM_BUILD_ROOT from MakeNcl
#sed -i -e s,$RPM_BUILD_ROOT,,g $RPM_BUILD_ROOT%{_bindir}/MakeNcl
@@ -239,7 +246,6 @@
%{_datadir}/ncarg/nclscripts/
%{_datadir}/ncarg/ngwww/
%{_datadir}/ncarg/sysresfile/
-%{_datadir}/ncarg/udunits/
%{_datadir}/ncarg/xapp/
%{_mandir}/man1/*.gz
%{_mandir}/man5/*.gz
@@ -288,6 +294,9 @@
%changelog
+* Thu Nov 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-13
+- Enable udunits support add use system udunits.dat
+
* Thu Sep 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.0.0-12
- Rebuild for new libdap
- Fix netcdf include location
- Previous message: rpms/ncl/F-10 ncl-5.0.0-udunits.patch, NONE, 1.1 Site.local.ncl, 1.2, 1.3 ncl.spec, 1.5, 1.6
- Next message: rpms/python-virtualenv/devel .cvsignore, 1.3, 1.4 python-virtualenv.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list