rpms/htmldoc/EL-5 htmldoc-1.8.27-desktop-icon.patch, NONE, 1.1 htmldoc.spec, 1.5, 1.6

[Adam Goode]

Author: agoode

Update of /cvs/extras/rpms/htmldoc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13573

Modified Files:
	htmldoc.spec 
Added Files:
	htmldoc-1.8.27-desktop-icon.patch 
Log Message:
Update to specfile from F-10

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/EL-5/htmldoc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- htmldoc.spec	4 Aug 2007 18:47:59 -0000	1.5
+++ htmldoc.spec	14 Feb 2009 03:44:11 -0000	1.6
@@ -1,17 +1,19 @@
 Name:		htmldoc
 Version:	1.8.27
-Release:	2%{?dist}
+Release:	7%{?dist}
 Summary:	Convert HTML source files into HTML, PostScript, or PDF
 
 Group:		Applications/Publishing
 
 # GPLv2 with OpenSSL exception
-License:        GPLv2 with exceptions
+License:	GPLv2 with exceptions
 URL:		http://www.htmldoc.org/
 
 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)
+%patch0 -p1 -b .desktop-icon
+
 
 %build
 %configure
@@ -112,6 +117,22 @@
 
 
 %changelog
+* Sat Aug 30 2008 Adam Goode <adam at spicenitz.org> - 1.8.27-7
+- RPM 4.6 fix for patch tag
+
+* Sat Feb  9 2008 Adam Goode <adam at spicenitz.org> - 1.8.27-6
+- GCC 4.3 mass rebuild
+
+* 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
+
+* Wed Aug 22 2007 Adam Goode <adam at spicenitz.org> - 1.8.27-3
+- Update license tag
+- Rebuild for buildid
+
 * Sat May  5 2007 Adam Goode <adam at spicenitz.org> - 1.8.27-2
 - Remove X-Fedora