rpms/yelp/devel .cvsignore, 1.25, 1.26 sources, 1.26, 1.27 yelp.spec, 1.56, 1.57

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22333

Modified Files:
	.cvsignore sources yelp.spec 
Log Message:
2.15.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	13 Mar 2006 05:32:40 -0000	1.25
+++ .cvsignore	10 May 2006 03:21:44 -0000	1.26
@@ -1,16 +1 @@
-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
-yelp-2.10.0.tar.bz2
-yelp-2.11.1.tar.bz2
-yelp-2.12.0.tar.bz2
-yelp-2.12.1.tar.bz2
-yelp-2.13.1.tar.bz2
-yelp-2.13.2.tar.bz2
-yelp-2.13.3.tar.bz2
-yelp-2.13.4.tar.bz2
-yelp-2.13.5.tar.bz2
-yelp-2.13.6.tar.bz2
-yelp-2.14.0.tar.bz2
+yelp-2.15.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	10 Apr 2006 13:44:04 -0000	1.26
+++ sources	10 May 2006 03:21:44 -0000	1.27
@@ -1 +1 @@
-3d569f8e9372bc88c7f9fca6a94388a9  yelp-2.14.1.tar.bz2
+3f1dfa1c9f9031e614183c18d76a6f8d  yelp-2.15.1.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- yelp.spec	10 Apr 2006 13:44:05 -0000	1.56
+++ yelp.spec	10 May 2006 03:21:44 -0000	1.57
@@ -12,8 +12,8 @@
 
 Summary: A system documentation reader from the Gnome project. 
 Name: yelp
-Version: 2.14.1
-Release: 2
+Version: 2.15.1
+Release: 1
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.12.1-fedora-docs.patch
@@ -21,7 +21,6 @@
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-root
-Requires: scrollkeeper
 Requires: gtk2 >= %{gtk2_version}
 Requires: gnome-vfs2 >= %{gnome_vfs2_version}
 Requires: mozilla >= %{mozilla_version}
@@ -32,8 +31,10 @@
 Requires: libglade2 >= %{libglade_version}
 Requires: libgcrypt
 Requires: gnome-doc-utils 
-Requires: GConf2
+Requires: scrollkeeper
+Requires(post): GConf2
 Requires(post): desktop-file-utils
+Requires(preun): GConf2
 Requires(postun): desktop-file-utils
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -90,11 +91,6 @@
 %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
-update-desktop-database &> /dev/null ||:
-
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
@@ -106,6 +102,12 @@
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+%preun
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
+
+%postun
+update-desktop-database &> /dev/null ||:
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -117,6 +119,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Tue May  9 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.1-1
+- Update to 2.15.1
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1