diff --git a/.cvsignore b/.cvsignore
index ce32bc0..8afad1b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,18 +1 @@
-eog-2.7.1.tar.bz2
-eog-2.8.0.tar.bz2
-eog-2.8.1.tar.bz2
-eog-2.9.0.tar.bz2
-eog-2.10.0.tar.bz2
-eog-2.11.0.tar.bz2
-eog-2.11.90.tar.bz2
-eog-2.12.0.tar.bz2
-eog-2.12.1.tar.bz2
-eog-2.13.2.tar.bz2
-eog-2.13.3.tar.bz2
-eog-2.13.4.tar.bz2
-eog-2.13.5.tar.bz2
-eog-2.13.90.tar.bz2
-eog-2.13.91.tar.bz2
-eog-2.13.92.tar.bz2
-eog-2.14.0.tar.bz2
-eog-2.14.1.tar.bz2
+eog-2.15.1.tar.bz2
diff --git a/eog.spec b/eog.spec
index 52cba82..1e55827 100644
--- a/eog.spec
+++ b/eog.spec
@@ -1,6 +1,6 @@
 %define glib2_version 2.2.0
 %define pango_version 1.2.0
-%define gtk2_version 2.6.0
+%define gtk2_version 2.7.1
 %define libgnomeui_version 2.5.92
 %define desktop_file_utils_version 0.9
 %define gail_version 1.2.0
@@ -12,8 +12,8 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.14.1
-Release: 2
+Version: 2.15.1
+Release: 1
 URL: http://www.gnome.org
 Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2
 License: GPL 
@@ -34,14 +34,18 @@ BuildRequires: libjpeg-devel
 BuildRequires: scrollkeeper
 BuildRequires: gettext
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-Prereq:        desktop-file-utils >= %{desktop_file_utils_version}
 
-# Needed for gconftool
-Prereq: GConf2
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): scrollkeeper
+Requires(post): GConf2
+
+Requires(preun): GConf2
+
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(postun): scrollkeeper
 
 %description
-
-Eye of GNOME (EOG) is an image viewer component used by Nautilus.
+Eye of GNOME (EOG) is an image viewer. 
 
 %prep
 %setup -q
@@ -76,15 +80,21 @@ desktop-file-install --vendor gnome --delete-original       \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
+update-desktop-database -q
+scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="eog.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/eog.schemas > /dev/null
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/eog.schemas > /dev/null || :
+fi
 
 %postun
-update-desktop-database %{_datadir}/applications
+update-desktop-database -q
+scrollkeeper-update -q
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -98,6 +108,9 @@ update-desktop-database %{_datadir}/applications
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue May  9 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.1-1
+- Update to 2.15.1
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.1-2
 - Update to 2.14.1
 
diff --git a/sources b/sources
index 33cbe5b..d3f4d7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c77fbfa3a1e77cb7ed140567ebdfab12  eog-2.14.1.tar.bz2
+06ecee64d7554bd629359e0884b4a9d1  eog-2.15.1.tar.bz2