rpms/xdg-utils/FC-5 xdg-utils-1.0-mimeopen.patch, NONE, 1.1 xdg-utils.spec, 1.7, 1.8

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/xdg-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2179

Modified Files:
	xdg-utils.spec 
Added Files:
	xdg-utils-1.0-mimeopen.patch 
Log Message:
* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
- actually *use* mimeopen patch (#210797)


xdg-utils-1.0-mimeopen.patch:

--- NEW FILE xdg-utils-1.0-mimeopen.patch ---
--- xdg-utils-1.0/scripts/xdg-open.mimeopen	2006-10-17 22:55:02.000000000 +0200
+++ xdg-utils-1.0/scripts/xdg-open	2006-10-17 22:55:15.000000000 +0200
@@ -360,6 +360,15 @@
 
 open_generic()
 {
+    if mimeopen -v 2>/dev/null 1>&2; then
+        mimeopen -n "$1"
+        if [ $? -eq 0 ]; then
+            exit_success
+        else
+            exit_failure_operation_failed
+        fi
+    fi
+
     IFS=":"
     for browser in $BROWSER; do
         if [ x"$browser" != x"" ]; then


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xdg-utils/FC-5/xdg-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xdg-utils.spec	10 Oct 2006 12:51:18 -0000	1.7
+++ xdg-utils.spec	24 Oct 2006 16:01:45 -0000	1.8
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0 
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,14 +11,16 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Not really used (yet)
-#BuildRequires: xmlto
+Patch1: xdg-utils-1.0-mimeopen.patch
 
 Requires: desktop-file-utils
 ## kde-config
-#Requires: kdelibs
-# update-gtk-icon-cache
-#Requires: gtk2
+#Requires(hint): kdelibs
+## update-gtk-icon-cache
+#Requires(hint): gtk2
+## mimeopen generic default
+#Requires(hint): %{_bindir}/mimeopen
+#Requires(hint): perl-File-MimeInfo 
 
 
 %description
@@ -46,6 +48,8 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta}
 
+%patch1 -p1 -b .mimeopen
+
 
 %build
 %configure
@@ -71,6 +75,12 @@
 
 
 %changelog
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net 1.0-3
+- actually *use* mimeopen patch (#210797)
+
+* Tue Oct 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-2
+- prefer mimeopen as generic default (#210797)
+
 * Tue Oct 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-1
 - 1.0(final)