Update to 2.9.3

.cvsignore

@@ -2,3 +2,4 @@ yelp-2.6.2.tar.bz2
 yelp-2.6.3.tar.bz2
 yelp-2.6.4.tar.bz2
 yelp-2.6.5.tar.bz2
+yelp-2.9.3.tar.bz2

sources

@@ -1 +1 @@
-9bd94af344ee6a0bf69aa6f9cbd6b7e9  yelp-2.6.5.tar.bz2
+a6ed659313698900a7170426881b874b  yelp-2.9.3.tar.bz2

yelp.spec

@@ -1,6 +1,6 @@
 %define pango_version 1.0.99
-%define gtk2_version 2.3.1
+%define gtk2_version 2.6.0
-%define gtkhtml2_version 2.3.0
+%define mozilla_version 1.7.3
 %define gnome_vfs2_version 2.0.0
 %define libgnomeui_version 2.0.2
 %define libbonobo_version 2.0.0
@@ -12,7 +12,7 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.6.5
+Version: 2.9.3
 Release: 1
 Source: %{name}-%{version}.tar.bz2
 License: GPL
@@ -21,23 +21,26 @@ BuildRoot: %{_tmppath}/%{name}-root
 Requires: scrollkeeper
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
-Requires: gtkhtml2 >= %{gtkhtml2_version}
+Requires: mozilla >= %{mozilla_version}
 Requires: libgnomeui >= %{libgnomeui_version}
 Requires: libbonobo >= %{libbonobo_version}
 Requires: libxml2 >= %{libxml_version}
 Requires: libxslt >= %{libxslt_version}
 Requires: libglade2 >= %{libglade_version}
+Requires: libgcrypt
+Requires: gnome-doc-utils 
 Requires: GConf2
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
-BuildRequires: gtkhtml2-devel >= %{gtkhtml2_version}
+BuildRequires: mozilla-devel >= %{mozilla_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libglade2-devel >= %{libglade_version}
 BuildRequires: libxml2-devel >= %{libxml_version}
 BuildRequires: libxslt-devel >= %{libxslt_version}
 BuildRequires: gail-devel >= %{gail_version}
+BuildRequires: libgcrypt-devel
 BuildRequires: fontconfig
 BuildRequires: GConf2-devel
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
@@ -51,7 +54,7 @@ one central tool.
 %setup -q
 
 %build
-%configure
+%configure --with-mozilla=mozilla --enable-man --enable-info
 make
 
 %install
@@ -69,8 +72,18 @@ desktop-file-install --vendor gnome --delete-original       \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%preun
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
+
+
 %files -f %{name}.lang
 %defattr(-,root,root)
+%{_sysconfdir}/gconf/schemas/yelp.schemas
 %{_bindir}/*
 %{_libdir}/bonobo
 %{_datadir}/applications/*
@@ -78,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/yelp
 
 %changelog
+* Fri Jan 28 2005 Matthias Clasen <mclasen@redhat.com> 2.9.3-1
+- Update to 2.9.3
+
 * Mon Dec 20 2004 Christopher Aillon <caillon@redhat.com> 2.6.5-1
 - Update to 2.6.5