rpms/ncl/devel ncl-5.2.0-libs.patch,1.1,1.2 ncl.spec,1.26,1.27

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/ncl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31585

Modified Files:
	ncl-5.2.0-libs.patch ncl.spec 
Log Message:
* Thu Jul 1 2010 - Orion Poplawski <orion at cora.nwra.com> - 5.2.0-2
- Drop BR libnc-dap and update lib patch to remove unneeded libraries


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

Index: ncl-5.2.0-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl-5.2.0-libs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ncl-5.2.0-libs.patch	28 Apr 2010 21:33:18 -0000	1.1
+++ ncl-5.2.0-libs.patch	1 Jul 2010 22:01:02 -0000	1.2
@@ -18,7 +18,7 @@ diff -up ncl_ncarg-5.2.0/ni/src/ncl/yMak
  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
++DODS_LIBS	= -lcurl -lrx -lpthread
  #else
  DODS_LIBS	= -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread -lssl
  #endif


Index: ncl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncl/devel/ncl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ncl.spec	28 Apr 2010 21:33:18 -0000	1.26
+++ ncl.spec	1 Jul 2010 22:01:02 -0000	1.27
@@ -1,6 +1,6 @@
 Name:           ncl
 Version:        5.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 Group:          Applications/Engineering
@@ -46,7 +46,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 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
+BuildRequires:  g2clib-static, g2clib-devel, librx-devel, atlas-devel
 # imake needed for makedepend
 BuildRequires:  imake, libXt-devel, libXaw-devel, libXext-devel, libXpm-devel
 BuildRequires:  byacc, flex
@@ -310,6 +310,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 1 2010 - Orion Poplawski <orion at cora.nwra.com> - 5.2.0-2
+- Drop BR libnc-dap and update lib patch to remove unneeded libraries
+
 * Wed Apr 28 2010 - Orion Poplawski <orion at cora.nwra.com> - 5.2.0-1
 - Update to 5.2.0
 - Update libs patch