From 58bbcaabfe0c5fb4c86ef3b5eb12d34c8367285f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 1 Jul 2010 22:01:02 +0000 Subject: [PATCH] - Drop BR libnc-dap and update lib patch to remove unneeded libraries --- ncl-5.2.0-libs.patch | 2 +- ncl.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ncl-5.2.0-libs.patch b/ncl-5.2.0-libs.patch index b78e0db..64a1b84 100644 --- a/ncl-5.2.0-libs.patch +++ b/ncl-5.2.0-libs.patch @@ -18,7 +18,7 @@ diff -up ncl_ncarg-5.2.0/ni/src/ncl/yMakefile.libs ncl_ncarg-5.2.0/ni/src/ncl/yM 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 diff --git a/ncl.spec b/ncl.spec index a766475..c78dc2e 100644 --- a/ncl.spec +++ b/ncl.spec @@ -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}-%{version}-%{release}-root-%(%{__id_u} -n) 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 - 5.2.0-2 +- Drop BR libnc-dap and update lib patch to remove unneeded libraries + * Wed Apr 28 2010 - Orion Poplawski - 5.2.0-1 - Update to 5.2.0 - Update libs patch