--- a/ChangeLog	Sun Sep 25 05:33:52 2005 +0000
+++ b/ChangeLog	Mon Sep 26 01:50:09 2005 +0000
@@ -1,3 +1,8 @@
+2005-09-26  Glynn Foster  <[email protected]>
+
+	* gnome-common.spec: Bump to 2.12.0
+	* patches/gnome-common-01-intltool.diff: Remove.
+
 2005-09-22 Brian Cameron  <[email protected]>
 
         * gnome-media.spec: Now build gnome-cd again.  Add back patch

--- a/gnome-common.spec	Sun Sep 25 05:33:52 2005 +0000
+++ b/gnome-common.spec	Mon Sep 26 01:50:09 2005 +0000
@@ -9,13 +9,12 @@
 License:		GPL
 Group:			System/Libraries
 BuildArchitectures:	noarch
-Version:		2.11.0
+Version:		2.12.0
 Release:		1
 Distribution:		Java Desktop System
 Vendor:			Sun Microsystems, Inc.
 Summary:		Multiply used files used by the GNOME 2.0 platform
 Source:			http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.11/%{name}-%{version}.tar.bz2
-Patch1: 		gnome-common-01-intltool.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/%{name}
@@ -26,7 +25,6 @@
 
 %prep
 %setup -q
-%patch1 -p1 
 
 %build
 %ifos linux
@@ -58,6 +56,9 @@
 %{_datadir}/aclocal
 
 %changelog
+* Mon Sep 26 2005 - [email protected]
+- Bump to 2.12.0
+
 * Tue Sep 06 2005 - [email protected]
 - Add patch 1 from gnome-common CVS head to fix problem with grep
   not working the same way on Solaris as it does on Linux.

--- a/patches/gnome-common-01-intltool.diff	Sun Sep 25 05:33:52 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
---- gnome-common-2.11.0/macros2/gnome-autogen.sh-orig	2005-09-06 20:23:59.168916000 -0500
-+++ gnome-common-2.11.0/macros2/gnome-autogen.sh	2005-09-06 20:24:36.452222000 -0500
-@@ -225,8 +225,9 @@ for configure_ac in $configure_files; do
-     if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then
- 	want_glib_gettext=true
-     fi
--    if grep "^\(AC\|IT\)_PROG_INTLTOOL" $configure_ac >/dev/null; then
--	want_intltool=true
-+    if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null ||
-+       grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then
-+        want_intltool=true
-     fi
-     if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then
- 	want_pkg_config=true
-@@ -355,7 +356,8 @@ for configure_ac in $configure_files; do
- 	   fi
- 	fi
- 
--	if grep "^\(AC\|IT\)_PROG_INTLTOOL" $basename >/dev/null; then
-+        if grep "^AC_PROG_INTLTOOL" $basename >/dev/null ||
-+           grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then
- 	    printbold "Running $INTLTOOLIZE..."
- 	    $INTLTOOLIZE --force --copy --automake || exit 1
- 	fi