rpms/saoimage/EL-5 saoimage.spec,1.1,1.2

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/saoimage/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1545/EL-5

Modified Files:
	saoimage.spec 
Log Message:
Update to what was actually reviewed


Index: saoimage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/saoimage/EL-5/saoimage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- saoimage.spec	3 Nov 2008 20:08:27 -0000	1.1
+++ saoimage.spec	3 Nov 2008 23:03:54 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           saoimage
 Version:        1.35.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Utility for displaying astronomical images
 
 Group:          Amusements/Graphics
-License:        GPLv2+
+License:        LGPLv2+
 URL:            http://tdc-www.harvard.edu/software/saoimage/
 Source0:        http://tdc-www.harvard.edu/software/saoimage/%{name}-%{version}.tar.gz
 Source1:        saoimage.desktop
@@ -13,10 +13,13 @@
 Patch0:         saoimage-1.35.1-decls.patch
 Patch1:         saoimage-1.35.1-pad.patch
 Patch2:         saoimage-1.35.1-mkstemp.patch
+Patch3:         saoimage-1.35.1-inc.patch
+Patch4:         saoimage-1.35.1-bpp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libX11-devel
 BuildRequires:  /usr/bin/pdflatex
+BuildRequires:  desktop-file-utils
 
 %description
 SAOimage (pronounced S-A-0-image) is a utility for displaying astronomical
@@ -43,6 +46,8 @@
 %patch0 -p1 -b .decls
 %patch1 -p1 -b .pad
 %patch2 -p1 -b .mkstemp
+%patch3 -p1 -b .inc
+%patch4 -p1 -b .bpp
 
 
 %build
@@ -58,10 +63,9 @@
 %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}/mime/packages
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
 
@@ -73,7 +77,7 @@
 desktop-file-install --vendor=fedora %{SOURCE1}         \
         --dir=$RPM_BUILD_ROOT%{_datadir}/applications
 
-install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/mime
+install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/mime/packages
 install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 
@@ -99,9 +103,15 @@
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/saoimage.1*
 %doc README NEWS COPYING
-%doc doc/*.txt doc/*.pdf
+%doc doc/*.txt doc/*.pdf wcssubs-3.5.1/COPYING
 
 
 %changelog
+* Sun Oct 26 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.35.1-3
+- Fix a segfault with recent xlib and displays with depth > 16 bpp
+
+* Sun Oct 26 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.35.1-2
+- Incorporate suggestions by Mamoru Tasaka (#468517#c2)
+
 * Mon Oct 20 2008 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 1.35.1-1
 - Initial packaging attempt