Move database back to main arch dependent package
This commit is contained in:
parent
8a08015e21
commit
46c6c87aba
@ -1,5 +1,6 @@
|
||||
setenv NCARG_ROOT /usr
|
||||
setenv NCARG_LIB /usr/@LIB@/ncarg
|
||||
setenv NCARG_DATABASE /usr/@LIB@/ncarg/database
|
||||
setenv NCARG_FONTCAPS /usr/@LIB@/ncarg/fontcaps
|
||||
setenv NCARG_GRAPHCAPS /usr/@LIB@/ncarg/graphcaps
|
||||
setenv NCARG_NCARG /usr/share/ncarg
|
||||
|
1
ncarg.sh
1
ncarg.sh
@ -1,5 +1,6 @@
|
||||
export NCARG_ROOT=/usr
|
||||
export NCARG_LIB=/usr/@LIB@/ncarg
|
||||
export NCARG_DATABASE=/usr/@LIB@/ncarg/database
|
||||
export NCARG_FONTCAPS=/usr/@LIB@/ncarg/fontcaps
|
||||
export NCARG_GRAPHCAPS=/usr/@LIB@/ncarg/graphcaps
|
||||
export NCARG_NCARG=/usr/share/ncarg
|
||||
|
11
ncl.spec
11
ncl.spec
@ -1,6 +1,6 @@
|
||||
Name: ncl
|
||||
Version: 5.1.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: NCAR Command Language and NCAR Graphics
|
||||
|
||||
Group: Applications/Engineering
|
||||
@ -172,8 +172,8 @@ 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 \
|
||||
# database, fontcaps, and graphcaps are arch dependent
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/ncarg/{database,{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/*
|
||||
@ -241,6 +241,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/tdpackdemo
|
||||
%{_bindir}/tgks0a
|
||||
%{_bindir}/tlocal
|
||||
%{_libdir}/ncarg/database/
|
||||
%{_libdir}/ncarg/fontcaps/
|
||||
%{_libdir}/ncarg/graphcaps/
|
||||
|
||||
@ -249,7 +250,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir %{_datadir}/ncarg
|
||||
%{_datadir}/ncarg/colormaps/
|
||||
%{_datadir}/ncarg/data/
|
||||
%{_datadir}/ncarg/database/
|
||||
%{_datadir}/ncarg/grib2_codetables/
|
||||
%{_datadir}/ncarg/nclscripts/
|
||||
%{_datadir}/ncarg/ngwww/
|
||||
@ -301,6 +301,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue May 26 2009 - Orion Poplawski <orion@cora.nwra.com> - 5.1.0-3
|
||||
- Move database back to main arch dependent package
|
||||
|
||||
* 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
|
||||
|
Loading…
Reference in New Issue
Block a user