rpms/kid3/devel kid3-0.10-defaultbrowser.patch, NONE, 1.1 kid3.spec, 1.20, 1.21

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	kid3.spec 
Added Files:
	kid3-0.10-defaultbrowser.patch 
Log Message:
* Mon Dec  3 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.10-2
- Use xdg-open as the default browser.


kid3-0.10-defaultbrowser.patch:

--- NEW FILE kid3-0.10-defaultbrowser.patch ---
diff -up kid3-0.10/kid3/miscconfig.cpp~ kid3-0.10/kid3/miscconfig.cpp
--- kid3-0.10/kid3/miscconfig.cpp~	2007-11-11 23:45:50.000000000 +0200
+++ kid3-0.10/kid3/miscconfig.cpp	2007-12-03 01:21:01.000000000 +0200
@@ -45,12 +45,7 @@
 const char* const MiscConfig::s_defaultCommentName = "COMMENT";
 
 /** Default value for web browser */
-const char* const MiscConfig::s_defaultBrowser =
-#ifdef CONFIG_USE_KDE
-	"konqueror";
-#else
-	"firefox";
-#endif
+const char* const MiscConfig::s_defaultBrowser = "xdg-open";
 
 /** Default filename format list */
 static const char* fnFmt[] = {


Index: kid3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kid3.spec	2 Dec 2007 22:36:31 -0000	1.20
+++ kid3.spec	2 Dec 2007 23:33:58 -0000	1.21
@@ -4,7 +4,7 @@
 
 Name:           kid3
 Version:        0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
@@ -12,6 +12,7 @@
 URL:            http://kid3.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.10-docdir.patch
+Patch1:         %{name}-0.10-defaultbrowser.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?kde3}
@@ -28,6 +29,7 @@
 BuildRequires:  libmp4v2-devel
 BuildRequires:  perl(File::Spec)
 BuildRequires:  gettext
+Requires:       xdg-utils
 
 %description
 If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC,
@@ -40,6 +42,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|g' configure # lib64 rpaths
 
 
@@ -60,7 +63,6 @@
 # preserve desktop entry location for from < 0.8 upgrades
 mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde*/kid3,fedora-kid3}.desktop
 rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde*
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/index.{cache.bz2,docbook} # KDE4
 %find_lang %{name}
 abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
 for file in $(find $RPM_BUILD_ROOT%{_docdir}/HTML -type l) ; do
@@ -100,6 +102,9 @@
 
 
 %changelog
+* Mon Dec  3 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.10-2
+- Use xdg-open as the default browser.
+
 * Sun Dec  2 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.10-1
 - 0.10, desktop entry patch applied upstream.
 - Build for KDE4 in F9+, KDE3 in earlier.