From 46c6c87ababd9ddaef8f6532630e957b4dde1b9d Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Tue, 26 May 2009 16:51:41 +0000
Subject: [PATCH] Move database back to main arch dependent package

---
 ncarg.csh |  1 +
 ncarg.sh  |  1 +
 ncl.spec  | 11 +++++++----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ncarg.csh b/ncarg.csh
index 1f740b6..5cc02e5 100755
--- a/ncarg.csh
+++ b/ncarg.csh
@@ -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
diff --git a/ncarg.sh b/ncarg.sh
index 3b944a0..6520c04 100755
--- a/ncarg.sh
+++ b/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
diff --git a/ncl.spec b/ncl.spec
index a6dc2f7..5229a77 100644
--- a/ncl.spec
+++ b/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