rpms/ncl/F-10 ncl-5.1.0-paths.patch, NONE, 1.1 ncl.spec, 1.13, 1.14 ncl-5.0.0-paths.patch, 1.2, NONE

Orion Poplawski orion at fedoraproject.org
Tue Jul 7 20:36:18 UTC 2009 

Author: orion

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

Modified Files:
	ncl.spec 
Added Files:
	ncl-5.1.0-paths.patch 
Removed Files:
	ncl-5.0.0-paths.patch 
Log Message:
* Tue Jul 7 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-4
- Fixup more paths in shipped ncl scripts (bug #505240)


ncl-5.1.0-paths.patch:

--- NEW FILE ncl-5.1.0-paths.patch ---
diff -up ncl_ncarg-5.0.0/config/ymake.paths ncl_ncarg-5.0.0/config/ymake
--- ncl_ncarg-5.0.0/config/ymake.paths	2006-05-02 16:16:20.000000000 +0200
+++ ncl_ncarg-5.0.0/config/ymake	2008-02-01 15:19:00.000000000 +0100
@@ -185,6 +185,13 @@ if ($useinstalled != 0) then
         endif
         set defines = ($defines -D_InstBin\=$bin_dir)
 
+        set share_dir = `ncargpath share`
+        if ($status != 0) then
+                echo "$0 : Unable to find NCARG_SHARE dir" > /dev/tty
+                exit 1
+        endif
+        set defines = ($defines -D_InstShare\=$share_dir)
+
         set inc_dir = `ncargpath include`
         if ($status != 0) then
                 echo "$0 : Unable to find NCARG_INCLUDE dir" > /dev/tty
diff -up ncl_ncarg-5.0.0/config/Template.paths ncl_ncarg-5.0.0/config/Template
--- ncl_ncarg-5.0.0/config/Template.paths	2005-08-19 19:32:45.000000000 +0200
+++ ncl_ncarg-5.0.0/config/Template	2008-02-01 15:19:00.000000000 +0100
@@ -160,6 +160,14 @@ NGCOMM##################################
 #endif	/* _IgnoreYmakeRoot */
 #endif	/* BinRoot */
 
+#ifndef	ShareRoot
+#ifndef	_IgnoreYmakeRoot
+#define	ShareRoot	YmakeRoot/share
+#else
+#define	ShareRoot	_InstShare
+#endif	/* _IgnoreYmakeRoot */
+#endif	/* ShareRoot */
+
 #ifndef	LibRoot
 #ifndef	_IgnoreYmakeRoot
 #define LibRoot YmakeRoot/lib
@@ -210,6 +218,14 @@ NGCOMM##################################
 #endif
 #endif
 
+#ifndef	SharePath
+#ifdef	_UseRootPath
+#define	SharePath	RootPath/share
+#else
+#define	SharePath	ShareRoot
+#endif
+#endif
+
 #ifndef	LibPath
 #ifdef	_UseRootPath
 #define	LibPath	RootPath/lib
@@ -573,6 +589,7 @@ MANROOT			= ManRoot
 TMPROOT			= TmpRoot
 
 ROOTPATH		= RootPath
+SHAREPATH		= SharePath
 BINPATH			= BinPath
 LIBPATH			= LibPath
 INCPATH			= IncPath
diff -up ncl_ncarg-5.0.0/config/Project.paths ncl_ncarg-5.0.0/config/Project
--- ncl_ncarg-5.0.0/config/Project.paths	2007-10-11 18:38:32.000000000 +0200
+++ ncl_ncarg-5.0.0/config/Project	2008-02-01 15:19:00.000000000 +0100
@@ -227,7 +227,8 @@ ROBJDIR			= robj
 WWWDIR			= ngwww
 XAPPDIR			= xapp
 
-LIBNCARGROOT		= $(LIBROOT)/$(NCARGDIR)
+LIBNCARGROOT		= $(SHAREPATH)/$(NCARGDIR)
+LIBNCARGARCH		= $(LIBPATH)/$(NCARGDIR)
 CONFIGROOT		= $(LIBNCARGROOT)/$(CONFIGDIR)
 DBROOT			= $(LIBNCARGROOT)/$(DBDIR)
 FONTCAPROOT		= $(LIBNCARGROOT)/$(FONTCAPDIR)
@@ -235,7 +236,7 @@ GRAPHCAPROOT		= $(LIBNCARGROOT)/$(GRAPHC
 DATAROOT		= $(LIBNCARGROOT)/$(DATADIR)
 DOCROOT			= $(LIBNCARGROOT)/$(DOCDIR)
 EXAMPLESROOT		= $(LIBNCARGROOT)/$(EXAMPLESDIR)
-ROBJROOT		= $(LIBNCARGROOT)/$(ROBJDIR)
+ROBJROOT		= $(LIBNCARGARCH)/$(ROBJDIR)
 TESTSROOT		= $(LIBNCARGROOT)/$(TESTSDIR)
 TUTORIALROOT		= $(LIBNCARGROOT)/$(TUTORIALDIR)
 WWWROOT			= $(LIBNCARGROOT)/$(WWWDIR)
@@ -244,7 +245,7 @@ HLUEXROOT		= $(LIBNCARGROOT)/$(HLUEXDIR)
 RESFILEROOT		= $(LIBNCARGROOT)/$(RESDIR)
 NCLEXROOT		= $(LIBNCARGROOT)/$(NCLEXDIR)
 GRIB2CODETABLEROOT	= $(LIBNCARGROOT)/$(GRIB2CODETABLEDIR)
-LIBNCARGPATH		= $(LIBPATH)/$(NCARGDIR)
+LIBNCARGPATH		= $(SHAREPATH)/$(NCARGDIR)
 CONFIGPATH		= $(LIBNCARGPATH)/$(CONFIGDIR)
 DBPATH			= $(LIBNCARGPATH)/$(DBDIR)
 FONTCAPPATH		= $(LIBNCARGPATH)/$(FONTCAPDIR)
@@ -252,7 +253,7 @@ GRAPHCAPPATH		= $(LIBNCARGPATH)/$(GRAPHC
 DATAPATH		= $(LIBNCARGPATH)/$(DATADIR)
 DOCPATH			= $(LIBNCARGPATH)/$(DOCDIR)
 EXAMPLESPATH		= $(LIBNCARGPATH)/$(EXAMPLESDIR)
-ROBJPATH		= $(LIBNCARGPATH)/$(ROBJDIR)
+ROBJPATH		= $(LIBNCARGARCH)/$(ROBJDIR)
 TESTSPATH		= $(LIBNCARGPATH)/$(TESTSDIR)
 TUTORIALPATH		= $(LIBNCARGPATH)/$(TUTORIALDIR)
 WWWPATH			= $(LIBNCARGPATH)/$(WWWDIR)
@@ -314,10 +315,11 @@ NGENV_DESCRIPT	= \
 		"usrresfile",NULL,NULL,$(USRRESFILE),NULL,	\
 		"gks_output",NULL,NULL,"gmeta",NULL,		\
 		"bin",NULL,"root",NULL,NULL,			\
-		"lib",NULL,"root",NULL,NULL,			\
+		"lib",NULL,NULL,"$(LIBROOT)",NULL,			\
 		"include",NULL,"root",NULL,NULL,		\
+		"share",NULL,"root",NULL,NULL,			\
 		"man",NULL,"root",NULL,NULL,			\
-		"ncarg",NULL,"lib",NULL,NULL,			\
+		"ncarg",NULL,"share",NULL,NULL,			\
 		"config",NULL,"ncarg",NULL,NULL,		\
 		"data",NULL,"ncarg",NULL,NULL,			\
 		"database",NULL,"ncarg",NULL,NULL,		\


Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/F-10/ncl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ncl.spec	26 May 2009 16:50:00 -0000	1.13
+++ ncl.spec	7 Jul 2009 20:35:48 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           ncl
 Version:        5.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
@@ -26,7 +26,7 @@ Source3:        ncarg.sh
 #
 # install paths are set up in Project. Paths used in code are also in 
 # Project, in NGENV_DESCRIPT.
-Patch0:         ncl-5.0.0-paths.patch
+Patch0:         ncl-5.1.0-paths.patch
 Patch1:         ncarg-4.4.1-deps.patch
 Patch2:         ncl-5.1.0-ppc64.patch
 Patch7:         ncl-5.0.0-atlas.patch
@@ -142,13 +142,10 @@ sed -e 's;@prefix@;%{_prefix};' \
 cp %{SOURCE2} %{SOURCE3} .
 sed -i -e s, at LIB@,%{_lib},g ncarg.csh ncarg.sh
 
-pushd ni/src/examples
-for file in */*.ncl; do
-  sed -i -e 's;load "\$NCARG_ROOT/lib/ncarg/nclex\([^ ;]*\);loadscript(ncargpath("nclex") + "\1);' \
+sed -i -e 's;load "\$NCARG_ROOT/lib/ncarg/nclex\([^ ;]*\);loadscript(ncargpath("nclex") + "\1);' \
     -e 's;"\$NCARG_ROOT/lib/ncarg/\(data\|database\);ncargpath("\1") + ";' \
-   $file
-done
-popd
+    -e 's;\$NCARG_ROOT/lib/ncarg/nclscripts;$NCARG_ROOT/share/ncarg/nclscripts;' \
+    `find ni/src -name \*.ncl`
 
 
 %build
@@ -301,6 +298,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 7 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-4
+- Fixup more paths in shipped ncl scripts (bug #505240)
+
 * Tue May 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.1.0-3
 - Move database back to main arch dependent package
  


--- ncl-5.0.0-paths.patch DELETED ---

More information about the fedora-extras-commits mailing list