rpms/listen/FC-6 listen-gecko.patch,NONE,1.1 listen.spec,1.19,1.20

[Haïkel Guémar (hguemar)]

Author: hguemar

Update of /cvs/extras/rpms/listen/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20674

Modified Files:
	listen.spec 
Added Files:
	listen-gecko.patch 
Log Message:
Added Remi Collet improvements for the gecko issue with Listen


listen-gecko.patch:

--- NEW FILE listen-gecko.patch ---
--- src/widget/mozembed_wrap.py.orig	2007-01-13 11:56:03.000000000 +0100
+++ src/widget/mozembed_wrap.py	2007-01-13 12:01:13.000000000 +0100
@@ -22,6 +22,15 @@
 import gtkmozembed
 
 import const
+import ConfigParser
+
+try:
+	cf = ConfigParser.ConfigParser()
+	cf.read('GRE_CONF_FILE')
+	comp_path=cf.get(cf.sections()[0], 'GRE_PATH')
+	gtkmozembed.set_comp_path(comp_path)
+except:
+	print "** Cannot locate GECKO installation dir **\n"
 
 gtkmozembed.set_profile_path(const.CONFIG_DIR+"/mozembed/","listen")
 """


Index: listen.spec
===================================================================
RCS file: /cvs/extras/rpms/listen/FC-6/listen.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- listen.spec	11 Jan 2007 17:13:30 -0000	1.19
+++ listen.spec	13 Jan 2007 12:59:22 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           listen
 Version:        0.5
-Release:        10.beta1%{?dist}
+Release:        11.beta1%{?dist}
 Summary:        A music manager and player for GNOME
 Group:          Applications/Multimedia
 License:        GPL
@@ -10,10 +10,9 @@
 Patch1:         check.py.patch
 Patch2:         const.py.patch
 Patch3:         dialog.py.patch 
+Patch4:         %{name}-gecko.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}b1-%{release}-root-%(%{__id_u} -n)
 
-
- 
 Buildrequires: python-devel
 BuildRequires: python-ctypes
 BuildRequires: python-mutagen >= 1.6
@@ -58,11 +57,17 @@
 # broken and useless dependency
 #Requires: /usr/lib/libtunepimp.so.5
 Requires: /usr/bin/puid
-# the workaround requires this
-Requires: firefox = 1.5.0.9
 # optional requires an updated libgpod package from Core
 #Requires: python-libgpod
 
+# the workaround requires this
+Requires: gecko-libs
+
+%ifarch x86_64 ia64 ppc64 s390x
+%define gre_conf_file gre64.conf
+%else
+%define gre_conf_file gre.conf
+%endif 
 
 %description
 Listen is a music manager and player for GNOME
@@ -94,11 +99,10 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%{__sed} -i "27icomp_path='/usr/lib/firefox-1.5.0.9'\ngtkmozembed.set_comp_path(comp_path)" src/widget/mozembed_wrap.py
-%ifarch x86_64
+%patch4 -p0
+%{__sed} -i 's at GRE_CONF_FILE@/etc/gre.d/%{gre_conf_file}@' src/widget/mozembed_wrap.py
 # correct path issue on x86_64 box
-%{__sed} -i 's/= \/lib/= \/lib64/' Makefile
-%endif
+%{__sed} -i 's/= \/lib/= \/%{_lib}/' Makefile
 
 %build
 # (misc) for import gtk, as gtk requires a X server to be imported
@@ -150,6 +154,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Sat Jan 13 2007 Remi Collet <Fedora at FamilleCollet.com> - 0.5-11.beta1
+- Change workaround to use /etc/gre.d/gre.conf
+
 * Fri Jan 11 2007 Haïkel Guémar <karlthered at gmail.com> 0.5-10.beta1
 - workaround to prevent listen crashing when using gtkmozembed widget