--- a/ChangeLog	Wed Oct 27 01:11:13 2010 +0000
+++ b/ChangeLog	Wed Oct 27 06:06:09 2010 +0000
@@ -1,3 +1,12 @@
+2010-10-27  Brian Cameron  <[email protected]>
+
+	* specs/SUNWgnome-a11y-libs.spec, base-specs/libgail-gnome.spec:
+	  Bump to 1.20.3.
+	* base-specs/gnome-mag.spec: Bump to 0.16.2.
+	* patches/gnome-mag-01-x11-build-error.diff,
+	  patches/gnome-mag-03-enable-deprecated.diff: Remove upstream
+	  patches.
+
 2010-10-27  Dave Lin <[email protected]>
 
 	* specs/SUNWzz-gnome-l10n.spec: Added fy, gv locales. 

--- a/base-specs/gnome-mag.spec	Wed Oct 27 01:11:13 2010 +0000
+++ b/base-specs/gnome-mag.spec	Wed Oct 27 06:06:09 2010 +0000
@@ -13,22 +13,18 @@
 Name:         gnome-mag
 License:      LGPL
 Group:        System/Libraries
-Version:      0.16.1
+Version:      0.16.2
 Release:      201
 Distribution: Java Desktop System
 Vendor:       Gnome Community
 Summary:      GNOME magnifier
 Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.16/%{name}-%{version}.tar.bz2
-#owner:dcarbery date:2007-06-07 type:bug bugzilla:444137,444138
-Patch1:       gnome-mag-01-x11-build-error.diff
 #owner:dcarbery date:2007-08-28 type:branding
-Patch2:       gnome-mag-02-no-xext-dependency.diff
-#owner:chrisk date:2010-03-12 type:bug
-Patch3:       gnome-mag-03-enable-deprecated.diff
+Patch1:       gnome-mag-01-no-xext-dependency.diff
 #owner:liyuan date:2010-09-25 type:bug doo:7131
-Patch4:       gnome-mag-04-display-env.diff
+Patch2:       gnome-mag-02-display-env.diff
 #owner:liyuan date:2010-10-15 type:bug doo:17162
-Patch5:       gnome-mag-05-translate-region.diff
+Patch3:       gnome-mag-03-translate-region.diff
 URL:          http://developer.gnome.org/projects/gap/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -56,8 +52,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 %ifos linux
@@ -112,6 +106,8 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 26 2010 - [email protected]
+- Bump to 0.16.2.
 * Fri Oct 15 2010 - [email protected]
 - Add gnome-mag-05-translate-region.diff.
 * Sat Sep 25 2010 - [email protected]

--- a/base-specs/libgail-gnome.spec	Wed Oct 27 01:11:13 2010 +0000
+++ b/base-specs/libgail-gnome.spec	Wed Oct 27 06:06:09 2010 +0000
@@ -13,8 +13,8 @@
 Name:         libgail-gnome
 License:      LGPL
 Group:        System/Libraries/GNOME
-Version:      1.20.2
-Release:      42
+Version:      1.20.3
+Release:      1
 Distribution: Java Desktop System
 Vendor:       Gnome Community
 Summary:      Accessibility implementation for GTK+ and GNOME libraries
@@ -65,7 +65,12 @@
   CPUS=1
 fi
 
-./configure --prefix=%{_prefix}
+./configure --prefix=%{_prefix} \
+            --libdir=%{_libdir} \
+            --libexecdir=%{_libexecdir} \
+            --bindir=%{_bindir} \
+            --sysconfdir=%{_sysconfdir}
+
 
 make -j $CPUS
 
@@ -88,6 +93,8 @@
 %{_libdir}/pkgconfig
 
 %changelog
+* Wed Oct 27 2010 - [email protected]
+- Bump to 1.20.3.
 * Sat Apr  3 2010 - [email protected]
 - Bump to 1.20.2.
 * Sat Sep 27 2008 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-mag-01-no-xext-dependency.diff	Wed Oct 27 06:06:09 2010 +0000
@@ -0,0 +1,11 @@
+--- gnome-mag-0.14.8/configure.in.orig	2007-08-28 09:04:09.772756004 +0100
++++ gnome-mag-0.14.8/configure.in	2007-08-28 09:04:19.442917490 +0100
+@@ -122,7 +122,7 @@
+ 
+ if test "x$have_xextensions" = xyes; then
+    dnl path to XRENDER
+-   PKG_CHECK_MODULES(XCOMPOSITE, xcomposite xrender xext, [have_composite=yes])
++   PKG_CHECK_MODULES(XCOMPOSITE, xcomposite xrender, [have_composite=yes])
+    if test "x$have_composite" = xyes; then
+       PKG_CHECK_MODULES(XCOMPOSITE, xcomposite >= 0.3, [have_overlay=yes])
+    fi

