rpms/conduit/devel conduit-0.3.13-browser_impl.patch, NONE, 1.1 conduit-0.3.13-xulrunner.patch, NONE, 1.1 conduit.spec, 1.18, 1.19 conduit-0.3.11.1-multilib.patch, 1.1, NONE

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/conduit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21834/devel

Modified Files:
	conduit.spec 
Added Files:
	conduit-0.3.13-browser_impl.patch 
	conduit-0.3.13-xulrunner.patch 
Removed Files:
	conduit-0.3.11.1-multilib.patch 
Log Message:
* Fri Aug 22 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.3.13-1
- Update to 0.3.13 (fixes #455688, #457717) 


conduit-0.3.13-browser_impl.patch:

--- NEW FILE conduit-0.3.13-browser_impl.patch ---
--- conduit-0.3.13/conduit/defs.py.browser_impl	2008-08-22 15:10:43.000000000 -0400
+++ conduit-0.3.13/conduit/defs.py	2008-08-23 01:06:17.000000000 -0400
@@ -5,5 +5,6 @@
 LOCALE_DIR = "${prefix}/share/locale"
 SHARED_DATA_DIR = "/usr/local/share/conduit"
 SHARED_MODULE_DIR = "/usr/local/lib/conduit/modules"
+BROWSER_IMPL = "system"
 SETTINGS_IMPL = "GConf"
 
--- conduit-0.3.13/conduit/defs.py.in.browser_impl	2008-07-29 09:29:49.000000000 -0400
+++ conduit-0.3.13/conduit/defs.py.in	2008-08-23 01:16:21.000000000 -0400
@@ -5,5 +5,6 @@
 LOCALE_DIR = "@LOCALEDIR@"
 SHARED_DATA_DIR = "@PKGDATADIR@"
 SHARED_MODULE_DIR = "@MODULEDIR@"
+BROWSER_IMPL = "system"
 SETTINGS_IMPL = "GConf"
 

conduit-0.3.13-xulrunner.patch:

--- NEW FILE conduit-0.3.13-xulrunner.patch ---
--- conduit-0.3.13/conduit/conduit.xulrunner	2008-06-07 02:34:16.000000000 -0400
+++ conduit-0.3.13/conduit/conduit	2008-08-23 00:39:47.000000000 -0400
@@ -8,16 +8,16 @@
 # Run mozilla takes care of settin up the appropriate environment variables
 # to run a program using mozilla libs
 
-for d in `ls -d /usr/lib*/firefox* | sort -r`
+for d in `ls -d /usr/lib*/xulrunner-1.9 | sort -r`
 do
     if [ -x $d/run-mozilla.sh ]; then
-        echo INFO: FOUND FIREFOX LIBS AT $d
+        echo INFO: FOUND XULRUNNER LIBS AT $d
         $d/run-mozilla.sh $(dirname $0)/conduit.real $*
         exit
     fi
 done
 
-echo "WARNING: COULD NOT FIND FIREFOX LIBRARIES"
+echo "WARNING: COULD NOT FIND XULRUNNER LIBRARIES"
 echo "WARNING: CONDUIT MAY CRASH UNEXPECTEDLY"
 echo "WARNING: PLEASE TALK TO THE PERSON WHO PACKAGED CONDUIT"
 $(dirname $0)/conduit.real $*


Index: conduit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/devel/conduit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- conduit.spec	7 Jun 2008 03:44:05 -0000	1.18
+++ conduit.spec	23 Aug 2008 06:22:09 -0000	1.19
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           conduit
-Version:        0.3.11.1
+Version:        0.3.13
 Release:        1%{?dist}
 Summary:        A synchronization solution for GNOME
 
@@ -9,7 +9,16 @@
 License:        GPLv2+
 URL:            http://www.conduit-project.org/
 Source0:        http://download.gnome.org/sources/conduit/0.3/%{name}-%{version}.tar.gz
-Patch0:         conduit-0.3.11.1-multilib.patch
+
+# Search for xulrunner instead of firefox
+# (Fedora's gtkmozembed is from xulrunner starting from F9)
+Patch0:         conduit-0.3.13-xulrunner.patch
+
+# Set BROWSER_IMPL (missing from defs.py)
+# Use system rather than gtkmozembed; using the latter, conduit crashes
+# on opening a second help page
+Patch1:         conduit-0.3.13-browser_impl.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,8 +30,8 @@
 
 Requires:       pygoocanvas >= 0.9, python-vobject, python-sqlite, PyXML
 Requires:       dbus >= 0.93, dbus-python >= 0.80, pygtk2
-# iPod support unusable: bz #429970
-# Requires:       python-gpod >= 0.6
+Requires:       python-feedparser
+Requires:       python-gpod >= 0.6
 Requires:       python-gdata
 Requires:       gnome-python2-desktop, gnome-python2-extras
 # for fspot support
@@ -34,9 +43,6 @@
 Requires(post): scrollkeeper
 Requires(postun):scrollkeeper
 
-# python < 2.5 requires python-elementree
-%{?fc6: Requires: python-elementtree}
-
 %description
 Conduit is a synchronization solution for GNOME which allows the user to take
 their emails, files, bookmarks, and any other type of personal information and
@@ -56,7 +62,10 @@
 
 %prep
 %setup -q -n conduit-%{version}
-%patch0 -p1 -b .multilib
+%if 0%{?fedora} >= 9
+%patch0 -p1 -b .xulrunner
+%endif
+%patch1 -p1 -b .browser_impl
 
 # fix eol encoding in a couple of files
 sed -i 's/\r//' NEWS TODO
@@ -74,7 +83,7 @@
 
 
 %build
-%configure
+%configure --disable-scrollkeeper
 make %{?_smp_mflags}
 
 
@@ -83,8 +92,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove broken modules
-(cd $RPM_BUILD_ROOT/%{python_sitelib}/%{name}/modules && \
- rm -rf iPodModule N800Module)
+#(cd $RPM_BUILD_ROOT/%{python_sitelib}/%{name}/modules && \
+# rm -rf iPodModule N800Module)
 
 desktop-file-install --delete-original --vendor="fedora"   \
   --remove-category Application                            \
@@ -135,6 +144,9 @@
 
 
 %changelog
+* Fri Aug 22 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.3.13-1
+- Update to 0.3.13 (fixes #455688, #457717) 
+
 * Fri Jun  6 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 0.3.11.1-1
 - Update to 0.3.11.1
 - Detect Firefox install path properly on 64-bit systems


--- conduit-0.3.11.1-multilib.patch DELETED ---