--- a/ChangeLog	Sat Sep 05 06:47:46 2009 +0000
+++ b/ChangeLog	Sun Sep 06 12:39:12 2009 +0000
@@ -1,3 +1,10 @@
+2009-09-06  Dave Lin <[email protected]>
+
+        * base-specs/glib2.spec: Bump to 2.21.6.
+        * base-specs/gtk2.spec: Bump to 2.17.11.
+	* patches/gtk+-13-po-var-catalogs.diff: Add this patch to fix variable
+	  catalogs install po*/Makefile.in.in.
+
 2009-09-04 Brian Cameron  <[email protected]>
 
 	* base-specs/clutter.spec:, patches/clutter-01-gi.diff: Bump to 1.0.4,

--- a/base-specs/glib2.spec	Sat Sep 05 06:47:46 2009 +0000
+++ b/base-specs/glib2.spec	Sun Sep 06 12:39:12 2009 +0000
@@ -13,7 +13,7 @@
 Name:         glib2 
 License:      LGPL
 Group:        System/Libraries
-Version:      2.21.5
+Version:      2.21.6
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -153,6 +153,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 06 2009 - [email protected]
+- Bump to 2.21.6
 * Tue Aug 25 2009 - [email protected]
 - Bump to 2.21.5.
 - Upstreamed patch -10-bad-return and -11-gio-fen-undef-function

--- a/base-specs/gtk2.spec	Sat Sep 05 06:47:46 2009 +0000
+++ b/base-specs/gtk2.spec	Sun Sep 06 12:39:12 2009 +0000
@@ -14,7 +14,7 @@
 Name:         gtk2
 License:      LGPL
 Group:        System/Libraries
-Version:      2.17.10
+Version:      2.17.11
 Release:      3
 Distribution: Java Desktop System
 Vendor:	      Sun Microsystems, Inc.
@@ -48,6 +48,8 @@
 Patch11:      gtk+-11-filechooser-enterkey.diff
 # date:2009-09-03 owner:gheet type:bug doo:10870
 Patch12:      gtk+-12-custom-dialog-blocked.diff
+# date:2009-09-06 owner:davelma type:bug bugzilla: n/a
+Patch13:      gtk+-13-po-var-catalogs.diff
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -129,6 +131,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 %ifos linux
@@ -174,7 +177,7 @@
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0
 mkdir -p $RPM_BUILD_ROOT/etc/profile.d
 cp %SOURCE1 $RPM_BUILD_ROOT/etc/profile.d/
 cp %SOURCE2 $RPM_BUILD_ROOT/etc/profile.d
@@ -233,6 +236,9 @@
 %{_mandir}/man3/*.gz
 
 %changelog -n gtk2
+* Sun Sep 06 2009 - [email protected]
+- Bump to 2.17.11
+- Add patch 13-po-var-catalogs.diff to fix variable catalogs install po*/Makefile.in.in.
 * Wed Sep 02 2009 - [email protected]
 - Bump to 2.17.10
 - Removed the upstreamed patch 12-mozilla-badaccess.diff.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtk+-13-po-var-catalogs.diff	Sun Sep 06 12:39:12 2009 +0000
@@ -0,0 +1,22 @@
+--- gtk+-2.17.11/po/Makefile.in.in.ori	2009-09-06 13:42:50.181096800 +0100
++++ gtk+-2.17.11/po/Makefile.in.in	2009-09-06 13:43:03.030764900 +0100
+@@ -125,7 +125,7 @@
+ install-data: install-data-@USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+-	$(mkdir_p) $(DESTDIR)$(datadir); \
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+--- gtk+-2.17.11/po-properties/Makefile.in.in.ori	2009-09-06 13:43:35.277655200 +0100
++++ gtk+-2.17.11/po-properties/Makefile.in.in	2009-09-06 13:43:51.428927700 +0100
+@@ -106,7 +106,7 @@
+ install-data: install-data-@USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+-	$(mkdir_p) $(DESTDIR)$(datadir); \
++	$(mkdir_p) $(DESTDIR)$(datadir)
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \