--- a/ChangeLog	Sat Oct 07 18:40:00 2006 +0000
+++ b/ChangeLog	Sat Oct 07 20:05:19 2006 +0000
@@ -1,3 +1,11 @@
+2006-10-07  Brian Cameron  <[email protected]>
+
+	* dogtail.spec, patches/dogtail-01-solaris.diff:  Add patch
+	  so dogtail works on Solaris.
+	* pygobject.spec: Add aclocal and automake calls, needed for
+	  this to build.
+	* pyspi.spec: Update to 0.6.0
+
 2006-10-07  Brian Cameron  <[email protected]>
 
 	* dogtail.spec: Bump to 0.6.0.

--- a/dogtail.spec	Sat Oct 07 18:40:00 2006 +0000
+++ b/dogtail.spec	Sat Oct 07 20:05:19 2006 +0000
@@ -19,6 +19,7 @@
 Vendor:       Sun Microsystems, Inc.
 Summary:      GUI test tool and automation framework written in Python
 Source:       http://people.redhat.com/zcerza/dogtail/releases/%{name}-%{version}.tar.gz
+Patch1:       dogtail-01-solaris.diff
 URL:          http://people.redhat.com/zcerza/dogtail/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/doc
@@ -40,6 +41,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/dogtail-01-solaris.diff	Sat Oct 07 20:05:19 2006 +0000
@@ -0,0 +1,50 @@
+--- distro.py-orig	Sat Oct  7 14:34:22 2006
++++ distro.py	Sat Oct  7 14:50:03 2006
+@@ -4,6 +4,7 @@
+ __author__ = "Dave Malcolm <[email protected]>, Zack Cerza <[email protected]>"
+ 
+ import os
++import re
+ from version import Version
+ 
+ 
+@@ -205,6 +206,14 @@
+             raise PackageNotFoundError, packageName
+         return dbVersions[0].trailingRevision().asString().split("-")[0]
+ 
++# getVersion not implemented because on Solaris multiple modules are installed
++# in single packages, so it is hard to tell what version number of a specific
++# module.
++#
++class _SolarisPackageDb(PackageDb):
++    def __init__(self):
++        PackageDb.__init__(self)
++
+ class JhBuildPackageDb(PackageDb):
+     def __init__(self):
+         PackageDb.__init__(self)
+@@ -274,6 +283,13 @@
+     def __init__(self):
+         self.packageDb = _ConaryPackageDb()
+ 
++class Solaris(Distro):
++    """
++    Class representing a Solaris distribution
++    """
++    def __init__(self):
++        self.packageDb = _SolarisPackageDb()
++
+ class JHBuild(Distro):
+     """
+     Class representing a JHBuild environment
+@@ -309,6 +325,10 @@
+ elif os.path.exists ("/var/lib/conarydb/conarydb"):
+     print "Conary-based distribution"
+     distro = Conary()
++elif os.path.exists ("/etc/release"):
++    if re.match (".*Solaris", open ("/etc/release").readlines()[0]):
++        print "Solaris distribution"
++        distro = Solaris()
+ else:
+     print "Unknown"
+     raise DistributionNotSupportedError("Unknown")

--- a/pygobject.spec	Sat Oct 07 18:40:00 2006 +0000
+++ b/pygobject.spec	Sat Oct 07 20:05:19 2006 +0000
@@ -59,7 +59,9 @@
 %patch2 -p1
 
 %build
+aclocal -I ./m4 $ACLOCAL_FLAGS
 autoconf
+automake -a -c -f
 %ifos solaris
 # Disable optimizations on x86 to workaround compiler bug 6382078.
 %ifarch sparc
@@ -101,6 +103,9 @@
 %{_datadir}/pygobject/*
 
 %changelog -n pygobject
+* Sat Oct 07 2006 - [email protected]
+- Add aclocal and automake calls.
+
 * Wed Oct 04 2006 - [email protected]
 - Bump to 2.12.2.
 

--- a/pyspi.spec	Sat Oct 07 18:40:00 2006 +0000
+++ b/pyspi.spec	Sat Oct 07 20:05:19 2006 +0000
@@ -13,8 +13,8 @@
 Name:         pyspi
 License:      LGPL
 Group:        Development/Languages/Python
-Version:      0.5.5
-Release:      1
+Version:      0.6.0
+Release:      2
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      Python bindings for CSPI
@@ -56,6 +56,9 @@
 %{_libdir}/python?.?/vendor-packages
 
 %changelog
+* Sat Oct 07 2006 - [email protected]
+- Bump to 0.6.0.
+
 * Fri Aug 25 2006 - [email protected]
 - Bump to 0.5.5.