From b50144303080f3d3f73a5a5df3ab14dc3d452169 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mon, 29 Mar 2010 14:58:09 +0000
Subject: [PATCH]

---
 .cvsignore   |  2 +-
 devhelp.spec | 29 ++++++++++++++---------------
 sources      |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 19f3da8..32867ca 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-devhelp-2.29.90.tar.bz2
+devhelp-2.30.0.tar.bz2
diff --git a/devhelp.spec b/devhelp.spec
index a863160..4415bfb 100644
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -5,14 +5,14 @@
 ### Abstract ###
 
 Name: devhelp
-Version: 2.29.90
+Version: 2.30.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API documention browser
 URL: http://developer.imendio.com/projects/devhelp
-Source: http://download.gnome.org/sources/devhelp/2.28/devhelp-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root-%(%{__id_u} -n)
+#VCS: git:git://git.gnome.org/devhelp
+Source: http://download.gnome.org/sources/devhelp/2.30/devhelp-%{version}.tar.bz2
 
 ### Dependencies ###
 
@@ -53,9 +53,6 @@ into other applications such as IDEs.
 %prep
 %setup -q -n devhelp-%{version}
 
-# the configure script in the 2.28.0 tarball is bad
-autoreconf -f -i
-
 # force regeneration
 rm data/devhelp.schemas
 
@@ -67,7 +64,7 @@ make %{?_smp_mflags} CFLAGS="$CFLAGS -fno-strict-aliasing"
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} install 
+%makeinstall PREFIX=$RPM_BUILD_ROOT%{_prefix} install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-install --vendor gnome			\
@@ -102,21 +99,20 @@ fi
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/devhelp.schemas > /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %postun
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ]; then
+  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+
 %files -f devhelp.lang
 %defattr(-, root, root)
-%doc AUTHORS COPYING NEWS README 
+%doc AUTHORS COPYING NEWS README
 
 %{_bindir}/devhelp
 %{_libdir}/libdevhelp*.so.*
@@ -141,6 +137,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Mar 29 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-1
+- Update to 2.30.0
+
 * Mon Feb 08 2010 Matthew Barnes <mbarnes@redhat.com> - 2.29.90-1
 - Update to 2.29.90
 - Remove patch for RH bug #543177 (fixed upstream).
diff --git a/sources b/sources
index 27b16a1..b68fa0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96caa0af6d56fff4425badb633373fae  devhelp-2.29.90.tar.bz2
+a24087cd1b4fe6722ec05f6e88104ace  devhelp-2.30.0.tar.bz2