2007-06-22 Damien Carbery <[email protected]>
authordcarbery
Fri, 22 Jun 2007 12:55:05 +0000
changeset 10109 9bb67f135b9c
parent 10108 3b98b3f187bc
child 10110 743a3cddf35c
2007-06-22 Damien Carbery <[email protected]> * base-specs/pygtk2.spec: Add patch 02-gtk-tooltips to fix bugzilla 450044 (pygtk not in sync with gtk+). * patches/pygtk2-02-gtk-tooltips.diff: Added to fix 450044. * SUNWgnome-pdf-viewer.spec: Remove evince-thumbnailer.schemas from %files and %preun root as it is no longer in the module.
ChangeLog
SUNWgnome-pdf-viewer.spec
base-specs/pygtk2.spec
patches/pygtk2-02-gtk-tooltips.diff
--- a/ChangeLog	Fri Jun 22 12:50:07 2007 +0000
+++ b/ChangeLog	Fri Jun 22 12:55:05 2007 +0000
@@ -1,11 +1,19 @@
+2007-06-22  Damien Carbery <[email protected]>
+
+	* base-specs/pygtk2.spec: Add patch 02-gtk-tooltips to fix bugzilla
+	  450044 (pygtk not in sync with gtk+).
+	* patches/pygtk2-02-gtk-tooltips.diff: Added to fix 450044.
+	* SUNWgnome-pdf-viewer.spec: Remove evince-thumbnailer.schemas from
+	  %files and %preun root as it is no longer in the module.
+
 2007-06-22  Dermot McCluskey <[email protected]>
 
 	* SUNWvirt-manager.spec: comment out Xen deps for now
 
 2007-06-22  Halton Huo  <[email protected]>
 
-	* SUNWgnome-remote-desktop.spec:
-	  Use realvnc-java-client.spec generate vino-client.jar and vino-client.html
+	* SUNWgnome-remote-desktop.spec: Use realvnc-java-client.spec generate
+	  vino-client.jar and vino-client.html
 	  Add script wrapper /usr/bin/vncviewer for vino-client.jar
 	* base-specs/realvnc-java-client.spec: (added)
 	  build RealVNC java client vncviewer.jar
@@ -20,8 +28,10 @@
 
 2007-06-22  Jerry Tan <[email protected]>
 
-	* base-specs/totem.spec : put totem plugins into /usr/lib/firefox/plugins instead of /usr/lib/mozilla/plugins
-	* patches/totem-05-browserplugin.diff
+	* base-specs/totem.spec: Add patch 05-browserplugin to install totem
+	  plugins to %{_libdir}/firefox/plugins instead of
+	  %{_libdir}/mozilla/plugins
+	* patches/totem-05-browserplugin.diff: Change plugin install dir.
 
 2007-06-22  Dave Lin  <[email protected]>
 
--- a/SUNWgnome-pdf-viewer.spec	Fri Jun 22 12:50:07 2007 +0000
+++ b/SUNWgnome-pdf-viewer.spec	Fri Jun 22 12:55:05 2007 +0000
@@ -210,8 +210,7 @@
   echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
   echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
   echo 'schemas="$SDIR/evince.schemas';
-  echo '         $SDIR/evince-thumbnailer-ps.schemas';
-  echo '         $SDIR/evince-thumbnailer.schemas"';
+  echo '         $SDIR/evince-thumbnailer-ps.schemas"';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
@@ -260,11 +259,13 @@
 %defattr (-, root, sys)
 %attr (0755, root, sys) %dir %{_sysconfdir}
 %{_sysconfdir}/gconf/schemas/evince.schemas
-%{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas
 %{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas
 %attr (0644, root, sys) %{_sysconfdir}/xpdfrc
 
 %changelog
+* Fri Jun 22 2007 - [email protected]
+- Remove evince-thumbnailer.schemas from %files and %preun root as it is no
+  longer in the module.
 * Tue Apr 24 2007 - [email protected]
 - s/0755/-/ in defattr so that files are not made all executable
 * Thu Apr 12 2007 - [email protected]
--- a/base-specs/pygtk2.spec	Fri Jun 22 12:50:07 2007 +0000
+++ b/base-specs/pygtk2.spec	Fri Jun 22 12:55:05 2007 +0000
@@ -18,6 +18,8 @@
 Source:			http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.10/pygtk-%{version}.tar.bz2
 # date:2005-10-27 owner:dcarbery type:feature bugzilla:385131
 Patch1:                 pygtk2-01-uninstalled.pc.diff
+# date:2007-06-22 owner:dcarbery type:bug bugzilla:450044
+Patch2:                 pygtk2-02-gtk-tooltips.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc
@@ -59,6 +61,7 @@
 %prep
 %setup -q -n pygtk-%{version}
 %patch1 -p1
+%patch2 -p1
 
 %build
 autoconf
@@ -95,6 +98,8 @@
 %{_datadir}/pygtk/*
 
 %changelog -n pygtk2
+* Fri Jun 22 2007 - [email protected]
+- Add patch 02-gtk-tooltips to fix bugzilla 450044 (pygtk not in sync with gtk+)
 * Tue Feb  6 2007 - [email protected]
 - Bump to 2.10.4.
 * Thu Dec 14 2006 - [email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pygtk2-02-gtk-tooltips.diff	Fri Jun 22 12:55:05 2007 +0000
@@ -0,0 +1,16 @@
+--- pygtk-2.10.4/gtk/gtk.override.orig	2007-06-22 10:58:24.076341921 +0100
++++ pygtk-2.10.4/gtk/gtk.override	2007-06-22 10:58:53.262188943 +0100
+@@ -3123,11 +3123,11 @@
+                          data->tip_private);
+ }
+ %%
+-override-attr GtkTooltips.tips_data_list
++override-attr GtkTooltips._tips_data_list
+ static PyObject *
+ _wrap_gtk_tooltips__get_tips_data_list(PyGObject *self, void *closure)
+ {
+-    GList *list = GTK_TOOLTIPS(self->obj)->tips_data_list;
++    GList *list = GTK_TOOLTIPS(self->obj)->_tips_data_list;
+     gint         i, length;
+     PyObject    *pylist;
+     GList *iter;