--- a/yelp.spec	Tue Dec 16 11:53:17 2003 +0000
+++ b/yelp.spec	Tue Dec 16 12:02:12 2003 +0000
@@ -9,21 +9,22 @@
 Name:         yelp 
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.4.0
-Release:      2
+Version:      2.5.1
+Release:      1
 Distribution: Mercury
 Vendor:	      Sun Microsystems, Inc.
 Summary:      The GNOME 2.4 Help Browser 
 Source:       http://ftp.gnome.org/pub/GNOME/sources/yelp/2.4/yelp-%{version}.tar.bz2
-Source1:      yelp-l10n-po.tar.bz2
+Source1:      yelp-l10n-po-0.6.tar.bz2
+Source2:      gnome-help.1.gz
+Source3:      yelp.1.gz
 Patch1:       yelp-01-window-icon.diff
-Patch2:       yelp-02-help-sections.diff
-Patch3:       yelp-03-categorycode.diff
+Patch2:       yelp-02-pregenerate.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Autoreqprov:  on
 
-
+%define libxml2_version 2.6.0
 %define pango_version 1.2.5
 %define gtk2_version 2.2.4
 %define libgtkhtml_version 2.2.1
@@ -42,6 +43,7 @@
 Requires: libbonobo >= %{libbonobo_version}
 Requires: libxslt >= %{libxslt_version}
 Requires: libglade >= %{libglade_version}
+Requires: libxml2 >= %{libxml2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: gnome-vfs-devel >= %{gnome_vfs_version}
@@ -51,6 +53,7 @@
 BuildRequires: libglade-devel >= %{libglade_version}
 BuildRequires: libxslt-devel >= %{libxslt_version}
 BuildRequires: gail-devel >= %{gail_version}
+BuildRequires: libxml2-devel >= %{libxml2_version}
 
 %description
 "Yelp" is the help browser for the GNOME 2.2 Desktop. It features man, info and docbook document sources.
@@ -60,7 +63,6 @@
 tar -jxf %SOURCE1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 libtoolize --force
@@ -77,7 +79,14 @@
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-
+install -d $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/man/man1
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/man/man1
+#Copy zh_HK from zh_TW
+#Fixes bug 4930405
+install -d $RPM_BUILD_ROOT/usr/share/locale/zh_HK/LC_MESSAGES
+install --mode=0644 $RPM_BUILD_ROOT/usr/share/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT/usr/share/locale/zh_HK/LC_MESSAGES/
+                                                                                                                                                             
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,8 +100,12 @@
 %{_datadir}/applications/yelp.desktop
 %{_libdir}/*
 %{_libexecdir}/*
+%{_mandir}/man1/*
 
 %changelog
+* Tue Dec 16 2003 - [email protected]
+- Bump to 2.5.1
+
 * Fri Oct 31 2003 - [email protected]
 - Removed the Sun Supported menu entry since we're
   removing the Extras menu.