Mailinglist Archive: opensuse-commit (1193 mails)
| < Previous | Next > |
commit conduit
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 21 Mar 2008 03:50:28 +0100
- Message-id: <20080321025029.113E1678168@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package conduit
checked in at Fri Mar 21 03:50:28 CET 2008.
--------
--- GNOME/conduit/conduit.changes 2008-02-20 17:43:00.000000000 +0100
+++ conduit/conduit.changes 2008-03-19 21:25:46.964974000 +0100
@@ -1,0 +2,10 @@
+Wed Mar 19 21:25:46 CET 2008 - crivera@xxxxxxx
+
+- Remove the conduit-0.3.5 patches. One of them is upstream
+ already and the other is being replaced in favor of
+ conduit-set-mozilla-five-home.patch. Add
+ conduit-trunk-backports.patch with two small fixes from trunk.
+ Add conduit-fb-module-browser-fix.patch to have the facebook
+ module respect the browser setting.
+
+-------------------------------------------------------------------
Old:
----
conduit-0.3.5-avahi-prototype.patch
conduit-0.3.5-firefox-64bit.patch
New:
----
conduit-fb-module-browser-fix.patch
conduit-set-mozilla-five-home.patch
conduit-trunk-backports.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ conduit.spec ++++++
--- /var/tmp/diff_new_pack.R25463/_old 2008-03-21 03:48:28.000000000 +0100
+++ /var/tmp/diff_new_pack.R25463/_new 2008-03-21 03:48:28.000000000 +0100
@@ -15,14 +15,16 @@
BuildRequires: dbus-1-devel 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.8
-Release: 1
+Release: 14
License: GPL v2 only
Group: Productivity/Networking/Other
Source0: %{name}-%{version}.tar.bz2
-#PATCH-FIX-UPSTREAM conduit-0.3.5-avahi-prototype.patch jpr@xxxxxxx
-Patch: conduit-0.3.5-avahi-prototype.patch
-#PATCH-FIX-UPSTREAM conduit-0.3.5-firefox-64bit.patch jpr@xxxxxxx
-Patch1: conduit-0.3.5-firefox-64bit.patch
+#PATCH-FIX-UPSTREAM conduit-set-mozilla-five-home.patch crivera@xxxxxxxxxx
+Patch: conduit-set-mozilla-five-home.patch
+#PATCH-FIX-UPSTREAM conduit-fb-module-browser-fix.patch crivera@xxxxxxxxxx
+Patch1: conduit-fb-module-browser-fix.patch
+#PATCH-FEATURE-UPSTREAM conduit-trunk-backports.patch crivera@xxxxxxxxxx
+Patch2: conduit-trunk-backports.patch
Url: http://www.conduit-project.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
@@ -47,8 +49,9 @@
%lang_package
%prep
%setup -n %{name}-%{version}
-%patch -p1
-%patch1 -p1
+%patch -p0
+%patch1 -p0
+%patch2 -p0
%build
%configure \
@@ -118,6 +121,13 @@
%files lang -f %{name}.lang
%changelog
+* Wed Mar 19 2008 crivera@xxxxxxx
+- Remove the conduit-0.3.5 patches. One of them is upstream
+ already and the other is being replaced in favor of
+ conduit-set-mozilla-five-home.patch. Add
+ conduit-trunk-backports.patch with two small fixes from trunk.
+ Add conduit-fb-module-browser-fix.patch to have the facebook
+ module respect the browser setting.
* Wed Feb 20 2008 maw@xxxxxxx
- Update to version 0.3.8:
+ Bugs fixed: bgo#508645, bgo#509021, bgo#510091, bgo#510094,
++++++ conduit-fb-module-browser-fix.patch ++++++
Index: conduit/modules/FacebookModule/FacebookModule.py
===================================================================
--- conduit/modules/FacebookModule/FacebookModule.py (revision 1374)
+++ conduit/modules/FacebookModule/FacebookModule.py (working copy)
@@ -43,7 +43,6 @@
def __init__(self, *args):
Image.ImageSink.__init__(self)
self.fapi = Facebook(FacebookSink.API_KEY, FacebookSink.SECRET)
- self.browser = "gtkmozembed"
def _upload_photo (self, uploadInfo):
"""
@@ -64,7 +63,6 @@
#wait for log in
Web.LoginMagic("Log into Facebook", url,
login_function=self._try_login,
- browser=self.browser, #instance var so tests can set it
to system
sleep_time=45, #long sleep time to give time to
login if using system browser
)
++++++ conduit-set-mozilla-five-home.patch ++++++
Index: conduit/conduit
===================================================================
--- conduit/conduit (revision 1381)
+++ conduit/conduit (working copy)
@@ -4,14 +4,10 @@
# Work around https://bugs.launchpad.net/ubuntu/+source/firefox/+bug/26436
# 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
-
-if [ -x $RUN_MOZILLA ]; then
- $RUN_MOZILLA $(dirname $0)/conduit.real $*
+if [ -x $XUL_PATH ]; then
+ MOZILLA_FIVE_HOME=$XUL_PATH $(dirname $0)/conduit.real $*
else
echo "WARNING: COULD NOT FIND FIREFOX LIBRARIES"
echo "WARNING: CONDUIT MAY CRASH UNEXPECTEDLY"
++++++ conduit-trunk-backports.patch ++++++
diff -ur 0.3.8/conduit/modules/NetworkModule/Peers.py
trunk/conduit/modules/NetworkModule/Peers.py
--- conduit/modules/NetworkModule/Peers.py 2008-03-14 13:07:43.000000000
-0400
+++ conduit/modules/NetworkModule/Peers.py 2008-03-14 13:09:20.000000000
-0400
@@ -159,13 +159,13 @@
self.group.AddService(
IF_UNSPEC, #interface
PROTO_UNSPEC, #protocol
- 0, #flags
+ dbus.UInt32(0), #flags
self.hostname, #name
AVAHI_SERVICE_NAME, #service type
AVAHI_SERVICE_DOMAIN, #domain
'', #host
- self.port, #port
- string_array_to_txt_array(["version=%s" % conduit.APPVERSION])
+ dbus.UInt16(self.port), #port
+ string_array_to_txt_array(["version=%s" % conduit.VERSION])
)
self.group.Commit()
diff -ur 0.3.8/conduit/modules/NetworkModule/Server.py
trunk/conduit/modules/NetworkModule/Server.py
--- conduit/modules/NetworkModule/Server.py 2008-03-14 13:07:43.000000000
-0400
+++ conduit/modules/NetworkModule/Server.py 2008-03-14 13:09:20.000000000
-0400
@@ -159,7 +159,7 @@
#Stop right click menu
return True
- def is_configured(self):
+ def is_configured(self, isSource, isTwoWay):
#Prevent initiating a sync on the server end by pretending we are
#not configured
return False
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |