rpms/ncview/devel ncview-1.92e-Makefile.in.patch, NONE, 1.1 ncview-1.92e-do_print.c.patch, NONE, 1.1 ncview-1.92e-netpbm.patch, NONE, 1.1 ncview.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Ed Hill (edhill)
fedora-extras-commits at redhat.com
Thu Jul 7 22:30:55 UTC 2005
Author: edhill
Update of /cvs/extras/rpms/ncview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8838/devel
Modified Files:
.cvsignore sources
Added Files:
ncview-1.92e-Makefile.in.patch ncview-1.92e-do_print.c.patch
ncview-1.92e-netpbm.patch ncview.spec
Log Message:
auto-import ncview-1.92e-4 on branch devel from ncview-1.92e-4.src.rpm
ncview-1.92e-Makefile.in.patch:
--- NEW FILE ncview-1.92e-Makefile.in.patch ---
--- ncview-1.92e/Makefile.in.orig 2004-10-12 15:54:42.795409115 -0400
+++ ncview-1.92e/Makefile.in 2004-10-12 15:55:14.503542390 -0400
@@ -43,7 +43,7 @@
## 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
@@ -123,7 +123,7 @@
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
ncview-1.92e-do_print.c.patch:
--- NEW FILE ncview-1.92e-do_print.c.patch ---
--- 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,34 @@
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;
- }
-
+ }
+ }
+ 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 );
ncview-1.92e-netpbm.patch:
--- NEW FILE ncview-1.92e-netpbm.patch ---
--- 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"
--- NEW FILE ncview.spec ---
Name: ncview
Version: 1.92e
Release: 4
Summary: A visual browser for netCDF format files
Group: Applications/Engineering
License: GPL
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xorg-x11-devel netcdf-devel udunits-devel netpbm-devel
Requires: xorg-x11 udunits
%description
Ncview is a visual browser for netCDF format files. Typically you
would use ncview to get a quick and easy, push-button look at your
netCDF files. You can view simple movies of the data, view along
various dimensions, take a look at the actual data values, change
color maps, invert the data, etc.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%configure --with-netcdf_incdir=%{_includedir}/netcdf-3 \
--with-netcdf_libdir=%{_libdir}/netcdf-3 --with-ppm_libdir=%{_libdir} \
--prefix=/usr --datadir=%{_datadir}/ncview
# WARNING!
# The parallel build was tested and it does NOT work.
# make %{?_smp_mflags}
make
%install
rm -rf $RPM_BUILD_ROOT
export XAPPLRESDIR="${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
%makeinstall NCVIEW_LIB_DIR=${RPM_BUILD_ROOT}%{_datadir}/ncview BINDIR=${RPM_BUILD_ROOT}%{_bindir} MANDIR=${RPM_BUILD_ROOT}%{_mandir}/man1
chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/ncview/*
chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview
chmod 644 ${RPM_BUILD_ROOT}%{_mandir}/man1/*
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc README COPYING
%{_bindir}/*
%{_datadir}/ncview
%{_libdir}/X11/app-defaults/*
%{_mandir}/man1/*
%changelog
* Wed Jul 6 2005 Ed Hill <ed at eh3.com> - 1.92e-4
- mkstemp() security fix and more cleanups
* Wed Jul 6 2005 Ed Hill <ed at eh3.com> - 1.92e-3
- move the data files to %{_datadir} and add COPYING
- added xorg-x11 Requires and BuildRequires
* Tue Jul 5 2005 Ed Hill <ed at eh3.com> - 1.92e-2
- fix permissions, remove fortran dependency, and small cleanups
* Tue Jul 5 2005 Tom "spot" Callaway <tcallawa at redhat.com> - 1.92e-1
- Fedora Extras cleanups
* Sun Dec 5 2004 Ed Hill <eh3 at mit.edu> - 0:1.92e-0.fdr.0
- Initial version
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ncview/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 7 Jul 2005 22:30:03 -0000 1.1
+++ .cvsignore 7 Jul 2005 22:30:53 -0000 1.2
@@ -0,0 +1 @@
+ncview-1.92e.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ncview/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 7 Jul 2005 22:30:03 -0000 1.1
+++ sources 7 Jul 2005 22:30:53 -0000 1.2
@@ -0,0 +1 @@
+37b9566e6ece132c9e578e69db0cdf7d ncview-1.92e.tar.gz
More information about the fedora-extras-commits
mailing list