rpms/saoimage/F-10 import.log, NONE, 1.1 saoimage-1.35.1-decls.patch, NONE, 1.1 saoimage-1.35.1-mkstemp.patch, NONE, 1.1 saoimage-1.35.1-pad.patch, NONE, 1.1 saoimage.desktop, NONE, 1.1 saoimage.png, NONE, 1.1 saoimage.spec, NONE, 1.1 saoimage.xml, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/saoimage/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7908/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log saoimage-1.35.1-decls.patch 
	saoimage-1.35.1-mkstemp.patch saoimage-1.35.1-pad.patch 
	saoimage.desktop saoimage.png saoimage.spec saoimage.xml 
Log Message:
Initial import


--- NEW FILE import.log ---
saoimage-1_35_1-1_el5:F-10:saoimage-1.35.1-1.el5.src.rpm:1225746391

saoimage-1.35.1-decls.patch:

--- NEW FILE saoimage-1.35.1-decls.patch ---
This is needed to get it compile on Linux with recent gcc (4.1.2).
Needs some cleanup sho we don't have to be ashamed.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

diff -urp saoimage-1.35.1/btnlib/border.c saoimage-1.35.1.fixed/btnlib/border.c
--- saoimage-1.35.1/btnlib/border.c	1995-05-04 19:21:13.000000000 +0200
+++ saoimage-1.35.1.fixed/btnlib/border.c	2008-10-19 21:13:51.000000000 +0200
@@ -21,6 +21,11 @@ static char SccsId[] = "%W%  %G%";
  *		{n} <who> -- <does what> -- <when>
  */
 
+// Forward declarations
+static unsigned char btn_ReverseByte();
+static void btn_MakeBdrLine();
+static void btn_RightBorder();
+
 /*
  * Subroutine:	btn_MakeBdrBitmap
  * Purpose:	Fill a bitmap of an empty button with a border pattern made
@@ -52,8 +57,6 @@ void btn_MakeBdrBitmap ( buttonmap, widt
   int right_form_bit;		/* l: bit in first right form byte to use */
   int right_bdr_byte;		/* l: index of first line byte for right bdr */
   int right_bdr_bit;		/* l: bit in first line byte for right bdr */
-  static unsigned char btn_ReverseByte();
-  static void btn_MakeBdrLine();
 
   /* portion of pattern form used (clip overlap if button very small) */
   /* middle overlap on odd size counted for height, omitted for width */
