--- a/ChangeLog	Wed Apr 15 02:30:07 2009 +0000
+++ b/ChangeLog	Wed Apr 15 03:54:08 2009 +0000
@@ -1,3 +1,12 @@
+2009-04-15  Dave Lin <[email protected]>
+
+        * base-specs/gnome-devel-docs.spec: Bump to 2.26.1.
+        * base-specs/gnome-doc-utils.spec: Bump to 0.16.1.
+        * base-specs/pango.spec: Bump to 1.24.1.
+        * base-specs/gtk2.spec: Bump to 2.16.1.
+        * base-specs/glib2.spec: Bump to 2.20.1.
+        * patches/glib-04-gio-trash-only-home.diff: Reworked.
+
 2009-04-15  Jerry Tan <[email protected]>
 
 	* base-specs/tracker.spec

--- a/base-specs/glib2.spec	Wed Apr 15 02:30:07 2009 +0000
+++ b/base-specs/glib2.spec	Wed Apr 15 03:54:08 2009 +0000
@@ -10,7 +10,7 @@
 Name:         glib2 
 License:      LGPL
 Group:        System/Libraries
-Version:      2.20.0
+Version:      2.20.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -150,6 +150,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.20.1
 * Sat Apr 04 2009 - [email protected]
 - Removed the unnecessary option %option_with_gnu_iconv.
 * Fri Mar 13 2009 - [email protected]

--- a/base-specs/gnome-devel-docs.spec	Wed Apr 15 02:30:07 2009 +0000
+++ b/base-specs/gnome-devel-docs.spec	Wed Apr 15 03:54:08 2009 +0000
@@ -12,7 +12,7 @@
 License:		GPL
 Group:			Documentation
 BuildArchitectures:	noarch
-Version:		2.26.0
+Version:		2.26.1
 Release:		1
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -77,6 +77,8 @@
 %{_datadir}/omf/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
 * Tue Mar 17 2009 - [email protected]
 - Bump to 2.26.0
 * Mon Sep 29 2008 - [email protected]

--- a/base-specs/gnome-doc-utils.spec	Wed Apr 15 02:30:07 2009 +0000
+++ b/base-specs/gnome-doc-utils.spec	Wed Apr 15 03:54:08 2009 +0000
@@ -10,7 +10,7 @@
 Name:			gnome-doc-utils
 License:		GPL
 Group:			System/Libraries
-Version:		0.16.0
+Version:		0.16.1
 Release:		1
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -87,6 +87,8 @@
 %{_datadir}/xml2po/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 0.16.1
 * Tue Mar 17 2009 - [email protected]
 - Bump to 0.16.0
 * Mon Mar 02 2009 - [email protected]

--- a/base-specs/gtk2.spec	Wed Apr 15 02:30:07 2009 +0000
+++ b/base-specs/gtk2.spec	Wed Apr 15 03:54:08 2009 +0000
@@ -11,7 +11,7 @@
 Name:         gtk2
 License:      LGPL
 Group:        System/Libraries
-Version:      2.16.0
+Version:      2.16.1
 Release:      3
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -236,6 +236,8 @@
 %{_mandir}/man3/*.gz
 
 %changelog -n gtk2
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.16.1
 * Tue Mar 17 2009 - [email protected]
 - Bump to 2.16.0
 * Fri Mar 13 2009 - [email protected]

--- a/base-specs/pango.spec	Wed Apr 15 02:30:07 2009 +0000
+++ b/base-specs/pango.spec	Wed Apr 15 03:54:08 2009 +0000
@@ -10,7 +10,7 @@
 Name:         pango
 License:      LGPL
 Group:        System/Libraries
-Version:      1.24.0
+Version:      1.24.1
 # "grep pango_module_version configure.in" for the api version number.
 %define module_api_version 1.6.0
 Release:      1
@@ -141,6 +141,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 1.24.1
 * Sat Apr 04 2009 - [email protected]
 - export CFLAGS="%optflags" & LDFLAGS="%_ldflags" before configure.
 * Thu Apr 02 2009 - [email protected]

--- a/patches/glib-04-gio-trash-only-home.diff	Wed Apr 15 02:30:07 2009 +0000
+++ b/patches/glib-04-gio-trash-only-home.diff	Wed Apr 15 03:54:08 2009 +0000
@@ -1,6 +1,6 @@
---- /usr/tmp/clean/glib-2.16.2/gio/glocalfile.c	2008-03-31 21:45:06.000000000 +0100
-+++ glib-2.16.2/gio/glocalfile.c	2008-04-10 08:13:21.838298000 +0100
-@@ -1668,6 +1668,7 @@
+--- glib-2.20.1/gio/glocalfile.c.ori	2009-04-15 03:46:56.161574399 +0100
++++ glib-2.20.1/gio/glocalfile.c	2009-04-15 03:48:57.698109713 +0100
+@@ -1715,6 +1715,7 @@
    int fd;
    struct stat trash_stat, global_stat;
    char *dirname, *globaldir;
@@ -8,7 +8,7 @@
    
    if (g_lstat (local->filename, &file_stat) != 0)
      {
-@@ -1704,123 +1704,26 @@
+@@ -1732,123 +1733,26 @@
  
    is_homedir_trash = FALSE;
    trashdir = NULL;
@@ -149,7 +149,7 @@
  
    /* Trashdir points to the trash dir with the "info" and "files" subdirectories */
  
-@@ -1865,8 +1769,8 @@
+@@ -1912,8 +1816,8 @@
    trashfile = g_build_filename (filesdir, trashname, NULL);
  
    g_free (filesdir);
@@ -160,15 +160,15 @@
      {
        int errsv = errno;
  
-@@ -1874,6 +1778,7 @@
+@@ -1921,6 +1825,7 @@
        g_free (trashname);
        g_free (infofile);
        g_free (trashfile);
 +      g_object_unref(trash);
-       
-       g_set_error (error, G_IO_ERROR,
- 		   g_io_error_from_errno (errsv),
-@@ -1883,6 +1788,7 @@
+ 
+       if (errsv == EXDEV)
+ 	/* The trash dir was actually on another fs anyway!?
+@@ -1939,6 +1844,7 @@
      }
  
    g_free (trashfile);