rpms/htmlview/devel htmlview, 1.14, 1.15 htmlview.spec, 1.26, 1.27 launchmail, 1.5, 1.6

[Warren Togami (wtogami)]

Author: wtogami

Update of /cvs/pkgs/rpms/htmlview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25962

Modified Files:
	htmlview htmlview.spec launchmail 
Log Message:
- if KDE-only desktop, use fallback apps so konqueror and kmail will launch
  #239300 and #239293



Index: htmlview
===================================================================
RCS file: /cvs/pkgs/rpms/htmlview/devel/htmlview,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- htmlview	14 Dec 2006 17:11:47 -0000	1.14
+++ htmlview	7 May 2007 16:33:50 -0000	1.15
@@ -105,7 +105,7 @@
 fi
 
 # Read GNOME configuration
-if [ -x /usr/bin/gconftool-2 ]; then
+if [ -x /usr/bin/gconftool-2 -a -x /usr/bin/gnome-default-applications-properties ]; then
 	# Pull key from gconf, remove %s or "%s", trim leading & trailing spaces
 	GCONF=$(gconftool-2 -g /desktop/gnome/url-handlers/http/command 2>/dev/null | sed -e 's/%s//; s/\"\"//; s/^\ *//; s/\ *$//')
 


Index: htmlview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/htmlview/devel/htmlview.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- htmlview.spec	14 Dec 2006 17:11:47 -0000	1.26
+++ htmlview.spec	7 May 2007 16:33:50 -0000	1.27
@@ -1,6 +1,6 @@
 Name: htmlview
 Version: 4.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tools for launching Preferred Applications
 License: Public Domain
 Source0: htmlview
@@ -39,6 +39,10 @@
 %{_datadir}/applications/redhat-email.desktop
 
 %changelog
+* Mon May 07 2007 Warren Togami <wtogami at redhat.com> - 4.0.0-2
+- if KDE-only desktop, use fallback apps so konqueror and kmail will launch
+  #239300 and #239293
+
 * Thu Dec 14 2006 Warren Togami <wtogami at redhat.com> - 4.0.0-1
 - minor modernization of htmlview's app lists
 - improve launchmail's non-GNOME error case


Index: launchmail
===================================================================
RCS file: /cvs/pkgs/rpms/htmlview/devel/launchmail,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- launchmail	14 Dec 2006 17:11:47 -0000	1.5
+++ launchmail	7 May 2007 16:33:50 -0000	1.6
@@ -76,7 +76,7 @@
 }
 
 # Attempt to run GNOME Preferred Application Mail Client
-if [ -x /usr/bin/gconftool-2 ]; then
+if [ -x /usr/bin/gconftool-2 -a -x /usr/bin/gnome-default-applications-properties ]; then
 	# Pull key from gconf, remove %s or "%s", trim leading & trailing spaces
 	GCONF=$(gconftool-2 -g /desktop/gnome/url-handlers/mailto/command 2>/dev/null | sed -e 's/%s//; s/\"\"//; s/^\ *//; s/\ *$//')