[ncview] Update to 2.1.1 Drop cflags patch fixed upstream Add BR libpng-devel

[Orion Poplawski]

commit f49b4126ca55c3ef123c66ec3bb753229cdb055b
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Aug 3 10:43:35 2011 -0600

    Update to 2.1.1
    Drop cflags patch fixed upstream
    Add BR libpng-devel

 .gitignore              |    1 +
 ncview-2.0-cflags.patch |   26 --------------------------
 ncview.spec             |   20 ++++++++++++--------
 sources                 |    2 +-
 4 files changed, 14 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f35d72..f5e4027 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 ncview-1.93c.tar.gz
 /ncview-2.0beta4.tar.gz
+/ncview-2.1.1.tar.gz
diff --git a/ncview.spec b/ncview.spec
index b9b8ca2..2172695 100644
--- a/ncview.spec
+++ b/ncview.spec
@@ -1,17 +1,16 @@
 Name:           ncview
-Version:        2.0
-Release:        0.2.beta4%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPLv1
 URL:            http://meteora.ucsd.edu/~pierce/ncview_home_page.html
-Source0:        ftp://cirrus.ucsd.edu/pub/ncview/ncview-%{version}beta4.tar.gz
-#Patch to preserve CFLAGS in configure
-Patch0:         ncview-2.0-cflags.patch
+Source0:        ftp://cirrus.ucsd.edu/pub/ncview/ncview-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xorg-x11-proto-devel libXaw-devel libXt-devel libXext-devel
 BuildRequires:  libXmu-devel libICE-devel libSM-devel libX11-devel
+BuildRequires:  libpng-devel
 BuildRequires:  netcdf-devel udunits2-devel netpbm-devel
 BUildRequires:  expat-devel
 
@@ -23,11 +22,10 @@ various dimensions, take a look at the actual data values, change
 color maps, invert the data, etc.
 
 %prep
-%setup -q -n %{name}-%{version}beta4
-%patch0 -p1 -b .cflags
+%setup -q
+
 
 %build
-make distclean
 %configure --with-netcdf_incdir=%{_includedir}/netcdf \
  --with-ppm_incdir=%{_includedir}/netpbm \
  --with-udunits2_incdir=%{_includedir}/udunits2 \
@@ -38,6 +36,7 @@ make distclean
 make
 sed s=NCVIEW_LIB_DIR=%{_datadir}/ncview= < data/ncview.1.sed > data/ncview.1
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
@@ -64,6 +63,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 3 2011 Orion Poplawski <orion at cora.nwra.com> - 2.1.1-1
+- Update to 2.1.1
+- Drop cflags patch fixed upstream
+- Add BR libpng-devel
+
 * Thu Apr 14 2011 Orion Poplawski <orion at cora.nwra.com> - 2.0-0.2.beta4
 - Add patch to use RPM_OPT_FLAGS (bug #696739)
 
diff --git a/sources b/sources
index c03be2d..f77a978 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03968a8fdf13c71c7582c2352f771a85  ncview-2.0beta4.tar.gz
+34e25f5949af342a1783542799f51bed  ncview-2.1.1.tar.gz