rpms/pidgin/devel pidgin.spec, 1.46, 1.47 purple-fedora-prefs.xml, 1.1, 1.2

[Stu Tomlinson (nosnilmot)]

Author: nosnilmot

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

Modified Files:
	pidgin.spec purple-fedora-prefs.xml 
Log Message:
- Fix download URL
- Use xdg-open instead of gnome-open (#388521, Ville Skyttä)



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- pidgin.spec	29 Feb 2008 15:44:00 -0000	1.46
+++ pidgin.spec	14 Mar 2008 21:14:48 -0000	1.47
@@ -4,8 +4,6 @@
 %define krb_integration		1
 # OPTION: gtkspell integration (FC1+)
 %define gtkspell_integration	1
-# OPTION: Preferred Applications with gnome-open (FC1+)
-%define gnome_open_integration	1
 # OPTION: Evolution 1.5+ integration (FC3+)
 %define evolution_integration	1
 # OPTION: SILC integration (FC3+)
@@ -29,14 +27,14 @@
 
 Name:		pidgin
 Version:	2.4.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
 # MIT - Zephyr prpl
 Group:		Applications/Internet
 URL:		http://pidgin.im/
-Source0:	http://download.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
+Source0:	http://downloads.sourceforge.net/pidgin/pidgin-%{version}.tar.bz2
 Obsoletes:      gaim < 999:1
 Provides:       gaim = 999:1
 ExcludeArch:    s390 s390x
@@ -98,12 +96,8 @@
 %if %{gtkspell_integration}
 BuildRequires:	gtkspell-devel, aspell-devel
 %endif
-# Preferred Applications (FC1+)
-%if %{gnome_open_integration}
-Requires:	libgnome
-%else
-Requires:	htmlview
-%endif
+# Preferred Applications (FC6+)
+Requires:	xdg-utils
 # Evolution integration (FC3+)
 %if %{evolution_integration}
 BuildRequires:	evolution-data-server-devel
@@ -288,12 +282,8 @@
 
 ## Patches 100+: To be Included in Future Upstream
 
-# If not using gnome-open, then default to htmlview 
+# Our preferences
 cp %{SOURCE1} prefs.xml
-if [ "%{gnome_open_integration}" == "0" ]; then
-	sed -i "s/gnome-open/custom/g" prefs.xml
-	sed -i "s/pref name='command' type='string' value=''/pref name='command' type='string' value='htmlview'/" prefs.xml
-fi
 
 
 %build
@@ -496,6 +486,10 @@
 
 
 %changelog
+* Fri Mar 14 2008 Stu Tomlinson <stu at nosnilmot.com> 2.4.0-2
+- Fix download URL
+- Use xdg-open instead of gnome-open (#388521, Ville Skyttä)
+
 * Fri Feb 29 2008 Stu Tomlinson <stu at nosnilmot.com> 2.4.0-1
 - 2.4.0
 


Index: purple-fedora-prefs.xml
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/purple-fedora-prefs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- purple-fedora-prefs.xml	4 May 2007 17:11:26 -0000	1.1
+++ purple-fedora-prefs.xml	14 Mar 2008 21:14:48 -0000	1.2
@@ -278,7 +278,7 @@
 		<pref name='browsers'>
 			<pref name='place' type='int' value='0'/>
 			<pref name='command' type='path' value=''/>
-			<pref name='browser' type='string' value='gnome-open'/>
+			<pref name='browser' type='string' value='xdg-open'/>
 		</pref>
 		<pref name='plugins'>
 			<pref name='loaded' type='pathlist'>