rpms/conduit/F-9 .cvsignore, 1.7, 1.8 conduit.spec, 1.17, 1.18 sources, 1.7, 1.8

[Michel Alexandre Salim (salimma)]

Author: salimma

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 May 2008 03:01:28 -0000	1.7
+++ .cvsignore	7 Jun 2008 03:43:39 -0000	1.8
@@ -1 +1 @@
-conduit-0.3.10.tar.gz
+conduit-0.3.11.1.tar.gz


Index: conduit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-9/conduit.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- conduit.spec	23 May 2008 01:56:11 -0000	1.17
+++ conduit.spec	7 Jun 2008 03:43:39 -0000	1.18
@@ -1,14 +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.10
-Release:        4%{?dist}
+Version:        0.3.11.1
+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
+Patch0:         conduit-0.3.11.1-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -20,7 +21,8 @@
 
 Requires:       pygoocanvas >= 0.9, python-vobject, python-sqlite, PyXML
 Requires:       dbus >= 0.93, dbus-python >= 0.80, pygtk2
-Requires:       libgpod >= 0.6
+# iPod support unusable: bz #429970
+# Requires:       python-gpod >= 0.6
 Requires:       python-gdata
 Requires:       gnome-python2-desktop, gnome-python2-extras
 # for fspot support
@@ -54,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
@@ -79,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           \
@@ -128,6 +135,11 @@
 
 
 %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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 May 2008 03:01:28 -0000	1.7
+++ sources	7 Jun 2008 03:43:39 -0000	1.8
@@ -1 +1 @@
-0737098b8e226d7f4e084f32678028ff  conduit-0.3.10.tar.gz
+fb5224074e8c87b1f88409a02dd4badb  conduit-0.3.11.1.tar.gz