[rpms/amarok] epel10.2: - use xdg-open to start the configured browser

[rpms/amarok] epel10.2: - use xdg-open to start the configured browser

[Aurelien Bompard]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 400674ce8530d25ebf663e9a961ba28868b67bab
Author : Aurelien Bompard <abompard@fedoraproject.org>
Date   : 2007-10-07T17:31:38+00:00
Stats  : +44/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/400674ce8530d25ebf663e9a961ba28868b67bab?branch=epel10.2

Log:
- use xdg-open to start the configured browser

---
diff --git a/amarok-1.4.7-xdg.patch b/amarok-1.4.7-xdg.patch
new file mode 100644
index 0000000..1fa6ff8
--- /dev/null
+++ b/amarok-1.4.7-xdg.patch
@@ -0,0 +1,34 @@
+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
+       )
+     {

diff --git a/amarok.spec b/amarok.spec
index fce655b..bf8dfcb 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -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 @@ Source0:    ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{vers
 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 @@ Requires:  ruby
 # 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 @@ use any of xmms' visualisation plugins with Amarok.
 %setup -q
 %patch0 -p0 -b .147126
 %patch1 -p1 -b .utf8
+%patch2 -p1 -b .xdg
 
 
 
@@ -247,6 +253,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 07 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.4.7-7
+- use xdg-open to start the configured browser
+
 * Sat Oct 06 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.4.7-6
 - add "alpha" to the list of archs where HelixPlayer is not available
   (bug 318431)