@@ -131,7 +134,6 @@ static void btn_MakeBdrLine ( line, form
      int right_bdr_byte;	/* l: index of first line byte for right bdr */
      int right_bdr_bit;		/* l: bit in first line byte for right bdr */
 {
-  static void btn_RightBorder();
   /* copy in top left, store reverse for top right */
   *line = *form;
   *(line+1) = *(++form);
diff -urp saoimage-1.35.1/btnlib/create.c saoimage-1.35.1.fixed/btnlib/create.c
--- saoimage-1.35.1/btnlib/create.c	1990-04-28 22:17:46.000000000 +0200
+++ saoimage-1.35.1.fixed/btnlib/create.c	2008-10-19 21:14:47.000000000 +0200
@@ -30,6 +30,9 @@ static char SccsId[] = "%W%  %G%";
 #include "borders.h"		/* static BorderPatterns defBorders */
 #include "motf.h"
 
+// Forward declarations
+static void btn_CreateWindows();
+
 static int motf_look = 0;	/* if set, buttons harmonize better w/ motif */
 
 #if VMS && IMTOOL
@@ -70,7 +73,6 @@ ButtonBox MakeButtonBox ( parent, gc, vi
   int x, y;			/* l: coordinates of box in parent */
   int i;			/* l: loop counter */
   char *btn_Alloc();
-  static void btn_CreateWindows();
   void btn_LabelButtons(), btn_Dimensions();
 
   /* allocate the space for the new record */
diff -urp saoimage-1.35.1/btnlib/draw.c saoimage-1.35.1.fixed/btnlib/draw.c
--- saoimage-1.35.1/btnlib/draw.c	1991-06-22 01:40:21.000000000 +0200
+++ saoimage-1.35.1.fixed/btnlib/draw.c	2008-10-19 21:12:01.000000000 +0200
@@ -44,6 +44,10 @@ int button_first=1;
 void put_z_image();
 #endif
 
+// Forward declarations
+static void btn_DimButtons();
+static void btn_LightButtons();
+
 /*
  * Subroutine:	btn_DrawButton
  * Purpose:	Draw button according to its status
@@ -107,7 +111,6 @@ void btn_DelightButtons ( buttonbox )
      ButtonBox buttonbox;
 {
   int i;
-  static void btn_DimButtons();
 
   btn_DimButtons(buttonbox);
   for( i=0; i < buttonbox->co_menu_count; i++ ) {
@@ -157,7 +160,6 @@ void btn_RelightButtons ( buttonbox )
      ButtonBox buttonbox;
 {
   int i;
-  static void btn_LightButtons();
 
   btn_LightButtons(buttonbox);
   for( i=0; i < buttonbox->co_menu_count; i++ ) {
diff -urp saoimage-1.35.1/btnlib/event.c saoimage-1.35.1.fixed/btnlib/event.c
--- saoimage-1.35.1/btnlib/event.c	1995-05-04 19:27:33.000000000 +0200
+++ saoimage-1.35.1.fixed/btnlib/event.c	2008-10-19 21:13:03.000000000 +0200
@@ -36,6 +36,9 @@ static char SccsId[] = "%W%  %G%";
 static int select_flag,  x_mask[2], select_mask[2];
 static int select_size=0;
 
+// Forward declarations
+static int btn_Event();
+static int btn_Control();
 
 /*
  * Subroutine:	ButtonEvent
@@ -57,7 +60,6 @@ int ButtonEvent ( buttonbox, event )
      XEvent *event;		/* i: pointer to filled event record */
 {
   int i;			/* l: loop counter */
-  static int btn_Event();
 
   /* is the event in the primary buttonbox (or its sub-menus) */
   if( btn_Event(buttonbox, event) != 0 ) {
@@ -147,8 +149,6 @@ int ButtonControl ( buttonbox, event, re
   int status;		/* o: reason for return code (-1,0,1) */
   int not_found;	/* l: event search status */
   int i;		/* l: loop counter */
-  static int btn_Event();
-  static int btn_Control();
 
   status = 1;
   *response = NULL;
@@ -218,7 +218,6 @@ static int btn_Control ( buttonbox, even
   int type;		/* l: temp for button response type */
   int id;		/* l: temp for button id */
   int mask[2];		/* l: temp store for select mask (select changes it) */
-  static int btn_Event();
   int btn_PushButton();
   void btn_PutImage(), btn_DrawButton(), btn_ReleaseButton();
 
diff -urp saoimage-1.35.1/btnlib/image.c saoimage-1.35.1.fixed/btnlib/image.c
--- saoimage-1.35.1/btnlib/image.c	1991-08-04 00:42:11.000000000 +0200
+++ saoimage-1.35.1.fixed/btnlib/image.c	2008-10-19 21:16:16.000000000 +0200
@@ -26,6 +26,10 @@ static char SccsId[] = "%W%  %G%";
 #include <X11/Xlib.h>
 #include "buttons.h"
 
+// Forward declarations
+static int btn_LabelX(), btn_LabelY();
+static void btn_AddLabel();
+
 /*
  * Subroutine:	btn_MakeXImages
  * Purpose:	Create XImage bitmaps for four states of a button
@@ -56,7 +60,6 @@ void btn_MakeXImages ( button, width, he
   unsigned char *data;		/* l: pointer to bitmap currently processing */
   XImage *ximage;
   char *btn_Alloc();
-  static void btn_AddLabel();
 
 #ifdef ALLIANT
   extern int nbutton;
@@ -185,7 +188,6 @@ static void btn_AddLabel ( label, width,
   int dst_x, dst_y;	/* l: coords of start of stencil in dst (button) */
   int xwdth;		/* l: width (cols) to stencil */
   int yhght;		/* l: number of lines (rows) to stencil */
-  static int btn_LabelX(), btn_LabelY();
   void btn_StencilLabel();
 
   if( ((xwdth = btn_LabelX(label, width, &src_x, &dst_x)) > 0) &&
diff -urp saoimage-1.35.1/btnlib/label.c saoimage-1.35.1.fixed/btnlib/label.c
--- saoimage-1.35.1/btnlib/label.c	1995-05-04 19:19:37.000000000 +0200
+++ saoimage-1.35.1.fixed/btnlib/label.c	2008-10-19 21:15:34.000000000 +0200
@@ -21,6 +21,10 @@ static char SccsId[] = "%W%  %G%";
  *		{n} <who> -- <does what> -- <when>
  */
 
+// Forward declarations
+static void btn_Stencil(), btn_StencilInv();
+static void btn_StencilAlligned(),btn_StencilAllignedInv();
+
 /* one byte bitmask for bits included at index and to the right */
 static unsigned char rmask[8] = { 0xff,0xfe,0xfc,0xf8,0xf0,0xe0,0xc0,0x80 };
 
@@ -66,9 +70,6 @@ void btn_StencilLabel ( src, msk, dst, s
   int first_mask;		/* l: bit mask, with coded sign (see above) */
   int last_mask;		/* l: bit mask, with coded sign (see above) */
 
-  static void btn_Stencil(), btn_StencilInv();
-  static void btn_StencilAlligned(),btn_StencilAllignedInv();
-
   /* advance src and msk to their first used bytes */
   byte_offset = (src_y * src_byte_width) + (src_x / 8);
   src += byte_offset;
diff -urp saoimage-1.35.1/btnlib/mount.c saoimage-1.35.1.fixed/btnlib/mount.c
--- saoimage-1.35.1/btnlib/mount.c	1990-04-20 23:56:27.000000000 +0200
+++ saoimage-1.35.1.fixed/btnlib/mount.c	2008-10-19 21:17:13.000000000 +0200
@@ -26,6 +26,9 @@ static char SccsId[] = "%W%  %G%";
 #include <X11/Xlib.h>	/* needed for Buttons.h */
 #include "buttons.h"
 
+// Forward declarations
+static void btn_UnmapButtonbox(), btn_MapButtonbox();
+
 /*
  * Subroutine:	MountButtonMenu
  * Purpose:	User call to initially display the button-panels
@@ -39,7 +42,6 @@ void MountButtonMenu ( buttonbox )
      ButtonBox buttonbox;
 {
   int i;
-  static void btn_MapButtonbox();
 
[...1995 lines suppressed...]
   void write_text_region();
-  static void cat_polypts(), cat_cen(), cat_params();
 
   switch( region->type ) {
   case COP_Box:
@@ -210,7 +217,6 @@ static void cat_polypts ( region, line )
      char *line;
 {
   int i;
-  static void cat_pt();
 
   cat_pt((double)region->poly[0].fileX, (double)region->poly[0].fileY,
 	 line, 0);
@@ -259,7 +265,6 @@ static void cat_annulus ( region, line )
      char *line;
 {
   char radius[16];
-  static void cat_cen();
 
   (void)strcat(line, "ANNULUS(");
   cat_cen(region, line);
@@ -281,8 +286,6 @@ static void write_annuli ( region, line,
      FILE *fd;
 {
   struct cursorRec *annulus;
-  static struct cursorRec *cat_annular();
-  static void cat_shape();
 
   /* annuli start with next_annulus (base region is not one of them) */ 
   if( (annulus = region->next_annulus) != NULL ) {
@@ -313,7 +316,6 @@ static struct cursorRec *cat_annular ( r
      struct cursorRec *region;
      char *line;
 {
-  static void cat_shape();
 
   if( region->next_annulus != NULL ) {
     if( region->exclude_region )
diff -urp saoimage-1.35.1/rgnwrite.c saoimage-1.35.1.fixed/rgnwrite.c
--- saoimage-1.35.1/rgnwrite.c	1995-09-09 00:29:19.000000000 +0200
+++ saoimage-1.35.1.fixed/rgnwrite.c	2008-10-19 22:16:17.000000000 +0200
@@ -44,6 +44,10 @@ static char SccsId[] = "%W%  %G%";
 #include "hfiles/edit.h"	/* define EditStruct */
 #include "hfiles/extern.h"	/* pass common structures */
 
+// Forward declarations
+static void write_region_imtool();
+static void set_time_string();
+
 #ifndef VMS
 #define	IRAFFILE	"frame.%d.%d"
 #else
@@ -66,7 +70,6 @@ void write_regions ( cursor, image, outp
   FILE *fd;
   static int last_output_type = 0;
   char fname[SZ_FNAME];
-  static void write_region_imtool();
   int open_output_file();
   EditStruct *init_edit_popup();
   void set_path_iraf(), write_region_pros(), load_edit_struct(), timestamp();
@@ -152,7 +155,6 @@ void timestamp ( fd, imagename )
 {
   char  line[SZ_LINE];
   int len;
-  static void set_time_string();
 
   /* timestamp the first entry in the output file. */
   set_time_string (line);
diff -urp saoimage-1.35.1/sclctrl.c saoimage-1.35.1.fixed/sclctrl.c
--- saoimage-1.35.1/sclctrl.c	1996-10-10 17:55:57.000000000 +0200
+++ saoimage-1.35.1.fixed/sclctrl.c	2008-10-19 22:02:24.000000000 +0200
@@ -25,6 +25,9 @@ static char SccsId[] = "%W%  %G%";
 #include "hfiles/define.h"	/* define MIN, MAX, DONT_CARE, etc. */
 #include "hfiles/struct.h"	/* declare structure types */
 #include "hfiles/extern.h"	/* extern main parameter structures */
+// Forward declarations
+static void new_histogram();
+
 #include "hfiles/scale.h"	/* define scaling constants */
 
 #ifdef ANSIC
@@ -78,7 +81,6 @@ void new_scalemap ( )
   static int max_given = 0;
   static int imtool_200 = 0;
   static int init = 1;		/* identify first time called */
-  static void new_histogram();
   void make_scalemap(), color_logo();
 #ifdef IMTOOL
   void set_imtool_colors();
diff -urp saoimage-1.35.1/sclmap.c saoimage-1.35.1.fixed/sclmap.c
--- saoimage-1.35.1/sclmap.c	1994-10-25 16:25:02.000000000 +0100
+++ saoimage-1.35.1.fixed/sclmap.c	2008-10-19 22:02:24.000000000 +0200
@@ -27,6 +27,10 @@ static char SccsId[] = "%W%  %G%";
 #include "hfiles/scale.h"	/* define scaling constants */
 
 #ifndef SUN
+// Forward declarations
+static void linear_scale(), wrap_scale(), sqrt_scale(), log_scale();
+static void get_histogram_range();
+
 #define expm1(a)  (exp(a)-1)
 #endif
 
@@ -40,7 +44,6 @@ void make_scalemap ( image_min, image_ma
      int image_min, image_max;	/* i: range of mapping for image data input */
 {
   void histogram_equalize();
-  static void linear_scale(), wrap_scale(), sqrt_scale(), log_scale();
 
   /* note the range of data for which mapping is to be calculated */
   if( image_max == image_min )
@@ -118,7 +121,6 @@ static void linear_scale ( image_min, im
   register int imageval;
   register int pixval;
   register int imagelim;
-  static void get_histogram_range();
 
   range_min = image_min;
   range_max = image_max;
diff -urp saoimage-1.35.1/wndwconf.c saoimage-1.35.1.fixed/wndwconf.c
--- saoimage-1.35.1/wndwconf.c	1995-01-21 01:27:13.000000000 +0100
+++ saoimage-1.35.1.fixed/wndwconf.c	2008-10-19 22:02:25.000000000 +0200
@@ -38,6 +38,9 @@ static char SccsId[] = "%W%  %G%";
 #include <X11/Xutil.h>			/* X window manager stuff */
 #include "hfiles/define.h"		/* MIN, MAX, and more */
 #include "hfiles/struct.h"		/* all struct record types */
+// Forward declarations
+static void set_parsed_geometry();
+
 #include "hfiles/extern.h"		/* major declared structs */
 
 extern struct windowRec desktop;
@@ -57,7 +60,6 @@ static unsigned int geo_width, geo_heigh
  */
 void init_desktop ( )
 {
-  static void set_parsed_geometry();
 
   desktop.hints.min_width =
     (2 * desktop.xzero) + (2 * dispbox.bdrwidth) + dispbox.hints.min_width;
diff -urp saoimage-1.35.1/wndwinit.c saoimage-1.35.1.fixed/wndwinit.c
--- saoimage-1.35.1/wndwinit.c	2001-12-15 00:19:23.000000000 +0100
+++ saoimage-1.35.1.fixed/wndwinit.c	2008-10-19 22:02:25.000000000 +0200
@@ -33,6 +33,11 @@ static char SccsId[] = "%W%  %G%";
 #include "hfiles/constant.h"		/* define codes */
 #include "hfiles/define.h"		/* YES, NO, MIN, MAX and more */
 #include "hfiles/struct.h"		/* all struct record types */
+// Forward declarations
+static void set_window_basics();
+static void init_window_basics(), set_border_color();
+static void set_window_basics();
+
 #include "hfiles/extern.h"		/* major declared structs */
 
 extern struct windowRec desktop;
@@ -57,7 +62,6 @@ void init_windows1 ( argc, argv )
      int argc;			/* i: command line arg count param */
      char **argv;		/* i: command line args */
 {
-  static void set_window_basics();
   void init_desktop(), create_window();
 
   /* set display screen parameters for all to see */
@@ -83,7 +87,6 @@ void init_windows1 ( argc, argv )
  */
 void init_windows2 ( )
 {
-  static void init_window_basics(), set_border_color();
   void get_window_dimensions(), configure_windowgroup(), create_window();
 
   /* install runtime environment parameters for all windows */
@@ -179,7 +182,6 @@ static void init_window_basics ( border_
      int border_pixel;
 {
   XImage *ximage;
-  static void set_window_basics();
 
   ximage = XCreateImage(desktop.display, color.visual, color.screen_depth,
 			dispbox.image.format, 0, malloc(4), 2, 2,
diff -urp saoimage-1.35.1/wndwmaus.c saoimage-1.35.1.fixed/wndwmaus.c
--- saoimage-1.35.1/wndwmaus.c	2001-12-19 23:06:46.000000000 +0100
+++ saoimage-1.35.1.fixed/wndwmaus.c	2008-10-19 22:02:25.000000000 +0200
@@ -42,6 +42,9 @@ static char SccsId[] = "%W%  %G%";
 #include "hfiles/struct.h"		/* all struct record types */
 #include "hfiles/extern.h"		/* major declared structs */
 
+// Forward declarations
+static Cursor make_mouse_cursor();
+
 #include "defs/mouse.def"		/* bitmaps for mouse cursors */
 extern Window root;
 
@@ -65,7 +68,6 @@ void init_mousepointers ( dispdisplay, a
      Display *dispdisplay;	/* i: display for the dispbox */
      Display *auxdisplay;	/* i: display for the auxiliary windows */
 {
-  static Cursor make_mouse_cursor();
 
   /* create special btnbox cursor for button menu window */
   btnbox.attrs.cursor =

saoimage-1.35.1-mkstemp.patch:

--- NEW FILE saoimage-1.35.1-mkstemp.patch ---
Use mkstemp() unconditionally, since they use mktemp() in an unsafe manner,
though they claim to be using O_CREATE. Meh.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

--- saoimage-1.35.1/disppsct.c.mkstemp	2008-10-25 00:20:37.000000000 +0200
+++ saoimage-1.35.1/disppsct.c	2008-10-25 00:22:47.000000000 +0200
@@ -303,7 +303,7 @@
 #endif
   if( ++index > 26 ) index = 0;
   /* open a file with a system chosen unique name */
-#ifdef SUN
+#if 1
   if( (fd = mkstemp(tempfile)) == -1 ) {
     perror("Cannot make temp file");
 #else

saoimage-1.35.1-pad.patch:

--- NEW FILE saoimage-1.35.1-pad.patch ---
Whoever guesses what sense does it make to pad the quoted value with spaces
from right, inside the quotes, wins a free beer from me.

Anyways, this makes it possible to open IRAF images that refer to pix files
of name shorter than eight characters while still being able to open files
with spaces at the end of the name.

Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>

--- saoimage-1.35.1/hput.c.pad	2003-09-18 21:05:57.000000000 +0200
+++ saoimage-1.35.1/hput.c	2008-10-25 00:14:23.000000000 +0200
@@ -287,14 +287,8 @@
 	for (i = 1; i <= lval; i++)
 	    value[i] = *v++;
 
-	/* Pad short strings to 8 characters */
-	if (lval < 8) {
-	    for (i = lval+1; i < 9; i++)
-		value[i] = ' ';
-	    lval = 8;
-	    }
-	value[lval+1] = squot;
-	value[lval+2] = (char) 0;
+	value[++lval] = squot;
+	value[++lval] = (char) 0;
 
 	/* Add this line to the header */
 	if (comment)


--- NEW FILE saoimage.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=Application
Name=SAOimage Viewer
Comment=Utility for displaying astronomical images
GenericName=SAOimage Viewer
Exec=saoimage %f
Icon=saoimage
MimeType=application/x-iraf-image;
Categories=Graphics;Education;2DGraphics;RasterGraphics;
Terminal=false


--- NEW FILE saoimage.spec ---
Name:           saoimage
Version:        1.35.1
Release:        1%{?dist}
Summary:        Utility for displaying astronomical images

Group:          Amusements/Graphics
License:        GPLv2+
URL:            http://tdc-www.harvard.edu/software/saoimage/
Source0:        http://tdc-www.harvard.edu/software/saoimage/%{name}-%{version}.tar.gz
Source1:        saoimage.desktop
Source2:        saoimage.xml
Source3:        saoimage.png
Patch0:         saoimage-1.35.1-decls.patch
Patch1:         saoimage-1.35.1-pad.patch
Patch2:         saoimage-1.35.1-mkstemp.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libX11-devel
BuildRequires:  /usr/bin/pdflatex

%description
SAOimage (pronounced S-A-0-image) is a utility for displaying astronomical
images in the X11 window environment. It was written at the Smithsonian
Astrophysical Observatory by Mike Van Hilst in 1990 and is now maintained
by Doug Mink.

Image files can be read directly, or image data may be passed through a
named pipe (Unix) or a mailbox (VMS) from IRAF display tasks. SAOimage
provides a large selection of options for zooming, panning, scaling,
coloring, pixel readback, display blinking, and region specification.
User interactions are generally performed with the mouse. Mouse tracking in
an image's world coordinate system, usually sky coordinates, was added in
1994. You can also plot catalogs over images with WCS information in their
headers.

The SAOimage desktop includes, a main image display window, a button menu
panel, a display magnifier, a pan and zoom reference image, and a color bar.
A color table graph window can be brought up by clicking on the color bar. 


%prep
%setup -q
%patch0 -p1 -b .decls
%patch1 -p1 -b .pad
%patch2 -p1 -b .mkstemp


%build
make OFLAGS="%{optflags}" %{?_smp_mflags} linux \
        IMTOOLRC=%{_sysconfdir}/imtoolrc

cd doc
# Build twice to generate TOC
pdflatex manual.tex; pdflatex manual.tex
pdflatex scale.tex


%install
rm -rf $RPM_BUILD_ROOT

install -d $RPM_BUILD_ROOT/dev
install -d $RPM_BUILD_ROOT%{_bindir}/
install -d $RPM_BUILD_ROOT%{_datadir}/applications
install -d $RPM_BUILD_ROOT%{_datadir}/mime
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_mandir}/man1/

make -f makefile.linux install_saobin install_saoman    \
        ROOT=$RPM_BUILD_ROOT                            \
        SAOBINDIR=$RPM_BUILD_ROOT%{_bindir}/            \
        SAOMANDIR=$RPM_BUILD_ROOT%{_mandir}/man1/

desktop-file-install --vendor=fedora %{SOURCE1}         \
        --dir=$RPM_BUILD_ROOT%{_datadir}/applications

install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/mime
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :


%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
update-desktop-database &> /dev/null || :


%files
%defattr(-,root,root,-)
%{_bindir}/saoimage
%{_datadir}/mime
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_mandir}/man1/saoimage.1*
%doc README NEWS COPYING
%doc doc/*.txt doc/*.pdf


%changelog
* Mon Oct 20 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.35.1-1
- Initial packaging attempt


--- NEW FILE saoimage.xml ---
<?xml version="1.0" encoding="utf-8"?>

<!--
	Files that are openable with SAOimage.
	Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk>
-->

<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">

	<mime-type type="application/x-iraf-image">
		<comment xml:lang="en">IRAF Image</comment>
		<glob pattern="*.imh" />
		<icon name="saoimage" />
	</mime-type>

	<mime-type type="application/x-iraf-pix">
		<comment xml:lang="en">IRAF PIX File</comment>
		<glob pattern="*.pix" />
	</mime-type>

</mime-info>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Nov 2008 18:44:46 -0000	1.1
+++ .cvsignore	3 Nov 2008 20:07:16 -0000	1.2
@@ -0,0 +1 @@
+saoimage-1.35.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Nov 2008 18:44:47 -0000	1.1
+++ sources	3 Nov 2008 20:07:16 -0000	1.2
@@ -0,0 +1 @@
+bd673b31d875929e947a352b02e348ee  saoimage-1.35.1.tar.gz