rpms/htmldoc/devel htmldoc-1.8.27-desktop-icon.patch, NONE, 1.1 htmldoc.spec, 1.7, 1.8

[Adam Goode (agoode)]

Author: agoode

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

Modified Files:
	htmldoc.spec 
Added Files:
	htmldoc-1.8.27-desktop-icon.patch 
Log Message:
* Wed Dec  5 2007 Adam Goode <adam at spicenitz.org> - 1.8.27-5
- Fix desktop file validation


htmldoc-1.8.27-desktop-icon.patch:

--- NEW FILE htmldoc-1.8.27-desktop-icon.patch ---
diff -ur htmldoc-1.8.27~/desktop/htmldoc.desktop htmldoc-1.8.27/desktop/htmldoc.desktop
--- htmldoc-1.8.27~/desktop/htmldoc.desktop	2004-06-15 21:25:43.000000000 -0400
+++ htmldoc-1.8.27/desktop/htmldoc.desktop	2007-12-05 21:09:58.000000000 -0500
@@ -5,6 +5,6 @@
 Comment=HTML Conversion Software
 TryExec=htmldoc
 Exec=htmldoc %F
-Icon=htmldoc.png
+Icon=htmldoc
 Terminal=false
 Categories=Application;Office;X-Red-Hat-Base;
Only in htmldoc-1.8.27/desktop: htmldoc.desktop~


Index: htmldoc.spec
===================================================================
RCS file: /cvs/extras/rpms/htmldoc/devel/htmldoc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- htmldoc.spec	5 Dec 2007 21:50:07 -0000	1.7
+++ htmldoc.spec	6 Dec 2007 02:16:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		htmldoc
 Version:	1.8.27
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Convert HTML source files into HTML, PostScript, or PDF
 
 Group:		Applications/Publishing
@@ -12,6 +12,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source:		http://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-source.tar.bz2
 
+Patch0:		htmldoc-1.8.27-desktop-icon.patch
+
 BuildRequires:	openssl-devel libjpeg-devel libpng-devel zlib-devel
 BuildRequires:	fltk-devel libXpm-devel desktop-file-utils
 #Requires:
@@ -35,6 +37,9 @@
 # fix up hardcoded documentation path
 sed -i 's/\(\$prefix\/share\/doc\/htmldoc\)/\1-%{version}/g' configure
 
+# fix desktop icon (upstream bug STR #169)
+%patch -P 0 -p1 -b .desktop-icon
+
 
 %build
 %configure
@@ -112,6 +117,9 @@
 
 
 %changelog
+* Wed Dec  5 2007 Adam Goode <adam at spicenitz.org> - 1.8.27-5
+- Fix desktop file validation
+
 * Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.8.27-4
  - Rebuild for deps