Author: bjohnson
Update of /cvs/pkgs/rpms/conduit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1260/F-12
Modified Files:
.cvsignore conduit.spec sources
Removed Files:
ZotoModule-abort.patch
Log Message:
- v 0.3.17
- remove ZotoModule-abort patch as it's now upstream
- add dependency on python-flickrapi for Flickr support
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-12/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore 10 Aug 2009 14:43:04 -0000 1.13
+++ .cvsignore 31 Jan 2010 21:33:47 -0000 1.14
@@ -1 +1 @@
-conduit-0.3.16.tar.bz2
+conduit-0.3.17.tar.bz2
Index: conduit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-12/conduit.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- conduit.spec 10 Jan 2010 13:42:58 -0000 1.35
+++ conduit.spec 31 Jan 2010 21:33:47 -0000 1.36
@@ -1,15 +1,14 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: conduit
-Version: 0.3.16
-Release: 6%{?dist}
+Version: 0.3.17
+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.bz2
-Patch0: ZotoModule-abort.patch
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/conduit/0.3/%{name}-%{version}.tar...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,6 +33,8 @@ Requires: python-sqlite2
# Tomboy is not a hard requirement, but if it is present, it must be 0.5.10
# or greater
Conflicts: tomboy < 0.5.10
+# For Flickr support
+Requires: python-flickrapi
Requires(post): scrollkeeper
Requires(postun):scrollkeeper
@@ -58,8 +59,6 @@ synchronization.
%prep
%setup -q -n conduit-%{version}
-%patch0 -p1 -b .ZotoModule-abort
-
# fix eol encoding in a couple of files
sed -i 's/\r//' NEWS
@@ -139,6 +138,11 @@ fi
%changelog
+* Sun Jan 31 2010 Bernard JOhnson <bjohnson(a)symetrix.com> - 0.3.17-1
+- v 0.3.17
+- remove ZotoModule-abort patch as it's now upstream
+- add dependency on python-flickrapi for Flickr support
+
* Sun Jan 10 2010 Bernard Johnson <bjohnson(a)symetrix.com> - 0.3.16-6
- add dependency on gnome-python2-gconf (bz #554079)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources 10 Aug 2009 14:43:04 -0000 1.13
+++ sources 31 Jan 2010 21:33:47 -0000 1.14
@@ -1 +1 @@
-d119686a5f9ce7c01ef1ab74089b9410 conduit-0.3.16.tar.bz2
+0c94b2b980e26ea71a470683bbd6a45f conduit-0.3.17.tar.bz2
--- ZotoModule-abort.patch DELETED ---