diff --git a/.cvsignore b/.cvsignore index 6e68c9e..098ad78 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ncview-1.92e.tar.gz +ncview-1.93c.tar.gz diff --git a/ncview.spec b/ncview.spec index aefc4cc..05eed69 100644 --- a/ncview.spec +++ b/ncview.spec @@ -1,19 +1,17 @@ Name: ncview -Version: 1.92e -Release: 13%{?dist} +Version: 1.93c +Release: 1%{?dist} Summary: A visual browser for netCDF format files Group: Applications/Engineering -License: GPL +License: GPLv1 URL: http://meteora.ucsd.edu/~pierce/ncview_home_page.html -Source0: ftp://cirrus.ucsd.edu/pub/ncview/ncview-1.92e.tar.gz -Patch0: ncview-1.92e-Makefile.in.patch -Patch1: ncview-1.92e-netpbm.patch -Patch2: ncview-1.92e-do_print.c.patch +Source0: ftp://cirrus.ucsd.edu/pub/ncview/ncview-1.93c.tar.gz +Patch0: ncview-1.92e-Makefile.in.patch 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: netcdf-devel netcdf-static udunits-devel netpbm-devel +BuildRequires: netcdf-devel udunits-devel netpbm-devel Requires: xorg-x11-server-Xorg udunits %description @@ -26,13 +24,11 @@ color maps, invert the data, etc. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 %build %configure --with-netcdf_incdir=%{_includedir}/netcdf-3 \ - --with-netcdf_libdir=%{_libdir} --with-ppm_libdir=%{_libdir} \ - --prefix=/usr --datadir=%{_datadir}/ncview + --x-libraries=%{_libdir} --datadir=%{_datadir}/ncview # WARNING! # The parallel build was tested and it does NOT work. # make %{?_smp_mflags} @@ -42,13 +38,14 @@ sed s=NCVIEW_LIB_DIR=%{_datadir}/ncview= < ncview.1.sed > ncview.1 %install rm -rf $RPM_BUILD_ROOT mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults -cp Ncview-appdefaults ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview -cat > install-appdef < install-appdef < - 1.93c-1 +- update to 1.93c + * Mon Feb 18 2008 Fedora Release Engineering - 1.92e-13 - Autorebuild for GCC 4.3 @@ -98,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT - mkstemp() security fix and more cleanups * Wed Jul 6 2005 Ed Hill - 1.92e-3 -- move the data files to %{_datadir} and add COPYING +- move the data files to %%{_datadir} and add COPYING - added xorg-x11 Requires and BuildRequires * Tue Jul 5 2005 Ed Hill - 1.92e-2 diff --git a/sources b/sources index e953439..46c3280 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37b9566e6ece132c9e578e69db0cdf7d ncview-1.92e.tar.gz +c6a3cbabb9c1a55633fae7d892b301cc ncview-1.93c.tar.gz