rpms/xdg-utils/F-7 xdg-utils-1.0.2-mimeopen.patch, NONE, 1.1 xdg-utils.spec, 1.13, 1.14 xdg-utils-1.0-mimeopen.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29653

Modified Files:
	xdg-utils.spec 
Added Files:
	xdg-utils-1.0.2-mimeopen.patch 
Removed Files:
	xdg-utils-1.0-mimeopen.patch 
Log Message:
* Fri Jan 18 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.2-3
- fix mimeopen support (#429280)
- spec cosmetics: cleanup macro usage


xdg-utils-1.0.2-mimeopen.patch:

--- NEW FILE xdg-utils-1.0.2-mimeopen.patch ---
diff -up xdg-utils-1.0.2/scripts/xdg-open.mimeopen xdg-utils-1.0.2/scripts/xdg-open
--- xdg-utils-1.0.2/scripts/xdg-open.mimeopen	2007-06-24 14:58:01.000000000 -0500
+++ xdg-utils-1.0.2/scripts/xdg-open	2008-01-18 08:49:50.000000000 -0600
@@ -360,6 +360,13 @@ open_xfce()
 
 open_generic()
 {
+    if mimeopen -v 2>/dev/null 1>&2; then
+        mimeopen -n "$1"
+        if [ $? -eq 0 ]; then
+            exit_success
+        fi
+    fi
+
     IFS=":"
     for browser in $BROWSER; do
         if [ x"$browser" != x"" ]; then


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-7/xdg-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xdg-utils.spec	8 Oct 2007 16:43:15 -0000	1.13
+++ xdg-utils.spec	18 Jan 2008 21:27:12 -0000	1.14
@@ -2,7 +2,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
@@ -11,7 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Patch1: xdg-utils-1.0-mimeopen.patch
+Patch1: xdg-utils-1.0.2-mimeopen.patch
 Patch2: xdg-utils-1.0.1-typo.patch
 Patch3: xdg-utils-1.0.1-htmlview.patch
 
@@ -30,7 +30,7 @@
 
 
 %description
-The xdg-utils package is a set of simple scripts that provide basic
+The %{name} package is a set of simple scripts that provide basic
 desktop integration functions for any Free Desktop, such as Linux.
 They are intended to provide a set of defacto standards.  
 This means that:
@@ -66,9 +66,9 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 
 %files
@@ -79,10 +79,14 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 18 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.2-3
+- fix mimeopen support (#429280)
+- spec cosmetics: cleanup macro usage
+
 * Wed Oct 03 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0.2-2
 - Requires: which (#312601)
 


--- xdg-utils-1.0-mimeopen.patch DELETED ---