rpms/conduit/F-8 .cvsignore, 1.4, 1.5 conduit.spec, 1.11, 1.12 sources, 1.4, 1.5

[Bernard Johnson (bjohnson)]

Author: bjohnson

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

Modified Files:
	.cvsignore conduit.spec sources 
Log Message:
- 0.3.8
- additional requires for libgpod, python-sqlite2, python-gdata (bz #432293)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Oct 2007 03:17:00 -0000	1.4
+++ .cvsignore	24 Feb 2008 23:47:01 -0000	1.5
@@ -1 +1 @@
-conduit-0.3.4.tar.gz
+conduit-0.3.8.tar.gz


Index: conduit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-8/conduit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- conduit.spec	31 Oct 2007 02:58:08 -0000	1.11
+++ conduit.spec	24 Feb 2008 23:47:01 -0000	1.12
@@ -1,14 +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.4
-Release:        2%{?dist}
+Version:        0.3.8
+Release:        1%{?dist}
 Summary:        A synchronization solution for GNOME
 
 Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.conduit-project.org/
-Source0:        http://files.conduit-project.org/releases/%{name}-%{version}.tar.gz 
+Source0:        http://download.gnome.org/sources/conduit/0.3/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,8 +18,12 @@
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  gettext, gnome-doc-utils, scrollkeeper
 
-Requires:       pygoocanvas >= 0.8, python-vobject, python-sqlite, PyXML
+Requires:       pygoocanvas >= 0.9, python-vobject, python-sqlite, PyXML
 Requires:       dbus >= 0.93, dbus-python, pygtk2
+Requires:       libgpod >= 0.6
+Requires:       python-gdata
+# for fspot support
+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
@@ -54,15 +58,15 @@
 sed -i 's/\r//' NEWS TODO
 
 # get rid of any shebangs
-find conduit/dataproviders -type f | xargs 
-for file in `find conduit/dataproviders -type f -print`; do
+for file in `find conduit/{dataproviders,hildonui,modules} -type f -print`; do
   sed -i '/#!/d' $file
 done
 
 # dataprovider files install to the wrong directory - fix that
-find conduit/dataproviders -type f -name Makefile.in | \
+find conduit/{dataproviders,modules} -type f -name Makefile.in | \
   xargs sed -i 's/\$(libdir)/$(pythondir)/'
 sed -i 's/@PKGLIBDIR@/@PYTHONDIR@\/%{name}/' conduit/defs.py.in
+sed -i 's/@MODULEDIR@/@PYTHONDIR@\/%{name}\/modules/' conduit/defs.py.in
 
 
 %build
@@ -114,13 +118,19 @@
 %{_datadir}/gnome/help/conduit
 %{_datadir}/icons/hicolor/16x16/*/conduit*
 %{_datadir}/icons/hicolor/22x22/*/conduit*
+%{_datadir}/icons/hicolor/24x24/*/conduit*
+%{_datadir}/icons/hicolor/26x26/*/conduit*
 %{_datadir}/icons/hicolor/32x32/*/conduit*
 %{_datadir}/icons/hicolor/48x48/*/conduit*
 %{_datadir}/icons/hicolor/scalable/*/conduit*
-%{_datadir}/omf/conduit/conduit-C.omf
+%{_datadir}/omf/conduit/conduit-*.omf
 
 
 %changelog
+* 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)
+
 * Tue Oct 30 2007 Bernard Johnson <bjohnson at symetrix.com> - 0.3.4-2
 - add missing Req: dbus-python, pygtk2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Oct 2007 03:17:00 -0000	1.4
+++ sources	24 Feb 2008 23:47:01 -0000	1.5
@@ -1 +1 @@
-0cb7f2566d1221f01390a35fdfcc84b3  conduit-0.3.4.tar.gz
+a4b2025ea53e3cd8abcf2689a6f842e9  conduit-0.3.8.tar.gz