- Set NCARG_NCARG to /usr/share/ncarg

- Move fontcaps and graphcaps back to main arch dependent package
This commit is contained in:
Orion Poplawski 2009-05-19 17:39:12 +00:00
parent f28168bbd4
commit 8a08015e21
4 changed files with 16 additions and 12 deletions

View File

@ -1,2 +1,5 @@
setenv NCARG_ROOT /usr
setenv NCARG_LIB /usr/@LIB@/ncarg
setenv NCARG_FONTCAPS /usr/@LIB@/ncarg/fontcaps
setenv NCARG_GRAPHCAPS /usr/@LIB@/ncarg/graphcaps
setenv NCARG_NCARG /usr/share/ncarg

View File

@ -1,2 +1,5 @@
export NCARG_ROOT=/usr
export NCARG_LIB=/usr/@LIB@/ncarg
export NCARG_FONTCAPS=/usr/@LIB@/ncarg/fontcaps
export NCARG_GRAPHCAPS=/usr/@LIB@/ncarg/graphcaps
export NCARG_NCARG=/usr/share/ncarg

View File

@ -110,15 +110,6 @@ diff -up ncl_ncarg-5.0.0/config/Project.paths ncl_ncarg-5.0.0/config/Project
TESTSPATH = $(LIBNCARGPATH)/$(TESTSDIR)
TUTORIALPATH = $(LIBNCARGPATH)/$(TUTORIALDIR)
WWWPATH = $(LIBNCARGPATH)/$(WWWDIR)
@@ -272,7 +273,7 @@ USRRESFILE = "~/.hluresfile"
NCARGURL = "ngurl"
NCARGSITEFILE = "ncargsite"
-ROOTPATHCHECK = "/lib/ncarg/fontcaps/font1"
+ROOTPATHCHECK = "/share/ncarg/fontcaps/font1"
/*
* This huge define is used to define all the Environment variables
@@ -314,10 +315,11 @@ NGENV_DESCRIPT = \
"usrresfile",NULL,NULL,$(USRRESFILE),NULL, \
"gks_output",NULL,NULL,"gmeta",NULL, \

View File

@ -1,6 +1,6 @@
Name: ncl
Version: 5.1.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: NCAR Command Language and NCAR Graphics
Group: Applications/Engineering
@ -172,6 +172,9 @@ export NCARG=`pwd`
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -m 0644 ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
# fontcaps and graphcaps are arch dependent
mv $RPM_BUILD_ROOT%{_datadir}/ncarg/{font,graph}caps \
$RPM_BUILD_ROOT%{_libdir}/ncarg/
# Don't conflict with allegro-devel (generic API names)
for manpage in $RPM_BUILD_ROOT%{_mandir}/man3/*
do
@ -238,6 +241,8 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/tdpackdemo
%{_bindir}/tgks0a
%{_bindir}/tlocal
%{_libdir}/ncarg/fontcaps/
%{_libdir}/ncarg/graphcaps/
%files common
%defattr(-,root,root,-)
@ -245,8 +250,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/ncarg/colormaps/
%{_datadir}/ncarg/data/
%{_datadir}/ncarg/database/
%{_datadir}/ncarg/fontcaps/
%{_datadir}/ncarg/graphcaps/
%{_datadir}/ncarg/grib2_codetables/
%{_datadir}/ncarg/nclscripts/
%{_datadir}/ncarg/ngwww/
@ -298,6 +301,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue May 19 2009 - Orion Poplawski <orion@cora.nwra.com> - 5.1.0-2
- Set NCARG_NCARG to /usr/share/ncarg
- Move fontcaps and graphcaps back to main arch dependent package
* Thu Mar 5 2009 - Orion Poplawski <orion@cora.nwra.com> - 5.1.0-1
- Update to 5.1.0
- Rebase ppc64, netcdff patch