rpms/conduit/F-8 conduit.spec, 1.9, 1.10 pygoocanvas-api-0.9.patch, 1.2, NONE

[Bernard Johnson (bjohnson)]

Author: bjohnson

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

Modified Files:
	conduit.spec 
Removed Files:
	pygoocanvas-api-0.9.patch 
Log Message:
- gmail icon issue automatically resolved in 0.3.4; bz #248503
- added missing Req: PyXML (bz #332311)
- remove pygoocanvas-api-0.9.patch; no longer needed

and other changes required for 0.3.3 to 0.3.4




Index: conduit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conduit/F-8/conduit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- conduit.spec	29 Oct 2007 03:17:00 -0000	1.9
+++ conduit.spec	29 Oct 2007 10:00:19 -0000	1.10
@@ -9,7 +9,6 @@
 License:        GPLv2+
 URL:            http://www.conduit-project.org/
 Source0:        http://files.conduit-project.org/releases/%{name}-%{version}.tar.gz 
-Patch0:         pygoocanvas-api-0.9.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -17,14 +16,17 @@
 BuildRequires:  gtk2-devel >= 2.10, pygtk2-devel >= 2.10
 BuildRequires:  python-vobject, pygoocanvas >= 0.8
 BuildRequires:  perl(XML::Parser)
-BuildRequires:  gettext
+BuildRequires:  gettext, gnome-doc-utils, scrollkeeper
 
-Requires:       pygoocanvas >= 0.8, python-vobject, python-sqlite
+Requires:       pygoocanvas >= 0.8, python-vobject, python-sqlite, PyXML
 Requires:       dbus >= 0.93
 # Tomboy is not a hard requirement, but if it is present, it must be 0.5.10
 # or greater
 Conflicts:      tomboy < 0.5.10
 
+Requires(post): scrollkeeper
+Requires(postun):scrollkeeper
+
 # python < 2.5 requires python-elementree
 %{?fc6: Requires: python-elementtree}
 
@@ -47,14 +49,10 @@
 
 %prep
 %setup -q -n conduit-%{version}
-%patch0 -p0 -b .pygoocanvas-api-0.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
@@ -64,7 +62,8 @@
 # dataprovider files install to the wrong directory - fix that
 find conduit/dataproviders -type f -name Makefile.in | \
   xargs sed -i 's/\$(libdir)/$(pythondir)/'
-sed -i 's/@PKGLIBDIR@/@PYTHONDIR@\/conduit/' conduit/start_conduit.py
+sed -i 's/@PKGLIBDIR@/@PYTHONDIR@\/%{name}/' conduit/defs.py.in
+
 
 %build
 %configure
@@ -80,14 +79,28 @@
   --dir=$RPM_BUILD_ROOT/%{_datadir}/applications           \
   $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
-# we don't need the pkgconfig file
+# we don't need the pkgconfig file, or scrollkeeper database
 rm -f $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/%{name}.pc
+rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/lib/scrollkeeper
 
 %find_lang %{name}
  
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+scrollkeeper-update -q || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -97,15 +110,23 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/gnome/autostart/%{name}-autostart.desktop
 %{_datadir}/%{name}
-%{_datadir}/dbus-1/services/*Conduit*
-%{_datadir}/pixmaps/%{name}-icon.png
+%{_datadir}/dbus-1/services/org.conduit.service
+%{_datadir}/gnome/help/conduit
+%{_datadir}/icons/hicolor/16x16/*/conduit*
+%{_datadir}/icons/hicolor/22x22/*/conduit*
+%{_datadir}/icons/hicolor/32x32/*/conduit*
+%{_datadir}/icons/hicolor/48x48/*/conduit*
+%{_datadir}/icons/hicolor/scalable/*/conduit*
+%{_datadir}/omf/conduit/conduit-C.omf
 
 
 %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
+- gmail icon issue automatically resolved in 0.3.4; bz #248503
+- added missing Req: PyXML (bz #332311)
+- remove pygoocanvas-api-0.9.patch; no longer needed
 
 * Sun Aug 26 2007 Bernard Johnson <bjohnson at symetrix.com> - 0.3.3-5
 - do not require tomboy for ppc64 (see bz #255221)


--- pygoocanvas-api-0.9.patch DELETED ---