rpms/ncl/EL-6 import.log, NONE, 1.1 ncl-5.2.0-libs.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 Site.local.ncl, 1.4, 1.5 ncl.spec, 1.22, 1.23 sources, 1.4, 1.5

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/ncl/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31430/EL-6

Modified Files:
	.cvsignore Site.local.ncl ncl.spec sources 
Added Files:
	import.log ncl-5.2.0-libs.patch 
Log Message:
Update to 5.2.0 from devel


--- NEW FILE import.log ---
ncl-5_2_0-1_fc14:EL-6:ncl-5.2.0-1.fc14.src.rpm:1278007767

ncl-5.2.0-libs.patch:
 ncarview/src/bin/ictrans/yMakefile |    2 ++
 ni/src/ncl/yMakefile               |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE ncl-5.2.0-libs.patch ---
diff -up ncl_ncarg-5.2.0/ncarview/src/bin/ictrans/yMakefile.libs ncl_ncarg-5.2.0/ncarview/src/bin/ictrans/yMakefile
--- ncl_ncarg-5.2.0/ncarview/src/bin/ictrans/yMakefile.libs	1998-02-04 08:58:14.000000000 -0700
+++ ncl_ncarg-5.2.0/ncarview/src/bin/ictrans/yMakefile	2010-04-28 13:35:00.892361794 -0600
@@ -29,6 +29,8 @@ DEP_LIBS	=	$(DEPICTRANSLIB) $(DEPCTRANSL
 
 #ifdef  IRIX
 MORE_LIBS	= -lmalloc
+#else
+MORE_LIBS	= -lm
 #endif
 
 EXTRA_LIBS	= $(X11LIBS) $(SUNLIBS) $(NETCDFLIB) $(HDFLIB) $(CTOFLIBS)
diff -up ncl_ncarg-5.2.0/ni/src/ncl/yMakefile.libs ncl_ncarg-5.2.0/ni/src/ncl/yMakefile
--- ncl_ncarg-5.2.0/ni/src/ncl/yMakefile.libs	2010-03-15 20:01:01.000000000 -0600
+++ ncl_ncarg-5.2.0/ni/src/ncl/yMakefile	2010-04-28 13:56:25.401421261 -0600
@@ -121,7 +121,7 @@ DODS_LIBS	= -lnc-dap -ldap -ldapclient -
 #elif defined(Darwin)
 DODS_LIBS	= -lnc-dap -ldap -ldapclient -lcurl -lxml2 -lpthread -lssl
 #elif defined(linux)
-DODS_LIBS	= -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread -lidn -ldl
+DODS_LIBS	= -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread
 #else
 DODS_LIBS	= -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread -lssl
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	21 Jul 2009 20:13:59 -0000	1.4
+++ .cvsignore	1 Jul 2010 18:09:55 -0000	1.5
@@ -1 +1 @@
-ncl_ncarg_src-5.1.1.tar.gz
+ncl_ncarg_src-5.2.0.tar.gz


Index: Site.local.ncl
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-6/Site.local.ncl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- Site.local.ncl	21 Jul 2009 20:13:59 -0000	1.4
+++ Site.local.ncl	1 Jul 2010 18:09:55 -0000	1.5
@@ -4,12 +4,18 @@
 #define SharePath $(DESTDIR)@datadir@
 
 #define BuildWithF90 TRUE
-#define IncSearch -I/usr/include/netcdf
+#define IncSearch -I/usr/include/netcdf -I/usr/include/udunits2
 #define LibSearch -L at libdir@/hdf
 
-#define BuildNetCDF4 0
+#define BuildNetCDF4 1
+#define NetCDF4lib -lnetcdf
 #define BuildV5D 0
 #define BuildHDFEOS 0
+#define BuildHDFEOS5 0
 #define BuildTRIANGLE 0
 #define V5Dlib
 #define BuildDODS 1
+#define HDFlib -lmfhdf -ldf -ljpeg -lz
+#define BuildUdunits 1
+#define UdUnitslib -ludunits2
+


Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-6/ncl.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- ncl.spec	22 Sep 2009 17:42:33 -0000	1.22
+++ ncl.spec	1 Jul 2010 18:09:55 -0000	1.23
@@ -1,12 +1,12 @@
 Name:           ncl
-Version:        5.1.1
-Release:        3%{?dist}
+Version:        5.2.0
+Release:        1%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
 License:        BSD
 URL:            http://www.ncl.ucar.edu
-# You must register for a free account at http://www.earthsystemgrid.org/ before being able to download the source.
+# You must register for a free account at http://esg.ucar.edu/ before being able to download the source.
 Source0:        ncl_ncarg_src-%{version}.tar.gz
 Source1:        Site.local.ncl
 Source2:        ncarg.csh
@@ -29,6 +29,8 @@ Source3:        ncarg.sh
 Patch0:         ncl-5.1.0-paths.patch
 Patch1:         ncarg-4.4.1-deps.patch
 Patch2:         ncl-5.1.0-ppc64.patch
+# Add needed -lm to ictrans build, remove unneeded -lidn -ldl from ncl
+Patch3:         ncl-5.2.0-libs.patch
 Patch7:         ncl-5.0.0-atlas.patch
 # don't have the installation target depends on the build target since
 # for library it implies running ranlib and modifying the library timestamp
@@ -42,14 +44,15 @@ Patch13:        ncl-5.1.0-includes.patch
 Patch15:        ncl-5.0.0-udunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  /bin/csh, gcc-gfortran, netcdf-devel, hdf-devel >= 4.2r2, libjpeg-devel
-BuildRequires:  g2clib-devel, libnc-dap-devel, librx-devel, atlas-devel
+BuildRequires:  /bin/csh, gcc-gfortran, netcdf-devel
+BuildRequires:  hdf-static, hdf-devel >= 4.2r2, libjpeg-devel
+BuildRequires:  g2clib-static, g2clib-devel, libnc-dap-devel, librx-devel, atlas-devel
 # imake needed for makedepend
 BuildRequires:  imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel
 BuildRequires:  byacc, flex
-BuildRequires:  udunits-devel
+BuildRequires:  udunits2-devel
 Requires:       %{name}-common = %{version}-%{release}
-Requires:       udunits
+Requires:       udunits2
 
 Provides:       ncarg = %{version}-%{release}
 Obsoletes:      ncarg < %{version}-%{release}
@@ -115,12 +118,15 @@ Example programs and data using NCL.
 %patch0 -p1 -b .paths
 %patch1 -p1 -b .deps
 %patch2 -p1 -b .ppc64
+%patch3 -p1 -b .libs
 %patch7 -p1 -b .atlas
 %patch10 -p1 -b .no_install_dep
 %patch11 -p1 -b .build_n_scripts
 %patch12 -p1 -b .netcdff
 %patch13 -p1 -b .includes
 %patch15 -p1 -b .udunits
+#Spurrious exec permissions
+find -name '*.[fh]' -exec chmod -x {} +
 
 #Use ppc config if needed
 %ifarch ppc ppc64
@@ -195,7 +201,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING Copyright README
-%{_sysconfdir}/profile.d/ncarg.*sh
+%config(noreplace) %{_sysconfdir}/profile.d/ncarg.*sh
 %{_bindir}/ConvertMapData
 %{_bindir}/WriteLineFile
 %{_bindir}/WriteNameFile
@@ -252,6 +258,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ncarg/colormaps/
 %{_datadir}/ncarg/data/
 %{_datadir}/ncarg/grib2_codetables/
+%{_datadir}/ncarg/grib2_codetables.previous/
 %{_datadir}/ncarg/nclscripts/
 %{_datadir}/ncarg/ngwww/
 %{_datadir}/ncarg/sysresfile/
@@ -303,6 +310,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 28 2010 - Orion Poplawski <orion at cora.nwra.com> - 5.2.0-1
+- Update to 5.2.0
+- Update libs patch
+- Fixup profile script packaging
+
+* Tue Feb 16 2010 - Orion Poplawski <orion at cora.nwra.com> - 5.1.1-6
+- Add patch to fix FTBFS bug #564856
+
+* Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 5.1.1-5
+- Same as below with hdf-static
+- Explicitly BR g2clib-static in accordance with the Packaging
+  Guidelines (g2clib-devel is still static-only).
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/EL-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	21 Jul 2009 20:13:59 -0000	1.4
+++ sources	1 Jul 2010 18:09:55 -0000	1.5
@@ -1 +1 @@
-42154992f2966320dc9f8958b9d81da3  ncl_ncarg_src-5.1.1.tar.gz
+7ed710647a7eec8f500c7494853a2b65  ncl_ncarg_src-5.2.0.tar.gz