Move database back to main arch dependent package

This commit is contained in:
Orion Poplawski 2009-05-26 16:51:41 +00:00
parent 8a08015e21
commit 46c6c87aba
3 changed files with 9 additions and 4 deletions

View File

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

View File

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

View File

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