--- a/ChangeLog	Thu Jan 31 22:57:42 2008 +0000
+++ b/ChangeLog	Fri Feb 01 17:17:06 2008 +0000
@@ -1,3 +1,8 @@
+2008-02-01 Moinak Ghosh <[email protected]>
+	* SFEkdelibs3.spec:
+	* patches/kdelibs-06-ktimezones.diff:
+	  Add patch to fix timezone handing on Solaris.
+
 2008-01-31 Brian Cameron  <[email protected]>
 
 	* SUNWgnome-display-mgr.spec, patches-02-sdtlogin.diff:  Add 

--- a/SFEkdelibs3.spec	Thu Jan 31 22:57:42 2008 +0000
+++ b/SFEkdelibs3.spec	Fri Feb 01 17:17:06 2008 +0000
@@ -17,6 +17,7 @@
 Patch3:              kdelibs-03-makefile.diff
 Patch4:              kdelibs-04-kmenuapps.diff
 Patch5:              kdelibs-05-kdeinit-wrapper.diff
+Patch6:              kdelibs-06-ktimezones.diff
 
 SUNW_BaseDir:        %{_basedir}
 BuildRoot:           %{_tmppath}/%{name}-%{version}-build
@@ -99,6 +100,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 if [ "x`basename $CC`" != xgcc ]
 then
@@ -209,6 +211,8 @@
 %{_datadir}/doc/*
 
 %changelog
+* Fri Feb 01 2008 - [email protected]
+- Add patch to fix timezone handing on Solaris.
 * Thu Jan 24 2008 - [email protected]
 - Set QTDOCDIR to satisfy internal doxygen script.
 - Use predefined macros instead of hardcoding pathnames.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/kdelibs-06-ktimezones.diff	Fri Feb 01 17:17:06 2008 +0000
@@ -0,0 +1,19 @@
+--- kdelibs-3.5.8/kdecore/ktimezones.cpp.orig	2008-02-01 21:21:57.109792234 +0530
++++ kdelibs-3.5.8/kdecore/ktimezones.cpp	2008-02-01 22:14:15.976351156 +0530
+@@ -396,13 +396,13 @@
+                 m_zoneinfoDir = "/usr/share/lib/zoneinfo";
+                 KTempFile temp;
+                 KShellProcess reader;
+-                reader << "/bin/grep" << "-h" << "^Zone" << m_zoneinfoDir << "/src/*" << temp.name() << "|" <<
+-                    "/bin/awk" << "'{print \"??\\t+9999+99999\\t\" $2}'";
++                reader << "/bin/grep" << "-h" << "^Zone" <<  "/usr/share/lib/zoneinfo/src/*" << "|" <<
++                    "/bin/awk" << "'{print \"??\\t+9999+99999\\t\" $2}'" << ">" << temp.name();
+                 // Note the use of blocking here...it is a trivial amount of data!
+                 temp.close();
+                 reader.start(KProcess::Block);
+                 f.setName(temp.name());
+-                if (!temp.status() || !f.open(IO_ReadOnly))
++                if (temp.status() || !f.open(IO_ReadOnly))
+                 {
+                     kdDebug() << "Can't open " << f.name() << endl;
+                     return *m_zones;