rpms/conduit/F-7 .cvsignore, 1.3, 1.4 conduit.spec, 1.8, 1.9 sources, 1.3, 1.4
Bernard Johnson (bjohnson)
fedora-extras-commits at redhat.com
Mon Oct 29 03:17:30 UTC 2007
- Previous message (by thread): rpms/anaconda/F-8 .cvsignore, 1.461, 1.462 anaconda.spec, 1.599, 1.600 sources, 1.590, 1.591
- Next message (by thread): rpms/conduit/F-8 .cvsignore, 1.3, 1.4 conduit.spec, 1.8, 1.9 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bjohnson
Update of /cvs/pkgs/rpms/conduit/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20021/F-7
Modified Files:
.cvsignore conduit.spec sources
Log Message:
- v 0.3.4
- another fix for bz #255221 and also #315991, conflict with tomboy < xxx
- quick fix to load gmail icon from pixmaps/redhat-email.png bz #248503
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 20 Aug 2007 04:38:13 -0000 1.3
+++ .cvsignore 29 Oct 2007 03:16:57 -0000 1.4
@@ -1 +1 @@
-conduit-0.3.3.tar.gz
+conduit-0.3.4.tar.gz
Index: conduit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-7/conduit.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- conduit.spec 26 Aug 2007 18:07:01 -0000 1.8
+++ conduit.spec 29 Oct 2007 03:16:57 -0000 1.9
@@ -1,8 +1,8 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: conduit
-Version: 0.3.3
-Release: 5%{?dist}
+Version: 0.3.4
+Release: 1%{?dist}
Summary: A synchronization solution for GNOME
Group: Applications/Productivity
@@ -21,10 +21,9 @@
Requires: pygoocanvas >= 0.8, python-vobject, python-sqlite
Requires: dbus >= 0.93
-# See bugzilla #255221
-%ifarch ! ppc64
-Requires: tomboy >= 0.5.10
-%endif
+# Tomboy is not a hard requirement, but if it is present, it must be 0.5.10
+# or greater
+Conflicts: tomboy < 0.5.10
# python < 2.5 requires python-elementree
%{?fc6: Requires: python-elementtree}
@@ -53,6 +52,9 @@
# fix eol encoding in a couple of files
sed -i 's/\r//' NEWS TODO
+# gmail icon is not found (bz #248503). For now, substitute redhat-email.png
+sed -i 's/internet-mail/redhat-email/' conduit/dataproviders/GmailModule/GmailModule.py
+
# get rid of any shebangs
find conduit/dataproviders -type f | xargs
for file in `find conduit/dataproviders -type f -print`; do
@@ -100,6 +102,11 @@
%changelog
+* Sun Oct 28 2007 Bernard Johnson <bjohnson at symetrix.com> - 0.3.4-1
+- v 0.3.4
+- another fix for bz #255221 and also #315991, conflict with tomboy < xxx
+- quick fix to load gmail icon from pixmaps/redhat-email.png bz #248503
+
* Sun Aug 26 2007 Bernard Johnson <bjohnson at symetrix.com> - 0.3.3-5
- do not require tomboy for ppc64 (see bz #255221)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 20 Aug 2007 04:38:13 -0000 1.3
+++ sources 29 Oct 2007 03:16:57 -0000 1.4
@@ -1 +1 @@
-03737db54a5682c972a601b5c15e504a conduit-0.3.3.tar.gz
+0cb7f2566d1221f01390a35fdfcc84b3 conduit-0.3.4.tar.gz
- Previous message (by thread): rpms/anaconda/F-8 .cvsignore, 1.461, 1.462 anaconda.spec, 1.599, 1.600 sources, 1.590, 1.591
- Next message (by thread): rpms/conduit/F-8 .cvsignore, 1.3, 1.4 conduit.spec, 1.8, 1.9 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list