--- a/ChangeLog	Fri Jun 29 13:46:27 2007 +0000
+++ b/ChangeLog	Sat Jun 30 09:45:41 2007 +0000
@@ -1,6 +1,13 @@
+2007-06-30  Halton Huo  <[email protected]>
+
+	* base-specs/gettext.spec: Use http url since ftp need authorization.
+	* manpages/Makefile: add man page for glade-3 to fix bugster 6558563.
+	* manpages/man1/glade-2.1: (removed).
+	* manpages/man1/glade-3.1: (added) man page for glade-3.
+
 2007-06-29  Dave Lin  <[email protected]>
 
-        * closed/SUNWflash-player-plugin.spec: Bump to 9.0 r47
+	* closed/SUNWflash-player-plugin.spec: Bump to 9.0 r47
 
 2007-06-29  Irene Huang  <[email protected]>
 

--- a/base-specs/gettext.spec	Fri Jun 29 13:46:27 2007 +0000
+++ b/base-specs/gettext.spec	Sat Jun 30 09:45:41 2007 +0000
@@ -15,7 +15,7 @@
 Distribution:		Sun Java Desktop System
 Vendor:			Sun Microsystems, Inc.
 Summary:		GNU gettext tools
-Source:			ftp://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
+Source:			http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
 URL:			http://www.gnu.org/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 

--- a/manpages/Makefile	Fri Jun 29 13:46:27 2007 +0000
+++ b/manpages/Makefile	Sat Jun 30 09:45:41 2007 +0000
@@ -584,7 +584,7 @@
 SUNWgnome-text-editor.PAGES: $(SUNWgnome-text-editor_PAGES)
 
 SUNWgnome-ui-designer_PAGES =	\
-	man1/glade-2.1
+	man1/glade-3.1
 SUNWgnome-ui-designer.PAGES: $(SUNWgnome-ui-designer_PAGES)
 
 SUNWgnome-utils_PAGES =				\

