rpms/yelp/F-13 sources,1.64,1.65 yelp.spec,1.180,1.181

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/yelp/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17073

Modified Files:
	sources yelp.spec 
Log Message:
2.30.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-13/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	29 Mar 2010 18:49:15 -0000	1.64
+++ sources	27 Apr 2010 11:48:53 -0000	1.65
@@ -1 +1 @@
-9a5674664568844616bcf169dce7e1a6  yelp-2.30.0.tar.bz2
+afd638cdaea1fcb9821ece88b819a022  yelp-2.30.1.tar.bz2


Index: yelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yelp/F-13/yelp.spec,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -p -r1.180 -r1.181
--- yelp.spec	29 Mar 2010 18:49:15 -0000	1.180
+++ yelp.spec	27 Apr 2010 11:48:53 -0000	1.181
@@ -1,4 +1,4 @@
-%{?rhel:  %global WITH_MONO 0}
+%global WITH_MONO 0
 %{?!WITH_MONO:  %global WITH_MONO 1}
 %ifarch ppc64 s390 s390x
 %define WITH_MONO 0
@@ -18,7 +18,7 @@
 
 Summary: Help browser for the GNOME desktop
 Name: yelp
-Version: 2.30.0
+Version: 2.30.1
 Release: 1%{?dist}
 #VCS: git:git://git.gnome.org/yelp
 Source: http://download.gnome.org/sources/yelp/2.30/%{name}-%{version}.tar.bz2
@@ -50,9 +50,10 @@ Requires: gnome-doc-utils-stylesheets >=
 Requires: rarian >= %{rarian_version}
 Requires(pre): GConf2
 Requires(post): GConf2
-Requires(post): desktop-file-utils
 Requires(preun): GConf2
+Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
+
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: gecko-devel-unstable >= %{gecko_version}
@@ -72,7 +73,6 @@ BuildRequires: intltool
 BuildRequires: gnome-common
 BuildRequires: automake autoconf libtool
 
-
 %if %{WITH_MONO}
 BuildRequires: libbeagle-devel
 %endif
@@ -110,7 +110,6 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-nee
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --vendor gnome --delete-original	\
@@ -122,34 +121,26 @@ mkdir -p -m 755 $RPM_BUILD_ROOT/%{_datad
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas >& /dev/null || :
+%gconf_schema_upgrade yelp
 update-desktop-database &> /dev/null ||:
-
-# update icon themes
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %pre
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas >& /dev/null || :
-fi
+%gconf_schema_prepare yelp
 
 %preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas >& /dev/null || :
-fi
+%gconf_schema_remove yelp
 
 %postun
 update-desktop-database &> /dev/null ||:
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -162,6 +153,13 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Tue Apr 27 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.1-1
+- Update to 2.30.1
+
+* Fri Apr  9 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.0-2
+- Drop libbeagle dep
+- Use GConf macros
+
 * Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.0-1
 - Update to 2.30.0