From 8a08015e2104bd6e411f71c08fde67b403b4c619 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: May 19 2009 17:39:12 +0000
Subject: - Set NCARG_NCARG to /usr/share/ncarg

- Move fontcaps and graphcaps back to main arch dependent package

---

diff --git a/ncarg.csh b/ncarg.csh
index cad1387..1f740b6 100755
--- a/ncarg.csh
+++ b/ncarg.csh
@@ -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
diff --git a/ncarg.sh b/ncarg.sh
index 8b26ed7..3b944a0 100755
--- a/ncarg.sh
+++ b/ncarg.sh
@@ -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
diff --git a/ncl-5.0.0-paths.patch b/ncl-5.0.0-paths.patch
index fc00c6d..8059097 100644
--- a/ncl-5.0.0-paths.patch
+++ b/ncl-5.0.0-paths.patch
@@ -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,		\
diff --git a/ncl.spec b/ncl.spec
index 1e594a3..a6dc2f7 100644
--- a/ncl.spec
+++ b/ncl.spec
@@ -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