Hello community, here is the log from the commit of package conduit checked in at Fri Apr 25 15:47:11 CEST 2008. -------- --- GNOME/conduit/conduit.changes 2008-03-25 16:05:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/conduit/conduit.changes 2008-04-25 12:39:17.699294000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 16 20:50:20 CEST 2008 - crivera@suse.de + +- Update conduit-set-mozilla-five-home.patch to set + MOZILLA_FIVE_HOME to the xulrunner directory that matches + the arch of gtkmozembed.so. This fixes bnc#373972. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conduit.spec ++++++ --- /var/tmp/diff_new_pack.e11506/_old 2008-04-25 15:46:57.000000000 +0200 +++ /var/tmp/diff_new_pack.e11506/_new 2008-04-25 15:46:57.000000000 +0200 @@ -15,7 +15,7 @@ BuildRequires: dbus-1-devel dbus-1-python evolution-python fdupes gnome-common gnome-doc-utils-devel perl-XML-Parser pkg-config python-goocanvas update-desktop-files vobject Summary: A synchronization application for GNOME Version: 0.3.9 -Release: 1 +Release: 12 License: GPL v2 only Group: Productivity/Networking/Other Source0: %{name}-%{version}.tar.bz2 @@ -118,6 +118,10 @@ %files lang -f %{name}.lang %changelog +* Wed Apr 16 2008 crivera@suse.de +- Update conduit-set-mozilla-five-home.patch to set + MOZILLA_FIVE_HOME to the xulrunner directory that matches + the arch of gtkmozembed.so. This fixes bnc#373972. * Mon Mar 24 2008 crivera@suse.de - Update to 0.3.9 and remove the backport patch. - Removes the build dependency on dbus. ++++++ conduit-set-mozilla-five-home.patch ++++++ --- /var/tmp/diff_new_pack.e11506/_old 2008-04-25 15:46:57.000000000 +0200 +++ /var/tmp/diff_new_pack.e11506/_new 2008-04-25 15:46:57.000000000 +0200 @@ -1,21 +1,24 @@ Index: conduit/conduit =================================================================== ---- conduit/conduit (revision 1381) +--- conduit/conduit (revision 1420) +++ conduit/conduit (working copy) -@@ -4,14 +4,10 @@ - # Work around https://bugs.launchpad.net/ubuntu/+source/firefox/+bug/26436 +@@ -5,13 +5,14 @@ # Note: This bug is also present in Mandriva and Fedora, for this reason, # We will use run-mozilla in all cases -+XUL_PATH=`ls -d /usr/lib*/xulrunner* | tail -n 1` -# Run mozilla takes care of settin up the appropriate environment variables -# to run a program using mozilla libs -FF_PATH=`ls -d /usr/lib/firefox* | tail -n 1` -RUN_MOZILLA=$FF_PATH/run-mozilla.sh -- ++# We need to set MOZILLA_FIVE_HOME to xulrunner directory matching the gtkmozemebd arch. ++# This is for 1.8.1 only. + -if [ -x $RUN_MOZILLA ]; then - $RUN_MOZILLA $(dirname $0)/conduit.real $* -+if [ -x $XUL_PATH ]; then ++MOZEMBED_LIBDIR=`ls /usr/*/python2.5/site-packages/gtk-2.0/gtkmozembed.so | cut -d '/' -f3` ++XUL_PATH="/usr/$MOZEMBED_LIBDIR/xulrunner-1.8.1" ++ ++if [ -d $XUL_PATH ]; then + MOZILLA_FIVE_HOME=$XUL_PATH $(dirname $0)/conduit.real $* else echo "WARNING: COULD NOT FIND FIREFOX LIBRARIES" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org