rpms/gsview/devel gsview.desktop,1.2,1.3 gsview.spec,1.16,1.17

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/gsview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6272

Modified Files:
	gsview.desktop gsview.spec 
Log Message:
* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-6
- %(rpm -q --qf '%{VERSION}' ghostscript) -> %(gs --version)
- follow fdo icon spec
- restore epstool bits



Index: gsview.desktop
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/gsview.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gsview.desktop	4 Dec 2004 12:25:30 -0000	1.2
+++ gsview.desktop	6 Mar 2006 19:33:51 -0000	1.3
@@ -1,11 +1,10 @@
-# $Id$
 [Desktop Entry]
 Encoding=UTF-8
 Name=GSview
 GenericName=PS/PDF Viewer
 Comment=EPS,PDF,PS Viewer
 Exec=gsview
-Icon=gsview.png
+Icon=gsview
 Terminal=false
 Type=Application
 MimeType=image/x-eps;application/postscript;application/pdf;


Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gsview.spec	10 Feb 2006 13:59:32 -0000	1.16
+++ gsview.spec	6 Mar 2006 19:33:51 -0000	1.17
@@ -2,7 +2,7 @@
 Summary: PostScript and PDF previewer
 Name: 	 gsview
 Version: 4.7
-Release: 5%{?dist}.1
+Release: 6%{?dist}
 
 License: Aladdin Free Public License, Ghostgum Software Pty Ltd
 Group: 	 Applications/Publishing
@@ -10,7 +10,7 @@
 URL: 	 http://www.cs.wisc.edu/~ghost/gsview/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 # ppc: FIXME.  
-ExcludeArch: ppc 
+# ExcludeArch: ppc 
 
 Source1: gsview.desktop
 
@@ -18,8 +18,8 @@
 BuildRequires: desktop-file-utils
 BuildRequires: sed >= 4.0
 BuildRequires: ghostscript-devel >= 7.07-15.3
-%define gs_ver  %{expand:%%(rpm -q --qf '%%{VERSION}' ghostscript-devel | cut -d. -f-2 )}
-%define gs_ver1 %{expand:%%(echo %{gs_ver} | cut -d. -f1)}
+%global gs_ver  %(gs --version 2> /dev/null | cut -d. -f-2 )
+%global gs_ver1 %(echo %{gs_ver} | cut -d. -f1 )
 %if "%{?gs_ver1}" == "7"
 # See http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00068.html
 Requires: ghostscript >= 7.07-15.3
@@ -87,23 +87,29 @@
   GSVIEW_ETCPATH=$RPM_BUILD_ROOT%{_sysconfdir}
 
 # desktop/icon files
-install -D -p -m644 binary/gsview48.png  $RPM_BUILD_ROOT%{_datadir}/pixmaps/gsview.png
+install -D -p -m644 binary/gsview48.png\
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gsview.png
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --vendor fedora \
   --add-category X-Fedora \
   %{SOURCE1} 
 
 ## Unpackaged files
-# nuke depcrecated epstool, to be (hopefully) packaged separately... someday.
-rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*}
+# nuke deprecated epstool, when (hopefully) packaged separately... someday.
+#rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*}
 
 
 %post
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database -q %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database -q %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %files
@@ -113,7 +119,7 @@
 %config(noreplace) %{_sysconfdir}/gsview/printer.ini
 %{_mandir}/man*/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
+%{_datadir}/icons/hicolor/*/*/*
 %doc %{_docdir}/* 
 
 
@@ -122,6 +128,11 @@
 
 
 %changelog
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-6
+- %%(rpm -q --qf '%%{VERSION}' ghostscript) -> %%(gs --version)
+- follow fdo icon spec
+- restore epstool bits
+
 * Fri Feb 10 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - fc5: gcc/glibc respin