rpms/conduit/devel conduit-0.3.14-defaults.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 conduit.spec, 1.20, 1.21 sources, 1.9, 1.10 conduit-0.3.13-browser_impl.patch, 1.1, NONE conduit-0.3.13-xulrunner.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-serv20479

Modified Files:
	.cvsignore conduit.spec sources 
Added Files:
	conduit-0.3.14-defaults.patch 
Removed Files:
	conduit-0.3.13-browser_impl.patch 
	conduit-0.3.13-xulrunner.patch 
Log Message:
* Sun Sep 21 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.14-1
- Update to 0.3.14


conduit-0.3.14-defaults.patch:

--- NEW FILE conduit-0.3.14-defaults.patch ---
--- conduit-0.3.14/conduit/defs.py.in.defaults	2008-08-29 21:00:04.000000000 -0400
+++ conduit-0.3.14/conduit/defs.py.in	2008-09-21 14:14:02.000000000 -0400
@@ -11,10 +11,10 @@
 #
 
 #{GnomeVfs, GIO, Python}
-FILE_IMPL = "GnomeVfs"
+FILE_IMPL = "GIO"
 
 #{gtkmozembed, webkit, system}
-BROWSER_IMPL = "gtkmozembed"
+BROWSER_IMPL = "webkit"
 
 #{GConf,Python}
 SETTINGS_IMPL = "GConf"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Aug 2008 06:26:29 -0000	1.9
+++ .cvsignore	21 Sep 2008 23:08:36 -0000	1.10
@@ -1 +1 @@
-conduit-0.3.13.tar.gz
+conduit-0.3.14.tar.gz


Index: conduit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/devel/conduit.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- conduit.spec	27 Aug 2008 00:52:06 -0000	1.20
+++ conduit.spec	21 Sep 2008 23:08:36 -0000	1.21
@@ -1,23 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           conduit
-Version:        0.3.13
-Release:        2%{?dist}
+Version:        0.3.14
+Release:        1%{?dist}
 Summary:        A synchronization solution for GNOME
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.conduit-project.org/
 Source0:        http://download.gnome.org/sources/conduit/0.3/%{name}-%{version}.tar.gz
-
-# 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
+Patch0:         conduit-0.3.14-defaults.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,11 +21,12 @@
 BuildRequires:  gettext, gnome-doc-utils, scrollkeeper
 
 Requires:       pygoocanvas >= 0.9, python-vobject, python-sqlite
+Requires:	pywebkitgtk >= 1.0
 Requires:       dbus >= 0.93, dbus-python >= 0.80, pygtk2
 Requires:       python-feedparser
 Requires:       python-gpod >= 0.6
 Requires:       python-gdata
-Requires:       gnome-python2-desktop, gnome-python2-extras
+Requires:       gnome-python2-desktop
 # for fspot support
 Requires:       python-sqlite2
 # Tomboy is not a hard requirement, but if it is present, it must be 0.5.10
@@ -62,10 +55,7 @@
 
 %prep
 %setup -q -n conduit-%{version}
-%if 0%{?fedora} >= 9
-%patch0 -p1 -b .xulrunner
-%endif
-%patch1 -p1 -b .browser_impl
+%patch0 -p1 -b .defaults
 
 # fix eol encoding in a couple of files
 sed -i 's/\r//' NEWS TODO
@@ -91,6 +81,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# conduit wrapper is unneeded because we're using WebKig and not mozembed
+(cd $RPM_BUILD_ROOT%{_bindir} && mv conduit.real conduit)
+
 # Remove broken modules
 #(cd $RPM_BUILD_ROOT/%{python_sitelib}/%{name}/modules && \
 # rm -rf iPodModule N800Module)
@@ -144,6 +137,9 @@
 
 
 %changelog
+* Sun Sep 21 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.14-1
+- Update to 0.3.14
+
 * Tue Aug 26 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.13-2
 - Remove obsoleted dependency on PyXML (bz#454995)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Aug 2008 06:26:29 -0000	1.9
+++ sources	21 Sep 2008 23:08:36 -0000	1.10
@@ -1 +1 @@
-82f5302bfae6ab071e1808792f0ecb08  conduit-0.3.13.tar.gz
+b81a7b346a13216d1bffbaf45ee64b9d  conduit-0.3.14.tar.gz


--- conduit-0.3.13-browser_impl.patch DELETED ---


--- conduit-0.3.13-xulrunner.patch DELETED ---