rpms/ncl/F-11 ncarg.csh, 1.1, 1.2 ncarg.sh, 1.1, 1.2 ncl-5.0.0-paths.patch, 1.1, 1.2 ncl.spec, 1.15, 1.16
Orion Poplawski
orion at fedoraproject.org
Tue May 19 17:39:42 UTC 2009
- Previous message: rpms/ncl/F-10 ncarg.csh, 1.1, 1.2 ncarg.sh, 1.1, 1.2 ncl-5.0.0-paths.patch, 1.1, 1.2 ncl.spec, 1.11, 1.12
- Next message: rpms/ncl/devel ncarg.csh, 1.1, 1.2 ncarg.sh, 1.1, 1.2 ncl-5.0.0-paths.patch, 1.1, 1.2 ncl.spec, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: orion
Update of /cvs/pkgs/rpms/ncl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16042/F-11
Modified Files:
ncarg.csh ncarg.sh ncl-5.0.0-paths.patch ncl.spec
Log Message:
* 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
Index: ncarg.csh
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-11/ncarg.csh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncarg.csh 12 Dec 2008 18:07:36 -0000 1.1
+++ ncarg.csh 19 May 2009 17:39:12 -0000 1.2
@@ -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
Index: ncarg.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-11/ncarg.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncarg.sh 12 Dec 2008 18:07:36 -0000 1.1
+++ ncarg.sh 19 May 2009 17:39:12 -0000 1.2
@@ -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
ncl-5.0.0-paths.patch:
Index: ncl-5.0.0-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-11/ncl-5.0.0-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncl-5.0.0-paths.patch 28 Feb 2008 22:11:41 -0000 1.1
+++ ncl-5.0.0-paths.patch 19 May 2009 17:39:12 -0000 1.2
@@ -110,15 +110,6 @@ diff -up 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, \
Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-11/ncl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ncl.spec 10 Mar 2009 15:01:46 -0000 1.15
+++ ncl.spec 19 May 2009 17:39:12 -0000 1.16
@@ -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 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
+
* Thu Mar 5 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-1
- Update to 5.1.0
- Rebase ppc64, netcdff patch
- Previous message: rpms/ncl/F-10 ncarg.csh, 1.1, 1.2 ncarg.sh, 1.1, 1.2 ncl-5.0.0-paths.patch, 1.1, 1.2 ncl.spec, 1.11, 1.12
- Next message: rpms/ncl/devel ncarg.csh, 1.1, 1.2 ncarg.sh, 1.1, 1.2 ncl-5.0.0-paths.patch, 1.1, 1.2 ncl.spec, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list