--- a/SUNWgnome-common-devel.spec	Tue Jul 15 14:25:40 2008 +0000
+++ b/SUNWgnome-common-devel.spec	Tue Jul 15 15:01:47 2008 +0000
@@ -10,22 +10,17 @@
 # Owner: laca
 #
 %include Solaris.inc
+%use pkgconfig = pkg-config.spec
 %use gcommon = gnome-common.spec
 %use gettext = gettext.spec
 %use intltool = intltool.spec
 %use gtkdoc = gtk-doc.spec
 
-%define pkgconfig_version 0.23
-%define pkgconfig_tarball_dir pkg-config-%{pkgconfig_version}
 
 Name:                    SUNWgnome-common-devel
 Summary:                 GNOME common development tools
 Version:                 %{default_pkg_version}
-Source:                  http://pkgconfig.freedesktop.org/releases/pkg-config-%{pkgconfig_version}.tar.gz
-Source1:                 %{name}-manpages-0.1.tar.gz
-# date:2004-06-06 owner:laca type:bug bugster:4809315
-# upstreamable
-Patch1:                  pkgconfig-01-suppress_gnome-config_error_msg.diff
+Source:                  %{name}-manpages-0.1.tar.gz
 SUNW_BaseDir:            %{_basedir}
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -43,30 +38,22 @@
 BuildRequires: SUNWlibpopt-devel
 
 %prep
-%setup -q -c -n SUNWgnome-common-devel-%{version}
-cd %{pkgconfig_tarball_dir}
-%patch1 -p1
-cd %{_builddir}
+rm -rf %name-%version
+mkdir %name-%version
+
+%pkgconfig.prep -d %name-%version
 %gcommon.prep -d %name-%version
 %gettext.prep -d %name-%version
 %intltool.prep -d %name-%version
 %gtkdoc.prep -d %name-%version
 cd %{_builddir}/%name-%version
-gzcat %SOURCE1 | tar xf -
+gzcat %SOURCE0 | tar xf -
 
 %build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
-    CPUS=1
-fi
-cd %{pkgconfig_tarball_dir}
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=%{_prefix} --mandir=%{_mandir}
-make -j$CPUS
-rm -rf $RPM_BUILD_ROOT
-# pkg-config is needed by gnome-common
-make install DESTDIR=$RPM_BUILD_ROOT
-PATH=$RPM_BUILD_ROOT/%{_bindir}:$PATH
+%pkgconfig.build -d %name-%version
+
+# gnome-common required pkg-config.
+export PATH=%{_builddir}/%name-%version/%{pkgconfig.name}-%{pkgconfig.version}:$PATH
 export PERL=/usr/perl5/bin/perl
 export LDFLAGS="%_ldflags"
 
@@ -82,13 +69,13 @@
 export INTLTOOL_XGETTEXT="%{_libdir}/intltool/gettext-tools/xgettext"
 export INTLTOOL_MSGMERGE="%{_libdir}/intltool/gettext-tools/msgmerge"
 %intltool.build -d %name-%version
-export ACLOCAL_FLAGS="-I %{_builddir}/%name-%version/%{pkgconfig_tarball_dir}"
+export ACLOCAL_FLAGS="-I %{_builddir}/%name-%version/pkg-config-%{pkgconfig.version}"
 %gtkdoc.build -d %name-%version
 
 %install
-# Don't "rm -rf $RPM_BUILD_ROOT" here as pkg-config module already installed.
+rm -rf $RPM_BUILD_ROOT
 
-cd %{_builddir}
+%pkgconfig.install -d %name-%version
 %gcommon.install -d %name-%version
 %gettext.install -d %name-%version
 %intltool.install -d %name-%version
@@ -131,6 +118,8 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Jul 15 2008 - [email protected]
+- Remove pkg-config code, replacing it with %use.
 * Wed Jun 18 2008 - [email protected]
 - Add Build/Requires SUNWPython/-devel because /usr/bin/gtkdoc-depscan is a
   python script.