--- a/ChangeLog	Thu Jun 17 17:12:28 2004 +0000
+++ b/ChangeLog	Thu Jun 17 17:27:31 2004 +0000
@@ -1,3 +1,8 @@
+2004-06-17  Matt Keenan  <[email protected]>
+
+	* gconf-editor.spec : Add gconf-editor-docs-0.2.tar to build
+	* patches/gconf-editor-01-docs.diff : New patch
+
 2004-06-17  Hidetoshi Tajima  <[email protected]>
 
 	* libexif-gtk.spec : Add glib-gettextize for Linux as well,

--- a/gconf-editor.spec	Thu Jun 17 17:12:28 2004 +0000
+++ b/gconf-editor.spec	Thu Jun 17 17:27:31 2004 +0000
@@ -2,13 +2,15 @@
 License:      GPL
 Group:        System/GUI/GNOME
 Version:      2.5.4
-Release:      14
+Release:      15
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 Summary:      Editor/admin tool for GConf
 Source:       http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.5/%{name}-%{version}.tar.bz2
 Source1:      gconf-editor-l10n-po-1.1.tar.bz2
 Source2:      gconf-editor.1.gz
+Source3:      gconf-editor-docs-0.2.tar.bz2
+Patch1:       gconf-editor-01-docs.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -17,6 +19,7 @@
 %define GConf_version 2.4.0.1
 
 BuildRequires: GConf-devel >= %{GConf_version}
+BuildRequires: javahelp-convert
 Requires: GConf >= %{GConf_version}
 
 %description
@@ -27,6 +30,8 @@
 %setup -q
 
 bzcat %SOURCE1 | tar xvf -
+bzcat %SOURCE3 | tar xvf -
+%patch1 -p1
 
 %build
 libtoolize --force
@@ -50,6 +55,8 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
 install --mode=0644 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES/
 
+javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -59,8 +66,12 @@
 %{_datadir}/pixmaps
 %{_datadir}/applications
 %{_mandir}/man1/*
+%{_datadir}/gnome
 
 %changelog
+* Thu Jun 17 2004 - [email protected]
+- Add docs tarball
+
 * Wed May 12 2004 - [email protected]
 - Updated l10n content to gconf-editor-l10n-po-1.1.tar.bz2
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gconf-editor-01-docs.diff	Thu Jun 17 17:27:31 2004 +0000
@@ -0,0 +1,10 @@
+--- ../gconf-editor-2.5.4.old/configure.in	2004-06-17 18:03:06.000000000 +0100
++++ ./configure.in	2004-06-17 18:03:31.000000000 +0100
+@@ -72,6 +72,7 @@
+ data/Makefile
+ data/icons/Makefile
+ docs/Makefile
++docs/C/Makefile
+ src/Makefile
+ po/Makefile.in
+ ])