From ba6029bbc089b77ffe99a6fe978ba1974003b654 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Apr 07 2011 14:43:28 +0000 Subject: Update to 2.0beta4 --- diff --git a/.gitignore b/.gitignore index 098ad78..0f35d72 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ ncview-1.93c.tar.gz +/ncview-2.0beta4.tar.gz diff --git a/ncview-1.92e-Makefile.in.patch b/ncview-1.92e-Makefile.in.patch deleted file mode 100644 index a9c1ffb..0000000 --- a/ncview-1.92e-Makefile.in.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up ncview-1.93c/Makefile.in.BAD ncview-1.93c/Makefile.in ---- ncview-1.93c/Makefile.in.BAD 2008-08-11 14:42:41.000000000 -0400 -+++ ncview-1.93c/Makefile.in 2008-08-11 14:43:19.000000000 -0400 -@@ -43,7 +43,7 @@ MANDIR = @prefix@/man/man1 - ## files will be kept and installed. Comment this line out if - ## no such directory will be specified. - ##################################################################### --NCVIEW_LIB_DIR = @prefix@/lib/ncview -+NCVIEW_LIB_DIR = @datadir@ - - ###################################################################### - ## If needed, *add* here the names of any additional include or library -@@ -115,7 +115,7 @@ clean:: - ncview: $(OBJS) - @CC@ $(MYCFLAGS) -o ncview $(OBJS) $(LDOPTIONS) $(OTHERLIBDIRS) \ - @X_LIBS@ $(NETCDFLIB) $(UDUNITSLIB) $(XAWLIB) $(XMULIB) \ -- $(PPMLIB) \ -+ $(PPMLIBDIR) $(PPMLIB) \ - @X_PRE_LIBS@ $(XTOOLLIB) $(XEXTLIB) $(XLIB) @X_EXTRA_LIBS@ -lm - - ncview.1: ncview.1.sed diff --git a/ncview-1.92e-do_print.c.patch b/ncview-1.92e-do_print.c.patch deleted file mode 100644 index 9196650..0000000 --- a/ncview-1.92e-do_print.c.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- ncview-1.92e/do_print.c.orig 2005-07-06 13:33:37.000000000 -0400 -+++ ncview-1.92e/do_print.c 2005-07-06 14:00:56.000000000 -0400 -@@ -75,6 +75,7 @@ - size_t x_size, y_size, top_of_image, bot_of_image, - center_x, center_y, left_of_image, right_of_image; - char outfname[1024], tstr[1500]; -+ int outfid; - FILE *outf; - float output_scale; - int r, g, b, n_print; -@@ -86,20 +87,35 @@ - sprintf( printopts.out_file_name, "ncview.%s.ps", view->variable->name ); - if( printer_options( &printopts ) == MESSAGE_CANCEL ) - return; -- -- if( printopts.output_device == DEVICE_PRINTER ) -- strcpy( printopts.out_file_name, tmpnam(NULL) ); - -- if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) -+ if( printopts.output_device == DEVICE_PRINTER ) { -+ strcpy( printopts.out_file_name, "/tmp/ncview.XXXXXX" ); -+ outfid = mkstemp( printopts.out_file_name ); -+ if (outfid == -1) { -+ sprintf( tstr, "Error opening temporary file for output!\n" ); -+ in_error( tstr ); - return; -- -- if( (outf = fopen(printopts.out_file_name, "w" )) == NULL ) { -+ } -+ if( (outf = fopen(printopts.out_file_name, "a" )) == NULL ) { - sprintf( tstr, "Error opening file %s for output!\n", -- outfname ); -+ printopts.out_file_name ); - in_error( tstr ); - return; -- } -- -+ } -+ close(outfid); -+ } -+ else { -+ if( warn_if_file_exits( printopts.out_file_name ) == MESSAGE_CANCEL ) -+ return; -+ -+ if( (outf = fopen(printopts.out_file_name, "w" )) == NULL ) { -+ sprintf( tstr, "Error opening file %s for output!\n", -+ outfname ); -+ in_error( tstr ); -+ return; -+ } -+ } -+ - in_set_cursor_busy(); - calc_scale( &output_scale, x_size, y_size ); - diff --git a/ncview-1.92e-netpbm.patch b/ncview-1.92e-netpbm.patch deleted file mode 100644 index eb861d1..0000000 --- a/ncview-1.92e-netpbm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ncview-1.92e/configure.BAD 2005-07-05 16:07:32.000000000 -0500 -+++ ncview-1.92e/configure 2005-07-05 16:07:53.000000000 -0500 -@@ -2835,7 +2835,7 @@ - fi - - fi --PPM_LIBNAME=libppm.so -+PPM_LIBNAME=libnetpbm.so - # Check whether --with-ppm_libdir or --without-ppm_libdir was given. - if test "${with_ppm_libdir+set}" = set; then - withval="$with_ppm_libdir" diff --git a/ncview.spec b/ncview.spec index 0f5d15a..6974adc 100644 --- a/ncview.spec +++ b/ncview.spec @@ -1,18 +1,16 @@ Name: ncview -Version: 1.93c -Release: 7%{?dist} +Version: 2.0 +Release: 0.1.beta4%{?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-1.93c.tar.gz -Patch0: ncview-1.92e-Makefile.in.patch +Source0: ftp://cirrus.ucsd.edu/pub/ncview/ncview-%{version}beta4.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: netcdf-devel udunits-devel netpbm-devel -Requires: udunits +BuildRequires: netcdf-devel udunits2-devel netpbm-devel %description Ncview is a visual browser for netCDF format files. Typically you @@ -22,32 +20,30 @@ various dimensions, take a look at the actual data values, change color maps, invert the data, etc. %prep -%setup -q -%patch0 -p1 -#%patch1 -p1 +%setup -q -n %{name}-%{version}beta4 %build +make distclean %configure --with-netcdf_incdir=%{_includedir}/netcdf \ + --with-ppm_incdir=%{_includedir}/netpbm \ + --with-udunits2_incdir=%{_includedir}/udunits2 \ --x-libraries=%{_libdir} --datadir=%{_datadir}/ncview # WARNING! # The parallel build was tested and it does NOT work. # make %{?_smp_mflags} make -sed s=NCVIEW_LIB_DIR=%{_datadir}/ncview= < ncview.1.sed > ncview.1 +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 cp -p Ncview-appdefaults ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview -#cat > install-appdef < - 2.0-0.1.beta4 +- Update to 2.0beta4 + * Tue Feb 08 2011 Fedora Release Engineering - 1.93c-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 46c3280..c03be2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c6a3cbabb9c1a55633fae7d892b301cc ncview-1.93c.tar.gz +03968a8fdf13c71c7582c2352f771a85 ncview-2.0beta4.tar.gz