--- a/patches/gnome-mag-01-x11-build-error.diff	Wed Oct 27 01:11:13 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- gnome-mag-0.14.5/magnifier/x11/gmag-graphical-server.c.orig	2007-06-07 16:28:12.220827760 +0100
-+++ gnome-mag-0.14.5/magnifier/x11/gmag-graphical-server.c	2007-06-07 16:35:33.729120677 +0100
-@@ -49,6 +49,10 @@
- 
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
-+/* From /usr/include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h */
-+extern gboolean gdk_pixbuf_set_option  (GdkPixbuf   *pixbuf,
-+                                 const gchar *key,
-+                                 const gchar *value);
- 
- enum {
- 	STRUT_LEFT = 0,

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-mag-02-display-env.diff	Wed Oct 27 06:06:09 2010 +0000
@@ -0,0 +1,27 @@
+--- gnome-mag-0.16.1/magnifier/magnifier.c	2010-04-01 00:53:08.000000000 +0800
++++ gnome-mag-0.16.1-mod/magnifier/magnifier.c	2010-09-15 12:34:39.764947137 +0800
+@@ -2248,14 +2248,22 @@
+ static void
+ magnifier_init (Magnifier *magnifier)
+ {
++
++	const gchar *display_env;
+ 	magnifier->priv = g_new0 (MagnifierPrivate, 1);
+ 	magnifier_properties_init (magnifier);
+ 	magnifier->zoom_regions = NULL;
+ 	magnifier->zoom_regions_dbus = NULL;
+ 	magnifier->source_screen_num = 0;
+ 	magnifier->target_screen_num = 0;
+-	magnifier->source_display_name = g_strdup (":0.0");
+-	magnifier->target_display_name = g_strdup (":0.0");
++
++	if (display_env = g_getenv ("DISPLAY")) {
++		magnifier->source_display_name = g_strdup (display_env);
++		magnifier->target_display_name = g_strdup (display_env);
++	} else {
++		magnifier->source_display_name = g_strdup (":0.0");
++		magnifier->target_display_name = g_strdup (":0.0");
++	}
+ 	magnifier->cursor_size_x = 0;
+ 	magnifier->cursor_size_y = 0;
+ 	magnifier->cursor_scale_factor = 1.0F;

--- a/patches/gnome-mag-02-no-xext-dependency.diff	Wed Oct 27 01:11:13 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnome-mag-0.14.8/configure.in.orig	2007-08-28 09:04:09.772756004 +0100
-+++ gnome-mag-0.14.8/configure.in	2007-08-28 09:04:19.442917490 +0100
-@@ -122,7 +122,7 @@
- 
- if test "x$have_xextensions" = xyes; then
-    dnl path to XRENDER
--   PKG_CHECK_MODULES(XCOMPOSITE, xcomposite xrender xext, [have_composite=yes])
-+   PKG_CHECK_MODULES(XCOMPOSITE, xcomposite xrender, [have_composite=yes])
-    if test "x$have_composite" = xyes; then
-       PKG_CHECK_MODULES(XCOMPOSITE, xcomposite >= 0.3, [have_overlay=yes])
-    fi

--- a/patches/gnome-mag-03-enable-deprecated.diff	Wed Oct 27 01:11:13 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -ruN gnome-mag-0.16.0.orig/configure.in gnome-mag-0.16.0/configure.in
---- gnome-mag-0.16.0.orig/configure.in	2010-03-13 07:22:55.311257224 +0000
-+++ gnome-mag-0.16.0/configure.in	2010-03-13 07:23:14.473082549 +0000
-@@ -87,8 +87,6 @@
- AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging [default=no]],,enable_debug=no)
- if test "$enable_debug" = "yes"; then
-   GNOME_MAG_DEBUG_CFLAGS="-DG_ENABLE_DEBUG"
--else
--  GNOME_MAG_DEBUG_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
- fi
- AC_SUBST(GNOME_MAG_DEBUG_CFLAGS)
- 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-mag-03-translate-region.diff	Wed Oct 27 06:06:09 2010 +0000
@@ -0,0 +1,22 @@
+--- gnome-mag-0.16.1/magnifier/x11/gmag-compositor.c	2010-04-01 00:53:08.000000000 +0800
++++ gnome-mag-0.16.1-mod/magnifier/x11/gmag-compositor.c	2010-10-09 16:04:56.950947449 +0800
+@@ -156,15 +156,15 @@
+ 		XFixesIntersectRegion (dpy, final_clip, region,
+ 				       pgmag_win->clip);
+ 		XFixesSetPictureClipRegion (dpy, pgmag_win->pic,
+-					    -(pgmag_win->attr.x),
+-					    -(pgmag_win->attr.y), final_clip);
++					    0,
++					    0, final_clip);
+ 
+ 		rectlist = XFixesFetchRegion (dpy, final_clip, &howmany);
+ 	} else {
+ 		XFixesSetPictureClipRegion (dpy,
+ 					    pgmag_win->pic,
+-					    -(pgmag_win->attr.x),
+-					    -(pgmag_win->attr.y),
++					    0,
++					    0,
+ 					    pgmag_win->clip);
+ 		rectlist = XFixesFetchRegion (dpy, pgmag_win->clip, &howmany);
+ 	}

