rpms/conduit/F-8 .cvsignore, 1.5, 1.6 conduit.spec, 1.12, 1.13 sources, 1.5, 1.6

[Michel Alexandre Salim (salimma)]

Author: salimma

Update of /cvs/pkgs/rpms/conduit/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17141/F-8

Modified Files:
	.cvsignore conduit.spec sources 
Log Message:
conduit-0.3.11.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-8/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Feb 2008 23:47:01 -0000	1.5
+++ .cvsignore	7 Jun 2008 03:43:19 -0000	1.6
@@ -1 +1 @@
-conduit-0.3.8.tar.gz
+conduit-0.3.11.1.tar.gz


Index: conduit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-8/conduit.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- conduit.spec	24 Feb 2008 23:47:01 -0000	1.12
+++ conduit.spec	7 Jun 2008 03:43:19 -0000	1.13
@@ -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.8
+Version:        0.3.11.1
 Release:        1%{?dist}
 Summary:        A synchronization solution for GNOME
 
@@ -9,19 +9,22 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel, pkgconfig, dbus-devel >= 0.93, desktop-file-utils
+BuildRequires:  python-devel, pkgconfig, dbus-python >= 0.80, desktop-file-utils
 BuildRequires:  gtk2-devel >= 2.10, pygtk2-devel >= 2.10
 BuildRequires:  python-vobject, pygoocanvas >= 0.8
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  gettext, gnome-doc-utils, scrollkeeper
 
 Requires:       pygoocanvas >= 0.9, python-vobject, python-sqlite, PyXML
-Requires:       dbus >= 0.93, dbus-python, pygtk2
-Requires:       libgpod >= 0.6
+Requires:       dbus >= 0.93, dbus-python >= 0.80, pygtk2
+# iPod support unusable: bz #429970
+# Requires:       python-gpod >= 0.6
 Requires:       python-gdata
+Requires:       gnome-python2-desktop, gnome-python2-extras
 # for fspot support
 Requires:       python-sqlite2
 # Tomboy is not a hard requirement, but if it is present, it must be 0.5.10
@@ -53,6 +56,7 @@
 
 %prep
 %setup -q -n conduit-%{version}
+%patch0 -p1 -b .multilib
 
 # fix eol encoding in a couple of files
 sed -i 's/\r//' NEWS TODO
@@ -78,6 +82,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Remove broken modules
+(cd $RPM_BUILD_ROOT/%{python_sitelib}/%{name}/modules && \
+ rm -rf iPodModule N800Module)
+
 desktop-file-install --delete-original --vendor="fedora"   \
   --remove-category Application                            \
   --dir=$RPM_BUILD_ROOT/%{_datadir}/applications           \
@@ -127,6 +135,29 @@
 
 
 %changelog
+* 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
+- Temporarily remove iPod and N800 modules due to gnome-vfs2 breakage
+
+* Thu May 22 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.3.10-4
+- for real
+
+* Thu May 22 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.3.10-3
+- fix typo of typo
+
+* Thu May 22 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.3.10-2
+- fix typo in requirements
+
+* Sun May 18 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.3.10-1
+- 0.3.10
+- Fails to startup with message of missing libraries (bz #443571)
+- Conduit Crash because that could not find FIREFOX LIBRARIES (bz #445488)
+
+* Fri Apr 11 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.3.9-1
+- 0.3.9
+- fix BR from dbus to python-dbus
+
 * Sun Feb 24 2008 Bernard Johnson <bjohnson at symetrix.com> - 0.3.8-1
 - 0.3.8
 - additional requires for libgpod, python-sqlite2, python-gdata (bz #432293)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-8/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Feb 2008 23:47:01 -0000	1.5
+++ sources	7 Jun 2008 03:43:19 -0000	1.6
@@ -1 +1 @@
-a4b2025ea53e3cd8abcf2689a6f842e9  conduit-0.3.8.tar.gz
+fb5224074e8c87b1f88409a02dd4badb  conduit-0.3.11.1.tar.gz