--- a/Solaris/ChangeLog	Thu Jan 19 12:00:17 2006 +0000
+++ b/Solaris/ChangeLog	Thu Jan 19 12:47:01 2006 +0000
@@ -1,3 +1,10 @@
+2006-01-19  Damien Carbery <[email protected]>
+
+	* SUNWgnome-common-devel.spec: Bump pkg-config to 0.20.0, remove 
+	upstream patch (01-pkg.m4), add new patch (01-wall, bug #4888).
+	* patches/pkgconfig-01-pkg.m4.diff: Removed, upstream.
+	* patches/pkgconfig-01-wall.diff: Remove -Wall from Makefile.am.
+
 2006-01-19  Dave Lin <[email protected]>
 
 	* SUNWthunderbird.spec: Add "-lXft -lfontconfig -lfreetype" to 

--- a/Solaris/SUNWgnome-common-devel.spec	Thu Jan 19 12:00:17 2006 +0000
+++ b/Solaris/SUNWgnome-common-devel.spec	Thu Jan 19 12:47:01 2006 +0000
@@ -11,11 +11,12 @@
 %use gcommon = gnome-common.spec
 %use intltool = intltool.spec
 %use gtkdoc = gtk-doc.spec
-%define pkgconfig_version 0.16.0
+%define pkgconfig_version 0.20
+%define pkgconfig_tarball_dir pkg-config-%{pkgconfig_version}
 Name:                    SUNWgnome-common-devel
 Summary:                 GNOME common development tools and libraries - developer files
 Version:                 %{default_pkg_version}
-Source:                  http://pkgconfig.freedesktop.org/releases/pkgconfig-%{pkgconfig_version}.tar.gz
+Source:                  http://pkgconfig.freedesktop.org/releases/pkg-config-%{pkgconfig_version}.tar.gz
 Source1:                 intltool-extract.1
 Source2:                 intltool-merge.1
 Source3:                 intltool-prepare.1
@@ -23,7 +24,7 @@
 Source5:                 intltool-update.1
 Source6:                 intltoolize.1
 Source7:                 pkg-config.1
-Patch1:                  pkgconfig-01-pkg.m4.diff
+Patch1:                  pkgconfig-01-wall.diff
 Patch2:                  pkgconfig-02-suppress_gnome-config_error_msg.diff
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -43,7 +44,7 @@
 
 %prep
 %setup -q -c -n SUNWgnome-common-devel-%{version}
-cd pkgconfig-%pkgconfig_version
+cd %{pkgconfig_tarball_dir}
 %patch1 -p1
 %patch2 -p1
 cd %{_builddir}
@@ -56,7 +57,7 @@
 if test "x$CPUS" = "x" -o $CPUS = 0; then
     CPUS=1
 fi
-cd pkgconfig-%pkgconfig_version
+cd %{pkgconfig_tarball_dir}
 CFLAGS="$RPM_OPT_FLAGS" \
 ./configure --prefix=%{_prefix}
 make -j$CPUS
@@ -114,6 +115,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Thu Jan 19 2006 - [email protected]
+- Bump pkg-config to 0.20.0, remove upstream patch (01-pkg.m4), add new patch
+  (01-wall, bug #4888).
 * Tue Sep 13 2005 - [email protected]
 - Bump version to 2.12.
 * Thu Sep 08 2005 - [email protected]

--- a/Solaris/patches/pkgconfig-01-pkg.m4.diff	Thu Jan 19 12:00:17 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
---- pkgconfig-0.16.0/pkg.m4	2005-07-07 16:57:32.306411759 +0100
-+++ pkgconfig-0.17.2/pkg.m4	2005-04-14 09:29:49.000000000 +0100
-@@ -49,7 +49,7 @@
- [if test "x$ac_cv_env_[]$1[]_set" = "xset"; then
- 	pkg_cv_[]$1=$ac_cv_env_[]$1[]_value
- elif test -n "$PKG_CONFIG"; then
--	if $PKG_CONFIG --exists "$3" >/dev/null 2>&1; then
-+	if AC_RUN_LOG([$PKG_CONFIG --exists "$3" >/dev/null 2>&1]); then
- 		pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- 	else
- 		pkg_failed=yes
-@@ -61,6 +61,13 @@
- 
- # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
- # [ACTION-IF-NOT-FOUND])
-+#
-+#
-+# Note that if there is a possibility the first call to
-+# PKG_CHECK_MODULES might not happen, you should be sure to include an
-+# explicit call to PKG_PROG_PKG_CONFIG in your configure.in
-+#
-+#
- # --------------------------------------------------------------
- AC_DEFUN([PKG_CHECK_MODULES],
- [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-@@ -69,9 +76,9 @@
- 
- pkg_failed=no
- AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS],
--	[_PKG_CONFIG([$1][_CFLAGS], [cflags], [[$2]])])
-+	[_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])])
- AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS],
--	[_PKG_CONFIG([$1][_LIBS], [libs], [[$2]])])
-+	[_PKG_CONFIG([$1][_LIBS], [libs], [$2])])
- 
- if test $pkg_failed = yes; then
- 	$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-@@ -79,17 +86,17 @@
- 	echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
- 
- 	ifelse([$4], , [AC_MSG_ERROR(dnl
--[[Package requirements ($2) were not met.
-+[Package requirements ($2) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
- Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
- to avoid the need to call pkg-config.  See the pkg-config man page for
--more details.]])],
-+more details.])],
- 		[$4])
- elif test $pkg_failed = untried; then
- 	ifelse([$4], , [AC_MSG_FAILURE(dnl
--[[The pkg-config script could not be found or is too old.  Make sure it
-+[The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
-@@ -97,7 +104,7 @@
- to avoid the need to call pkg-config.  See the pkg-config man page for
- more details.
- 
--To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.]])],
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
- 		[$4])
- else
- 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Solaris/patches/pkgconfig-01-wall.diff	Thu Jan 19 12:47:01 2006 +0000
@@ -0,0 +1,22 @@
+--- pkg-config-0.20/Makefile.am.orig	2006-01-17 11:20:27.535822000 +0000
++++ pkg-config-0.20/Makefile.am	2006-01-17 11:20:43.651725000 +0000
+@@ -14,7 +14,7 @@
+ EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32
+ 
+ bin_PROGRAMS = pkg-config
+-AM_CFLAGS=-g -Wall -O2
++AM_CFLAGS=-g
+ 
+ INCLUDES=-DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" $(included_glib_includes)
+ 
+--- pkg-config-0.20/Makefile.in.orig	2006-01-17 11:20:32.831967000 +0000
++++ pkg-config-0.20/Makefile.in	2006-01-17 11:20:47.612260000 +0000
+@@ -152,7 +152,7 @@
+ EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32
+ 
+ bin_PROGRAMS = pkg-config
+-AM_CFLAGS = -g -Wall -O2
++AM_CFLAGS = -g
+ 
+ INCLUDES = -DPKG_CONFIG_PC_PATH="\"$(pc_path)\"" $(included_glib_includes)
+