--- a/patches/gnome-mag-04-display-env.diff	Wed Oct 27 01:11:13 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
---- gnome-mag-0.16.1/magnifier/magnifier.c	2010-04-01 00:53:08.000000000 +0800
-+++ gnome-mag-0.16.1-mod/magnifier/magnifier.c	2010-09-15 12:34:39.764947137 +0800
-@@ -2248,14 +2248,22 @@
- static void
- magnifier_init (Magnifier *magnifier)
- {
-+
-+	const gchar *display_env;
- 	magnifier->priv = g_new0 (MagnifierPrivate, 1);
- 	magnifier_properties_init (magnifier);
- 	magnifier->zoom_regions = NULL;
- 	magnifier->zoom_regions_dbus = NULL;
- 	magnifier->source_screen_num = 0;
- 	magnifier->target_screen_num = 0;
--	magnifier->source_display_name = g_strdup (":0.0");
--	magnifier->target_display_name = g_strdup (":0.0");
-+
-+	if (display_env = g_getenv ("DISPLAY")) {
-+		magnifier->source_display_name = g_strdup (display_env);
-+		magnifier->target_display_name = g_strdup (display_env);
-+	} else {
-+		magnifier->source_display_name = g_strdup (":0.0");
-+		magnifier->target_display_name = g_strdup (":0.0");
-+	}
- 	magnifier->cursor_size_x = 0;
- 	magnifier->cursor_size_y = 0;
- 	magnifier->cursor_scale_factor = 1.0F;

--- a/patches/gnome-mag-05-translate-region.diff	Wed Oct 27 01:11:13 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
---- gnome-mag-0.16.1/magnifier/x11/gmag-compositor.c	2010-04-01 00:53:08.000000000 +0800
-+++ gnome-mag-0.16.1-mod/magnifier/x11/gmag-compositor.c	2010-10-09 16:04:56.950947449 +0800
-@@ -156,15 +156,15 @@
- 		XFixesIntersectRegion (dpy, final_clip, region,
- 				       pgmag_win->clip);
- 		XFixesSetPictureClipRegion (dpy, pgmag_win->pic,
--					    -(pgmag_win->attr.x),
--					    -(pgmag_win->attr.y), final_clip);
-+					    0,
-+					    0, final_clip);
- 
- 		rectlist = XFixesFetchRegion (dpy, final_clip, &howmany);
- 	} else {
- 		XFixesSetPictureClipRegion (dpy,
- 					    pgmag_win->pic,
--					    -(pgmag_win->attr.x),
--					    -(pgmag_win->attr.y),
-+					    0,
-+					    0,
- 					    pgmag_win->clip);
- 		rectlist = XFixesFetchRegion (dpy, pgmag_win->clip, &howmany);
- 	}

--- a/specs/SUNWgnome-a11y-libs.spec	Wed Oct 27 01:11:13 2010 +0000
+++ b/specs/SUNWgnome-a11y-libs.spec	Wed Oct 27 06:06:09 2010 +0000
@@ -275,6 +275,7 @@
 %defattr (-, root, sys)
 %attr (0755, root, sys) %dir %{_sysconfdir}
 %{_sysconfdir}/gconf/schemas/at-spi.schemas
+%{_sysconfdir}/gconf/schemas/libgail-gnome.schemas
 %{_sysconfdir}/xdg/autostart/at-spi-registryd.desktop
 
 %if %build_l10n