diff --git a/.cvsignore b/.cvsignore
index 089505e..399575c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cheese-2.29.92.tar.bz2
+cheese-2.30.0.tar.bz2
diff --git a/cheese.spec b/cheese.spec
index ac8acbf..7fc6af7 100644
--- a/cheese.spec
+++ b/cheese.spec
@@ -1,19 +1,15 @@
 Name:           cheese
-Version:        2.29.92
-Release:        4%{?dist}
+Version:        2.30.0
+Release:        1%{?dist}
 Summary:        Application for taking pictures and movies from a webcam
 
 Group:          Amusements/Graphics
 License:        GPLv2+
 URL:            http://projects.gnome.org/cheese/
 #VCS: git:git://git.gnome.org/cheese
-Source0:        http://download.gnome.org/sources/cheese/2.29/%{name}-%{version}.tar.bz2
-# https://bugzilla.gnome.org/show_bug.cgi?id=613067
-Patch0:         no-webcam.patch
+Source0:        http://download.gnome.org/sources/cheese/2.30/%{name}-%{version}.tar.bz2
 # https://bugzilla.gnome.org/show_bug.cgi?id=613287
 Patch1:         cheese-effects-i18n.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=592100
-Patch2:         cheese-countdown-crasher.patch
 
 BuildRequires: gtk2-devel >= 2.19.1
 BuildRequires: dbus-devel
@@ -67,9 +63,7 @@ for writing applications that require a webcam display widget.
 
 %prep
 %setup -q
-%patch0 -p1 -b .no-webcam
 %patch1 -p1 -b .effects-i18n
-%patch2 -p1 -b .countdown-crasher
 
 %build
 %configure --disable-static
@@ -127,27 +121,23 @@ fi
 
 
 %post
-/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
-fi
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/cheese.schemas > /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
+  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 fi
 
-%post libs
-/sbin/ldconfig
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+
+%post libs -p /sbin/ldconfig
 
-%postun libs
-/sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -173,6 +163,9 @@ fi
 %{_libdir}/pkgconfig/cheese-gtk.pc
 
 %changelog
+* Mon Mar 29 2010 Matthias Clasen <mclasen@redhat.com> 2.30.0-1
+- Update to 2.30.0
+
 * Wed Mar 24 2010 Bastien Nocera <bnocera@redhat.com> 2.29.92-4
 - Fix possible crasher when countdown reaches zero
 
diff --git a/sources b/sources
index 7052170..52d61c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46f5d4cf026b9109b226350e214a1f75  cheese-2.29.92.tar.bz2
+bdcd6f220749ec7ec1a7d4b4726cac78  cheese-2.30.0.tar.bz2