--- a/ChangeLog	Fri Jul 31 06:04:07 2009 +0000
+++ b/ChangeLog	Fri Jul 31 12:42:19 2009 +0000
@@ -1,3 +1,9 @@
+2009-07-31  Christian Kelly  <[email protected]>
+
+	* SUNWgnome-utils.spec, base-specs/gnome-utils.spec, 
+	  patches/gnome-utils-02-logviewer224-manpages.diff: Add patch to fix
+	  build issue.
+
 2009-07-30  Jerry Tan <[email protected]>
 
 	* SUNWraptor.spec

--- a/SUNWgnome-utils.spec	Fri Jul 31 06:04:07 2009 +0000
+++ b/SUNWgnome-utils.spec	Fri Jul 31 12:42:19 2009 +0000
@@ -257,7 +257,7 @@
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/*
 %{_mandir}/*/*system-log*
-%{_mandir}/*/*.conf.4
+#%{_mandir}/*/*.conf.4
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/gnome-system-log/*
 %doc %{_datadir}/doc/SUNWgnome-log-viewer

--- a/base-specs/gnome-utils.spec	Fri Jul 31 06:04:07 2009 +0000
+++ b/base-specs/gnome-utils.spec	Fri Jul 31 12:42:19 2009 +0000
@@ -34,9 +34,11 @@
 Patch4:       gnome-utils-04-logview224-plugin.diff
 # date:2006-11-15 owner:calumb bugster:6489289 bugzilla:375684 type:bug
 Patch6:       gnome-utils-06-baobab-man.diff
-%if %option_with_indiana_branding
 
+Patch8:       gnome-utils-08-shave-init.diff
+%if %option_with_indiana_branding
 %endif
+
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -84,6 +86,8 @@
 %patch8 -p1
 %endif
 
+%patch8 -p1
+
 cd ..
 bzcat %SOURCE3 | tar xf -
 cd %{name}-%{logview_version}
@@ -175,8 +179,8 @@
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
 install -d $RPM_BUILD_ROOT%{_mandir}/man4
 install --mode=0644 gnome-system-log.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 pipelog.conf.4 $RPM_BUILD_ROOT%{_mandir}/man4
-install --mode=0644 grablogs.conf.4 $RPM_BUILD_ROOT%{_mandir}/man4
+#install --mode=0644 pipelog.conf.4 $RPM_BUILD_ROOT%{_mandir}/man4
+#install --mode=0644 grablogs.conf.4 $RPM_BUILD_ROOT%{_mandir}/man4
 
 #Copy zh_HK from zh_TW
 #Fixes bug 4930405
@@ -220,6 +224,8 @@
 %{_libdir}/pkgconfig
 
 %changelog
+* Fri Jul 31 2009 - [email protected]
+- Add patch to fix build issue.
 * Thu Jul 30 2009 - [email protected]
 - Delete obsolete patch.
 * Wed Jul 29 2009 - [email protected]

--- a/patches/gnome-utils-02-logviewer224-manpages.diff	Fri Jul 31 06:04:07 2009 +0000
+++ b/patches/gnome-utils-02-logviewer224-manpages.diff	Fri Jul 31 12:42:19 2009 +0000
@@ -1,127 +1,3 @@
-Index: logview/gnome-system-log.1
-===================================================================
---- logview/gnome-system-log.1	(revision 7984)
-+++ logview/gnome-system-log.1	(working copy)
-@@ -1,6 +1,7 @@
-+'\" te
- .\" gnome-system-log.1 - GNOME logfile viewer
- .\" Copyright 2001  Jochen Voss
--.TH gnome-system-log 1 "Aug 09 2002" "gnome-utils 2.0.0"
-+.TH gnome-system-log 1 "Aug 09 2002" "gnome-utils 2.16.0"
- .SH NAME
- gnome-system-log \- the GNOME System Log Viewer
- .SH SYNOPSIS
-@@ -19,10 +20,81 @@
- .B GNOME System Log Viewer
- was written by Cesar Miquel <[email protected]>.
- .PP
-+.B GNOME System Log Viewer Plugin Interface
-+was written by Lin Ma <[email protected]>.
-+.PP
- This manual page was written by Jochen Voss
- <[email protected]>.
-+.TP
-+.B Plugin Service Provider Interface (SPI)
-+We have provided an SPI for adding plugins into Gnome Log Viewer. The SPI 
-+mainly includes three parts:
-+.RS
-+.TP
-+.B I/O (LogviewIFaceIO)
-+This defines the main input interface. This is used by Log Viewer to
-+read a logs content into memory, whether the logs source is text or
-+binary, the data returned here should be text - most likely in the
-+current locale. It also provides methods to allow the main application
-+to get other information about the log such as whether the log has
-+changed.
-+
-+It's the reposibility of the plugin to maintain information about the
-+log file(s) such as the current location in the file, the size of the
-+file, etc.
-+.TP
-+.B Views (LogviewIFaceView)
-+This interface defines a mechanism to enable the formatting of log
-+data, dividing it into lines. The current implementation defines how to
-+group lines by date and the conversion of the log from the current
-+locale to UTF-8.
-+.TP
-+.B Collectors (LogviewIFaceCollector)
-+This interface is used to gather the list of logs. New types of logs
-+may be added using this interface.
-+.RE
-+
-+For the detail information, please see /usr/share/gtk-doc/html/logview/index.html.
-+.TP
-+.B Plugin Priority
-+A priority list is maintained for each category of plugin - this defines
-+the order in which plugins will be used - higher priority plugins override
-+lower priority plugins. Priorities are categorised as:
-+
-+.br
-+Priority 0-9: Used by the delivered default plugins
-+.br
-+Priority 10+: End Users plugins. 
-+.TP
-+.B Plugin Search Path
-+Log Viewer will search in the following directories for plugins:
-+
-+.br
-+$HOME/.gnome2/gnome-system-log/plugins/`uname -p`
-+.br
-+/lib/gnome-system-log/plugins
-+.TP
-+.B Plugin Security
-+Both libgrablogs and libpipelog only recognize the configure file which has the
-+same owner ship to the user, otherwise they will back to the system default
-+ones. In Solaris, they will use a fork/exec/pfsh to run the commands within the
-+configure files; in Linux, they will use popen(3).
-+.TP
-+.B Default Plugins
-+Three plugins are available for the end-users. They are libgrablogs.so,
-+libplainlog.so and libpipelog.so.
- .SH FILES
- .TP
-+.I /usr/lib/gnome-system-log/plugins/libgrablogs.so
-+A default plugin - collecting some log files from system. See grablogs.conf (4).
-+.TP
-+.I /usr/lib/gnome-system-log/plugins/libplainlog.so
-+A default plugin - view ASCII log files.
-+.TP
-+.I /usr/lib/gnome-system-log/plugins/libpipelog.so
-+A default plugin - has a higher priority than libplainlog.so, view the output 
-+of a command. See pipelog.conf (4).
-+.TP
- .I /var/log/messages
- The system's main logfile.
- .TP
-@@ -30,8 +102,27 @@
- Configuration file for syslogd.  See
- .BR syslog.conf (5)
- for exact information.
-+.RE
-+
-+.SH ATTRIBUTES
-+.sp
-+.PP
-+See \fBattributes\fR(5) for descriptions of the following attributes:
-+
-+.TS
-+tab(^G) allbox;
-+cw(2.750000i)| cw(2.750000i)
-+lw(2.750000i)| lw(2.750000i).
-+ATTRIBUTE TYPE^ATTRIBUTE VALUE
-+Availability^SUNWgnome-log-viewer
-+Interface stability^GVolatile
-+.TE
-+
- .SH SEE ALSO
- .BR syslogd (8),
- .BR sysklogd (8),
- .BR syslog.conf (5),
--.BR syslogd-listfiles (8)
-+.BR syslogd-listfiles (8),
-+.BR grablogs.conf (4),
-+.BR pipelog.conf (4)
-+.\" LSARC 2006/325 Gnome System Log Viewer
 Index: logview/grablogs.conf.4
 ===================================================================
 --- logview/grablogs.conf.4	(revision 0)
@@ -260,3 +136,126 @@
 +.BR grablogs.conf (4)
 +.PP
 +.\" LSARC 2006/325 Gnome System Log Viewer
+diff -ruN gnome-utils-2.27.2.orig/logview/data/gnome-system-log.1 gnome-utils-2.27.2/logview/data/gnome-system-log.1
+--- gnome-utils-2.27.2.orig/logview/data/gnome-system-log.1	2009-07-31 13:03:43.589752351 +0100
++++ gnome-utils-2.27.2/logview/data/gnome-system-log.1	2009-07-31 13:07:40.320623516 +0100
+@@ -1,6 +1,7 @@
++'\" te
+ .\" gnome-system-log.1 - GNOME logfile viewer
+ .\" Copyright 2001  Jochen Voss
+-.TH gnome-system-log 1 "Aug 09 2002" "gnome-utils 2.0.0"
++.TH gnome-system-log 1 "Aug 09 2002" "gnome-utils 2.16.0"
+ .SH NAME
+ gnome-system-log \- the GNOME System Log Viewer
+ .SH SYNOPSIS
+@@ -19,10 +20,81 @@
+ .B GNOME System Log Viewer
+ was written by Cesar Miquel <[email protected]>.
+ .PP
++.B GNOME System Log Viewer Plugin Interface
++was written by Lin Ma <[email protected]>.
++.PP
+ This manual page was written by Jochen Voss
+ <[email protected]>.
++.TP
++.B Plugin Service Provider Interface (SPI)
++We have provided an SPI for adding plugins into Gnome Log Viewer. The SPI
++mainly includes three parts:
++.RS
++.TP
++.B I/O (LogviewIFaceIO)
++This defines the main input interface. This is used by Log Viewer to
++read a logs content into memory, whether the logs source is text or
++binary, the data returned here should be text - most likely in the
++current locale. It also provides methods to allow the main application
++to get other information about the log such as whether the log has
++changed.
++
++It's the reposibility of the plugin to maintain information about the
++log file(s) such as the current location in the file, the size of the
++file, etc.
++.TP
++.B Views (LogviewIFaceView)
++This interface defines a mechanism to enable the formatting of log
++data, dividing it into lines. The current implementation defines how to
++group lines by date and the conversion of the log from the current
++locale to UTF-8.
++.TP
++.B Collectors (LogviewIFaceCollector)
++This interface is used to gather the list of logs. New types of logs
++may be added using this interface.
++.RE
++
++For the detail information, please see /usr/share/gtk-doc/html/logview/index.html.
++.TP
++.B Plugin Priority
++ priority list is maintained for each category of plugin - this defines
++the order in which plugins will be used - higher priority plugins override
++lower priority plugins. Priorities are categorised as:
++
++.br
++Priority 0-9: Used by the delivered default plugins
++.br
++Priority 10+: End Users plugins.
++.TP
++.B Plugin Search Path
++Log Viewer will search in the following directories for plugins:
++
++.br
++$HOME/.gnome2/gnome-system-log/plugins/`uname -p`
++.br
++/lib/gnome-system-log/plugins
++.TP
++.B Plugin Security
++Both libgrablogs and libpipelog only recognize the configure file which has the
++same owner ship to the user, otherwise they will back to the system default
++ones. In Solaris, they will use a fork/exec/pfsh to run the commands within the
++configure files; in Linux, they will use popen(3).
++.TP
++.B Default Plugins
++Three plugins are available for the end-users. They are libgrablogs.so,
++libplainlog.so and libpipelog.so.
+ .SH FILES
+ .TP
++.I /usr/lib/gnome-system-log/plugins/libgrablogs.so
++A default plugin - collecting some log files from system. See grablogs.conf (4).
++.TP
++.I /usr/lib/gnome-system-log/plugins/libplainlog.so
++A default plugin - view ASCII log files.
++.TP
++.I /usr/lib/gnome-system-log/plugins/libpipelog.so
++A default plugin - has a higher priority than libplainlog.so, view the output
++of a command. See pipelog.conf (4).
++.TP
+ .I /var/log/messages
+ The system's main logfile.
+ .TP
+@@ -30,8 +102,27 @@
+ Configuration file for syslogd.  See
+ .BR syslog.conf (5)
+ for exact information.
++.RE
++
++.SH ATTRIBUTES
++.sp
++.PP
++See \fBattributes\fR(5) for descriptions of the following attributes:
++
++.TS
++tab(^G) allbox;
++cw(2.750000i)| cw(2.750000i)
++lw(2.750000i)| lw(2.750000i).
++ATTRIBUTE TYPE^ATTRIBUTE VALUE
++Availability^SUNWgnome-log-viewer
++Interface stability^GVolatile
++.TE
++
+ .SH SEE ALSO
+ .BR syslogd (8),
+ .BR sysklogd (8),
+ .BR syslog.conf (5),
+-.BR syslogd-listfiles (8)
++.BR syslogd-listfiles (8),
++.BR grablogs.conf (4),
++.BR pipelog.conf (4)
++.\" LSARC 2006/325 Gnome System Log Viewer