packages: xiphos/xiphos.spec - Cleaned up doc instalation and other file globs

[caleb]

Author: caleb                        Date: Tue May 25 11:57:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Cleaned up doc instalation and other file globs

---- Files affected:
packages/xiphos:
   xiphos.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/xiphos/xiphos.spec
diff -u packages/xiphos/xiphos.spec:1.6 packages/xiphos/xiphos.spec:1.7
--- packages/xiphos/xiphos.spec:1.6	Sat May 22 21:47:37 2010
+++ packages/xiphos/xiphos.spec	Tue May 25 13:57:40 2010
@@ -46,10 +46,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# scratch  this and instead use %doc relative to files in builddir, not full path to installed docs
-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-rmdir $RPM_BUILD_ROOT%{_docdir}/%{name}
+rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %find_lang %{name}
 
@@ -65,18 +62,18 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc ABOUT-NLS AUTHORS INSTALL NEWS README TODO
+%doc %{_datadir}/gnome/help/*
 %attr(755,root,root) %{_bindir}/xiphos
-# XXX these two together do not make sense, add just dir or list verbosely contents?
-%dir %{_datadir}/xiphos
-%{_datadir}/xiphos/*
+%{_datadir}/xiphos
 %dir %{_datadir}/omf/xiphos
 %{_datadir}/omf/xiphos/*.omf
-# XXX: include ext to glob
-%{_pixmapsdir}/*
-# XXX: create non-scaled pixmaps
+%dir %{_pixmapsdir}/%{name}
+%{_pixmapsdir}/%{name}/*.png
+%{_pixmapsdir}/%{name}/*.xpm
+%{_pixmapsdir}/%{name}/*.ico
+# TODO: create non-scaled pixmaps
 %{_iconsdir}/hicolor/scalable/apps/xiphos.svg
 %{_desktopdir}/%{name}.desktop
-%doc %{_datadir}/gnome/help/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -84,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/05/25 11:57:40  caleb
+- Cleaned up doc instalation and other file globs
+
 Revision 1.6  2010/05/22 19:47:37  glen
 - adapter, scrollkeeper deps from PLD-doc/BuildRequires.txt, plant todos
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xiphos/xiphos.spec?r1=1.6&r2=1.7&f=u