rpms/ncl/F-11 ncarg.csh, 1.2, 1.3 ncarg.sh, 1.2, 1.3 ncl.spec, 1.16, 1.17

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/ncl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7000/F-11

Modified Files:
	ncarg.csh ncarg.sh ncl.spec 
Log Message:
Move database back to main arch dependent package



Index: ncarg.csh
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-11/ncarg.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ncarg.csh	19 May 2009 17:39:12 -0000	1.2
+++ ncarg.csh	26 May 2009 16:51:40 -0000	1.3
@@ -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


Index: ncarg.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-11/ncarg.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ncarg.sh	19 May 2009 17:39:12 -0000	1.2
+++ ncarg.sh	26 May 2009 16:51:40 -0000	1.3
@@ -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


Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-11/ncl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ncl.spec	19 May 2009 17:39:12 -0000	1.16
+++ ncl.spec	26 May 2009 16:51:40 -0000	1.17
@@ -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 at cora.nwra.com> - 5.1.0-3
+- Move database back to main arch dependent package
+ 
 * Tue May 19 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-2
 - Set NCARG_NCARG to /usr/share/ncarg
 - Move fontcaps and graphcaps back to main arch dependent package