--- a/manpages/man1/glade-2.1	Fri Jun 29 13:46:27 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-<!DOCTYPE REFENTRY PUBLIC "-//Sun Microsystems//DTD DocBook V3.0-Based SolBook Subset V2.0//EN" [
-<!--ArborText, Inc., 1988-1999, v.4002-->
-<!ENTITY cmd "glade-2">
-<!ENTITY % commonents SYSTEM "smancommon.ent">
-%commonents;
-<!ENTITY % booktitles SYSTEM "booktitles.ent">
-%booktitles;
-<!ENTITY suncopy "Copyright (c) 2003,2006 Sun Microsystems, Inc. All Rights Reserved.">
-]>
-<?Pub UDT _bookmark _target>
-<?Pub Inc>
-<refentry id="glade-2-1">
-<!-- %Z%%M% %I% %E% SMI; -->
-<refmeta><refentrytitle>glade-2</refentrytitle><manvolnum>1</manvolnum>
-<refmiscinfo class="date">2 Oct 2003</refmiscinfo>
-<refmiscinfo class="sectdesc">&man1;</refmiscinfo>
-<refmiscinfo class="software">&release;</refmiscinfo>
-<refmiscinfo class="arch">generic</refmiscinfo>
-<refmiscinfo class="copyright">&suncopy;</refmiscinfo>
-</refmeta>
-<indexterm><primary>glade-2</primary></indexterm><indexterm><primary>create
-graphical user interfaces for Gtk+ and GNOME</primary></indexterm><refnamediv
-id="glade-2-1-name"><refname>glade-2</refname><refpurpose>create graphical user
-interfaces for Gtk+ and GNOME</refpurpose></refnamediv>
-<refsynopsisdiv id="glade-2-1-synp"><title>&synp-tt;</title>
-<cmdsynopsis><command>&cmd;</command><arg><option role="nodash"><replaceable>
-gnome-std-options</replaceable></option></arg><arg choice="opt"><option>-write-source <replaceable>
-filename</replaceable></option></arg><arg choice="opt"><option>-hide-palette
-</option></arg><arg choice="opt"><option>-hide-property-editor</option><arg
-choice="opt"><option>-show-widget-tree</option></arg><arg choice="opt"><option>
--show-clipboard</option></arg></arg><arg choice="opt"><option role="nodash"><replaceable>
-filename</replaceable></option></arg>
-</cmdsynopsis></refsynopsisdiv>
-<refsect1 id="glade-2-1-desc"><title>&desc-tt;</title>
-<para>Glade is an application for creating graphical user interfaces that
-use the Gtk+ and GNOME libraries. Glade allows you to rapidly develop these
-interfaces, and can create source code in a variety of languages that will
-construct the interfaces for you. Glade can also be used in conjunction with <citerefentry>
-<refentrytitle>libglade</refentrytitle><manvolnum>3C</manvolnum></citerefentry>
-to dynamically create user interfaces from the XML description file that Glade
-creates. This is by far the preferred method of using Glade<?Pub Caret>, as
-it is not neccessary to recompile your code for simple user interface modifications.
-</para>
-</refsect1>
-<refsect1 id="glade-2-1-opts"><title>&opts-tt;</title>
-<para>The following options are supported:</para>
-<variablelist termlength="wide"><varlistentry><term><option>w</option>, <option>-write-source <replaceable>
-filename</replaceable></option></term><listitem><para>Load a given XML description
-file, generate source code for it, and then exit.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-hide-palette</option></term><listitem><para>
-Hide the Palette dialog on start up.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-hide-property-tree</option></term><listitem>
-<para>Hide the Property Editor dialog on start up.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-show-widget-tree</option></term><listitem><para>
-Show the Widget Tree dialog on start up.</para>
-</listitem></varlistentry>
-<varlistentry><term><option>-show-clipboard</option></term><listitem><para>
-Show the Clipboard dialog on start up.</para>
-</listitem></varlistentry>
-<varlistentry><term><option role="nodash"><replaceable>gnome-std-options</replaceable></option></term>
-<listitem><para>Standard options available for use with most GNOME applications.
-See <citerefentry><refentrytitle>gnome-std-options</refentrytitle><manvolnum>
-5</manvolnum></citerefentry> for more information.</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="glade-2-1-oper"><title>&oper-tt;</title>
-<para>The following operands are supported:</para>
-<variablelist termlength="medium"><varlistentry><term><option role="nodash"><replaceable>
-filename</replaceable></option></term><listitem><para>The name of the file
-to be edited or viewed. If <replaceable>filename</replaceable> is not specified,
-a blank window is opened.</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="glade-2-1-exam"><title>&exam-tt;</title>
-<example role="example"><title>Launching Glade with Widget Tree and sample
-XML description file</title>
-<para><screen>example% <userinput>&cmd; --show-widget-tree example.glade</userinput></screen></para>
-</example>
-</refsect1>
-<refsect1 id="glade-2-1-exit"><title>&exit-tt;</title>
-<para>The following exit values are returned:</para>
-<variablelist termlength="xtranarrow"><varlistentry><term><returnvalue>0</returnvalue></term>
-<listitem><para>Application exited successfully</para>
-</listitem></varlistentry>
-<varlistentry><term><returnvalue>>0</returnvalue></term><listitem><para>Application
-exited with failure</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="glade-2-1-file"><title>&file-tt;</title>
-<para>The following files are used by this application:</para>
-<variablelist termlength="medium"><varlistentry><term><filename>/usr/bin/&cmd;</filename> 
-</term><listitem><para>Executable for Glade.</para>
-</listitem></varlistentry>
-</variablelist></refsect1>
-<refsect1 id="glade-2-1-attr"><title>&attr-tt;</title>
-<para>See <olink targetdocent="REFMAN5" localinfo="attributes-5"><citerefentry>
-<refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry></olink>
-for descriptions of the following attributes:</para>
-<informaltable frame="all">
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="COLSPEC0" colwidth="1*">
-<colspec colname="COLSPEC1" colwidth="1*">
-<thead>
-<row><entry align="center" valign="middle">ATTRIBUTE TYPE</entry><entry align="center"
-valign="middle">ATTRIBUTE VALUE</entry></row>
-</thead>
-<tbody>
-<row><entry><para>Availability</para></entry><entry><para>SUNWgnome-ui-designer
-</para></entry></row>
-<row><entry colname="COLSPEC0"><para>Interface stability</para></entry><entry
-colname="COLSPEC1"><para>Volatile</para></entry></row>
-</tbody>
-</tgroup>
-</informaltable>
-</refsect1>
-<refsect1 id="glade-2-1-also"><title>&also-tt;</title>
-<!--Reference to another man page-->
-<!--Reference to a Help manual-->
-<!--Reference to a book.-->
-<para><citetitle>Glade User Manual</citetitle></para>
-<para>Latest version of the <citetitle>GNOME Desktop User Guide</citetitle> for your platform.</para>
-<para><citerefentry><refentrytitle>gnome-std-options</refentrytitle><manvolnum>
-5</manvolnum></citerefentry>, <citerefentry><refentrytitle>libglade-2.0</refentrytitle>
-<manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>libgtk-x11-2.0
-</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>
-libgnomeui-2</refentrytitle><manvolnum>3</manvolnum></citerefentry></para>
-</refsect1>
-<refsect1 id="glade-2-1-note"><title>&note-tt;</title>
-<para>Written by Glynn Foster, Sun Microsystems  Inc., 2003, 2006.</para>
-</refsect1>
-</refentry>
-<?Pub *0000007102>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/manpages/man1/glade-3.1	Sat Jun 30 09:45:41 2007 +0000
@@ -0,0 +1,120 @@
+<!DOCTYPE REFENTRY PUBLIC "-//Sun Microsystems//DTD DocBook V3.0-Based SolBook Subset V2.0//EN" [
+<!--ArborText, Inc., 1988-1999, v.4002-->
+<!ENTITY cmd "glade-3">
+<!ENTITY % commonents SYSTEM "smancommon.ent">
+%commonents;
+<!ENTITY % booktitles SYSTEM "booktitles.ent">
+%booktitles;
+<!ENTITY suncopy "Copyright (c) 2003,2006,2007 Sun Microsystems, Inc. All Rights Reserved.">
+]>
+<?Pub UDT _bookmark _target>
+<?Pub Inc>
+<refentry id="glade-3-1">
+<!-- %Z%%M% %I% %E% SMI; -->
+<refmeta><refentrytitle>glade-3</refentrytitle><manvolnum>1</manvolnum>
+<refmiscinfo class="date">30 Jun 2007</refmiscinfo>
+<refmiscinfo class="sectdesc">&man1;</refmiscinfo>
+<refmiscinfo class="software">&release;</refmiscinfo>
+<refmiscinfo class="arch">generic</refmiscinfo>
+<refmiscinfo class="copyright">&suncopy;</refmiscinfo>
+</refmeta>
+<indexterm><primary>glade-3</primary></indexterm><indexterm><primary>glade-3</primary></indexterm>
+<refnamediv id="glade-3-1-name"><refname>glade-3</refname><refpurpose>The interface designer enables you to create and edit user interface designs for <application>GTK+</application> applications.</refpurpose></refnamediv>
+<refsynopsisdiv id="glade-3-1-synp"><title>&synp-tt;</title>
+<cmdsynopsis><command>&cmd;</command>
+<arg choice="opt"><option>OPTION...</option></arg>
+<arg choice="opt"><option role="nodash"><replaceable>filename</replaceable></option></arg>
+</cmdsynopsis></refsynopsisdiv>
+<refsect1 id="glade-3-1-desc"><title>&desc-tt;</title>
+<para>The <command>&cmd;</command> interface designer enables you to create and edit user interface designs for <application>GTK+</application> applications.</para>
+<para>The GTK+ library provides an extensive collection of user interface building blocks such as text boxes, dialog labels, numeric entries, check boxes, and menus. These building blocks are called <emphasis>widgets</emphasis>. You can use &app; to place widgets in a GUI. &app; allows you to modify the layout and properties of these widgets. You can also use &app; to add connections between widgets and application source code.</para>
+<para>
+<para>The user interfaces designed in <command>&cmd;</command>; are stored in an XML format, enabling easy integration with external tools. You can use the <citerefentry><refentrytitle>libglade</refentrytitle><manvolnum>3C</manvolnum></citerefentry> library to dynamically create GUIs from the XML description.</para>
+</refsect1>
+<refsect1 id="glade-3-1-opts"><title>&opts-tt;</title>
+<para>The following options are supported:</para>
+<varlistentry>
+<term><option>-?</option>, <option>--help</option></term>
+<listitem><para>Display help text.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--version</option></term>
+<listitem><para>Output version information and exit.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--without-devhelp</option></term>
+<listitem><para>Disable Devhelp integration.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--version</option></term>
+<listitem><para>Output version information and exit.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term><option>--display=<replaceable>DISPLAY</replaceable></option></term>
+<listitem><para>X display to use.</para></listitem>
+</varlistentry>
+</refsect1>
+<refsect1 id="glade-3-1-oper"><title>&oper-tt;</title>
+<para>The following operands are supported:</para>
+<variablelist termlength="medium"><varlistentry><term><option role="nodash"><replaceable>
+filename</replaceable></option></term><listitem><para>The name of the file
+to be edited or viewed. If <replaceable>filename</replaceable> is not specified,
+a blank window is opened.</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="glade-3-1-exam"><title>&exam-tt;</title>
+<example role="example"><title>Launching Glade with sample XML description file</title>
+<para><screen>example% <userinput>&cmd; example.glade</userinput></screen></para>
+</example>
+</refsect1>
+<refsect1 id="glade-3-1-exit"><title>&exit-tt;</title>
+<para>The following exit values are returned:</para>
+<variablelist termlength="xtranarrow"><varlistentry><term><returnvalue>0</returnvalue></term>
+<listitem><para>Application exited successfully</para>
+</listitem></varlistentry>
+<varlistentry><term><returnvalue>>0</returnvalue></term><listitem><para>Application
+exited with failure</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="glade-3-1-file"><title>&file-tt;</title>
+<para>The following files are used by this application:</para>
+<variablelist termlength="medium"><varlistentry><term><filename>/usr/bin/&cmd;</filename> 
+</term><listitem><para>Executable for Glade.</para>
+</listitem></varlistentry>
+</variablelist></refsect1>
+<refsect1 id="glade-3-1-attr"><title>&attr-tt;</title>
+<para>See <olink targetdocent="REFMAN5" localinfo="attributes-5"><citerefentry>
+<refentrytitle>attributes</refentrytitle><manvolnum>5</manvolnum></citerefentry></olink>
+for descriptions of the following attributes:</para>
+<informaltable frame="all">
+<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="COLSPEC0" colwidth="1*">
+<colspec colname="COLSPEC1" colwidth="1*">
+<thead>
+<row><entry align="center" valign="middle">ATTRIBUTE TYPE</entry><entry align="center"
+valign="middle">ATTRIBUTE VALUE</entry></row>
+</thead>
+<tbody>
+<row><entry><para>Availability</para></entry><entry><para>SUNWgnome-ui-designer
+</para></entry></row>
+<row><entry colname="COLSPEC0"><para>Interface stability</para></entry><entry
+colname="COLSPEC1"><para>Volatile</para></entry></row>
+</tbody>
+</tgroup>
+</informaltable>
+</refsect1>
+<refsect1 id="glade-3-1-also"><title>&also-tt;</title>
+<!--Reference to another man page-->
+<!--Reference to a Help manual-->
+<!--Reference to a book.-->
+<para><citetitle>Glade User Manual</citetitle></para>
+<para>Latest version of the <citetitle>GNOME Desktop User Guide</citetitle> for your platform.</para>
+<para>
+<citerefentry><refentrytitle>gnome-std-options</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>libglade-2.0</refentrytitle>
+<manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>libgtk-x11-2.0</refentrytitle><manvolnum>3</manvolnum></citerefentry></para>
+</refsect1>
+<refsect1 id="glade-3-1-note"><title>&note-tt;</title>
+<para>Written by Glynn Foster, Sun Microsystems  Inc., 2003, 2006.</para>
+<para>Written by Halton Huo, Sun Microsystems  Inc., 2007.</para>
+</refsect1>
+</refentry>
+<?Pub *0000007102>