rpms/amarok/devel amarok-1.4.7-xdg.patch, NONE, 1.1 amarok.spec, 1.86, 1.87

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4.7-xdg.patch 
Log Message:
* Sun Oct 07 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-7
- use xdg-open to start the configured browser


amarok-1.4.7-xdg.patch:

--- NEW FILE amarok-1.4.7-xdg.patch ---
diff -up amarok-1.4.7/amarok/src/Options1.ui.h~ amarok-1.4.7/amarok/src/Options1.ui.h
--- amarok-1.4.7/amarok/src/Options1.ui.h~	2007-08-07 20:48:28.000000000 +0300
+++ amarok-1.4.7/amarok/src/Options1.ui.h	2007-10-02 22:45:03.000000000 +0300
@@ -27,8 +27,8 @@ void Options1::init()
     //slotUpdateRatingsFrame();
 
     QStringList browsers;
-    browsers << "konqueror" << "firefox" << "opera" << "galeon" << "epiphany"
-             << "safari" << "mozilla";
+    browsers << "xdg-open" << "konqueror" << "firefox" << "opera" << "galeon"
+             << "epiphany" << "safari" << "mozilla";
 
     // Remove browsers which are not actually installed
     for( QStringList::Iterator it = browsers.begin(), end = browsers.end(); it != end; ) {
@@ -41,8 +41,8 @@ void Options1::init()
     if ( KStandardDirs::findExe( "open" ) != QString::null )
         browsers.prepend( i18n( "Default Browser" ) );
 #else
-    if ( KStandardDirs::findExe( "kfmclient" ) != QString::null )
-        browsers.prepend( i18n( "Default KDE Browser" ) );
+    if ( KStandardDirs::findExe( "xdg-open" ) != QString::null )
+        browsers.prepend( i18n( "Default Browser" ) );
 #endif
 
     kComboBox_browser->insertStringList( browsers );
@@ -54,7 +54,7 @@ void Options1::init()
 #ifdef Q_WS_MAC
             "open"
 #else
-            "kfmclient openURL"
+            "xdg-open"
 #endif
       )
     {


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- amarok.spec	6 Oct 2007 15:03:48 -0000	1.86
+++ amarok.spec	7 Oct 2007 17:31:38 -0000	1.87
@@ -4,7 +4,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4.7
-Release:    6%{?dist}
+Release:    7%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -16,6 +16,8 @@
 Patch0:     amarok-1.4.7-147126.patch
 # Fedora bug 242862: Amarok doesn't support transfer of Unicode filenames to MTP devices
 Patch1:     amarok-1.4.7-utf8.patch
+# Use xdg-open to start the selected browser
+Patch2:     amarok-1.4.7-xdg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -52,6 +54,9 @@
 # Bug 245386
 Requires:  kdelibs >= 6:3.5.7
 
+# To open the selected browser, works with Patch2
+Requires:  xdg-utils
+
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -91,6 +96,7 @@
 %setup -q
 %patch0 -p0 -b .147126
 %patch1 -p1 -b .utf8
+%patch2 -p1 -b .xdg
 
 
 
@@ -247,6 +253,9 @@
 
 
 %changelog
+* Sun Oct 07 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-7
+- use xdg-open to start the configured browser
+
 * Sat Oct 06 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-6
 - add "alpha" to the list of archs where HelixPlayer is not available
   (bug 318431)