--- a/ChangeLog	Wed Apr 15 16:00:48 2009 +0000
+++ b/ChangeLog	Thu Apr 16 01:51:51 2009 +0000
@@ -1,3 +1,25 @@
+2009-04-16  Dave Lin <[email protected]>
+
+        * base-specs/gnome-mag.spec: Bump to 0.15.6.
+        * base-specs/orca.spec: Bump to 2.26.1.
+        * base-specs/accerciser.spec: Bump to 1.6.1.
+        * base-specs/deskbar-applet.spec: Bump to 2.26.1.
+        * base-specs/gnome-applets.spec: Bump to 2.26.1.
+        * base-specs/eog.spec: Bump to 2.26.1.
+        * base-specs/gcalctool.spec: Bump to 5.26.1.
+        * base-specs/gedit.spec: Bump to 2.26.1.
+        * base-specs/file-roller.spec: Bump to 2.26.1.
+        * patches/file-roller-02-zip-crash.diff: Removed.
+        * base-specs/gnome-games.spec: Bump to 2.26.1.
+        * base-specs/gnome-nettool.spec: Bump to 2.26.1.
+        * base-specs/gnome-system-monitor.spec: Bump to 2.26.1.
+        * base-specs/gnome-user-docs.spec: Bump to 2.26.1.
+        * base-specs/gtkhtml.spec: Bump to 3.26.1.1.
+        * base-specs/gucharmap.spec: Bump to 2.26.1.
+        * base-specs/tracker.spec: Bump to 0.6.93.
+        * base-specs/gtksourceview2.spec: Bump to 2.6.1. Run libtoolize to
+	  fix CDPATH issue.
+
 2009-04-15  Matt Keenan <[email protected]>
 
 	* base-specs/virt-manager.spec : Add patch 10-cdrom-disks.diff, fix 

--- a/base-specs/accerciser.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/accerciser.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -10,7 +10,7 @@
 %define pythonver 2.4
 
 Name:           accerciser
-Version:        1.6.0
+Version:        1.6.1
 Release:        1%{?dist}
 Summary:        An interactive Python accessibility explorer for the GNOME desktop
 
@@ -116,6 +116,8 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 1.6.1
 * Tue Mar 17 2009 - [email protected]
 - Bump to 1.6.0
 * Wed Feb 18 2009 - [email protected]

--- a/base-specs/deskbar-applet.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/deskbar-applet.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -9,7 +9,7 @@
 Name:			deskbar-applet
 License:		GPL
 Group:			System/GUI/GNOME
-Version:		2.26.0
+Version:		2.26.1
 Release:		1
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -115,6 +115,8 @@
 %{_libdir}/python2.4/
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
 * Wed Mar 18 2009 - [email protected]
 - Bump to 2.26.0
 * Fri Mar 13 2009 - [email protected]

--- a/base-specs/eog.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/eog.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -11,7 +11,7 @@
 Name:         eog
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.26.0
+Version:      2.26.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -136,6 +136,8 @@
 %{_prefix}/var/scrollkeeper
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
 * Tue Mar 17 2009 - [email protected]
 - Bump to 2.26.0
 - Add patch 03-gtkdoc-rebase.diff to fix GTKDOC_REBASE issue.

--- a/base-specs/file-roller.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/file-roller.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -11,7 +11,7 @@
 Name:         file-roller
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.26.0
+Version:      2.26.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -24,8 +24,6 @@
 %endif
 # date:2003-07-24 type:branding owner:gman
 Patch1:       file-roller-01-menu-entry.diff
-# date:2009-04-08 type:bug owner:mattman doo:7965
-Patch2:       file-roller-02-zip-crash.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}
@@ -67,7 +65,6 @@
 cd po-sun; make; cd ..
 %endif
 %patch1 -p1
