rpms/devhelp/F-13 devhelp.spec,1.122,1.123 sources,1.28,1.29

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	devhelp.spec sources 
Log Message:
2.30



Index: devhelp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/F-13/devhelp.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- devhelp.spec	9 Feb 2010 02:32:18 -0000	1.122
+++ devhelp.spec	29 Mar 2010 15:15:52 -0000	1.123
@@ -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 -fn
 [ -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 at redhat.com> - 2.30.0-1
+- Update to 2.30.0
+
 * Mon Feb 08 2010 Matthew Barnes <mbarnes at redhat.com> - 2.29.90-1
 - Update to 2.29.90
 - Remove patch for RH bug #543177 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/devhelp/F-13/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	9 Feb 2010 00:19:04 -0000	1.28
+++ sources	29 Mar 2010 15:15:52 -0000	1.29
@@ -1 +1 @@
-96caa0af6d56fff4425badb633373fae  devhelp-2.29.90.tar.bz2
+a24087cd1b4fe6722ec05f6e88104ace  devhelp-2.30.0.tar.bz2