-%patch2 -p1
 for po in po/*.po; do
   dos2unix -ascii $po $po
 done
@@ -140,6 +137,9 @@
 %{_datadir}/pixmaps/*.png
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
+- Removed upstreamed patch 02-zip-crash.diff.
 * Wed Apr 08 2009 - [email protected]
 - Remove original 02-zip-crash.diff as fixed in 2.26.0
 - Create new 02-zip-crash.diff for doo bug 7965

--- a/base-specs/gcalctool.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/gcalctool.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -11,7 +11,7 @@
 Name:         gcalctool
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      5.26.0
+Version:      5.26.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -121,6 +121,8 @@
 %{_mandir}/man1/
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 5.26.1
 * Tue Mar 17 2009 - [email protected]
 - Bump to 5.26.0
 * Fri Mar 13 2009 - [email protected]

--- a/base-specs/gedit.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/gedit.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -11,7 +11,7 @@
 Name:		gedit
 License:	GPL
 Group:		System/GUI/GNOME
-Version:	2.26.0
+Version:	2.26.1
 Release:	1
 Distribution:	Java Desktop System
 Vendor:		Sun Microsystems, Inc.
@@ -159,6 +159,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
 * Tue Mar 17 2009 - [email protected]
 - Bump to 2.26.0
 * Fri Mar 13 2009 - [email protected]

--- a/base-specs/gnome-applets.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/gnome-applets.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -9,7 +9,7 @@
 Name:         gnome-applets 
 License:      GPL
 Group:        System/GUI/GNOME 
-Version:      2.26.0
+Version:      2.26.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -144,6 +144,8 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
 * Tue Mar 17 2009 - [email protected]
 - Bump to 2.26.0
 * Fri Mar 13 2009 - [email protected]

--- a/base-specs/gnome-games.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/gnome-games.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -10,12 +10,12 @@
 Name:         gnome-games
 License:      GPL
 Group:        Amusements/Games
-Version:      2.26.0
+Version:      2.26.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
 Summary:      GNOME games
-Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.26/%{name}-%{version}.tar.bz2
 # owner:davelam date:2008-05-14 type:bug bugzilla:532093
 Patch1:       gnome-games-01-add-libz.diff
 URL:          http://www.gnome.org
@@ -159,6 +159,8 @@
 %config %{_sysconfdir}/sound/events/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
 * Tue Mar 17 2009 - [email protected]
 - Bump to 2.26.0.
 * Fri Mar 13 2009 - [email protected]

--- a/base-specs/gnome-mag.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/gnome-mag.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -10,7 +10,7 @@
 Name:         gnome-mag
 License:      LGPL
 Group:        System/Libraries
-Version:      0.15.5
+Version:      0.15.6
 Release:      201
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -99,6 +99,8 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 0.15.6
 * Fri Mar 13 2009 - [email protected]
 - Bump to 0.15.5
 * Sat Sep 27 2008 - [email protected]

--- a/base-specs/gnome-nettool.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/gnome-nettool.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -11,7 +11,7 @@
 Name:               gnome-nettool
 License:	    GPL/LGPL
 Group:		    System/GUI/GNOME
-Version:            2.26.0
+Version:            2.26.1
 Release:	    1
 Summary:	    GNOME Network Tools
 Source:		    http://ftp.gnome.org/pub/GNOME/sources/gnome-nettool/2.26/gnome-nettool-%{version}.tar.bz2
@@ -101,6 +101,8 @@
 %endif
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
 * Mon Sep 29 2008 - [email protected]
 - Bump to 2.22.1.
 * Wed Sep 10 2008 - [email protected]

--- a/base-specs/gnome-system-monitor.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/gnome-system-monitor.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -11,7 +11,7 @@
 Name:         gnome-system-monitor 
 License:      GPL v2
 Group:        System/GUI/GNOME 
-Version:      2.26.0
+Version:      2.26.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -133,6 +133,8 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
 * Mon Mar 23 2009 - [email protected]
   Take ownership of spec file + patches
 * Fri Mar 13 2009 - [email protected]

--- a/base-specs/gnome-user-docs.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/gnome-user-docs.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -11,7 +11,7 @@
 License:		FDL
 Group:			Documentation
 BuildArchitectures:	noarch
-Version:		2.26.0
+Version:		2.26.1
 Release:		48
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -79,6 +79,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
 * Fri Mar 13 2009 - [email protected]

--- a/base-specs/gtkhtml.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/gtkhtml.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -12,7 +12,7 @@
 Group:        System/Libraries/GNOME
 # major_version is generally a 'stable' build number i.e. has an even number.
 %define major_version 3.14
-Version:      3.26.1
+Version:      3.26.1.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -116,6 +116,8 @@
 %{_includedir}/libgtkhtml-%{major_version}/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 3.26.1.1
 * Tue Apr 14 2009 - [email protected]
 - Bump t 3.26.1.
 * Tue Apr 07 2009 - [email protected]

--- a/base-specs/gtksourceview2.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/gtksourceview2.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -10,7 +10,7 @@
 Name:			gtksourceview
 License:		GPL
 Group:			System/Libraries
-Version:		2.6.0
+Version:		2.6.1
 Release:		1
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
@@ -71,6 +71,7 @@
 fi
 
 gtkdocize
+libtoolize --force --copy
 aclocal $ACLOCAL_FLAGS
 automake -a -c -f
 autoconf
@@ -114,6 +115,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.6.1
+- run libtoolize to fix CDPATH issue.
 * Tue Mar 17 2009 - [email protected]
 - Bump to 2.6.0
 * Fri Mar 13 2009 - [email protected]

--- a/base-specs/gucharmap.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/gucharmap.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -11,7 +11,7 @@
 Name:         gucharmap
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.26.0
+Version:      2.26.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -114,6 +114,8 @@
 %{_datadir}/gnome/help/*
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
 * Tue Mar 17 2009 - [email protected]
 - Bump to 2.26.0
 * Fri Feb 20 2009 - [email protected]

--- a/base-specs/orca.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/orca.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -11,7 +11,7 @@
 Name:           orca
 License:        LGPL
 Group:          System/Library
-Version:        2.26.0
+Version:        2.26.1
 Release:        1
 Distribution:   Java Desktop System
 Vendor:	        Sun Microsystems, Inc.
@@ -109,6 +109,8 @@
 %doc AUTHORS NEWS README ChangeLog
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 2.26.1
 * Tue Mar 17 2009 - [email protected]
 - Bump to 2.26.0
 * Fri Mar 06 2009 - [email protected]

--- a/base-specs/tracker.spec	Wed Apr 15 16:00:48 2009 +0000
+++ b/base-specs/tracker.spec	Thu Apr 16 01:51:51 2009 +0000
@@ -162,6 +162,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Apr 15 2009 - [email protected]
+- Bump to 0.6.93
 * Wed Mar 04 2009 - [email protected]
 - Add tracker-18-replace-odt2txt-with-o3read.diff to use o3read until odt2txt introduced
 * Tue Feb 24 2009 - [email protected]

--- a/patches/file-roller-02-zip-crash.diff	Wed Apr 15 16:00:48 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-/jds/bin/diff -uprN file-roller-2.26.0.old/src/fr-window.c file-roller-2.26.0/src/fr-window.c
---- file-roller-2.26.0.old/src/fr-window.c	2009-04-08 12:25:23.119345000 +0100
-+++ file-roller-2.26.0/src/fr-window.c	2009-04-08 12:25:29.900875000 +0100
-@@ -2961,7 +2961,8 @@ handle_errors (FrWindow    *window,
- 						0,
- 						output,
- 						msg,
--						"%s", details);
-+                        ((details != NULL) ? "%s" : NULL),
-+                        details);
- 		fr_window_show_error_dialog (window, dialog, dialog_parent);
- 
- 		return FALSE;