diff --git a/.cvsignore b/.cvsignore index 8110626..8503c29 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -eog-2.30.0.tar.bz2 +eog-2.30.1.tar.bz2 diff --git a/eog.spec b/eog.spec index 7989456..ed54720 100644 --- a/eog.spec +++ b/eog.spec @@ -11,7 +11,7 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.30.0 +Version: 2.30.1 Release: 1%{?dist} URL: http://projects.gnome.org/eog/ #VCS: git:git://git.gnome.org/eog @@ -80,8 +80,6 @@ echo "NoDisplay=true" >> data/eog.desktop.in.in make %install -rm -rf $RPM_BUILD_ROOT - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL @@ -115,26 +113,16 @@ for f in $helpdir/C/figures/*.png; do done -%clean -rm -rf $RPM_BUILD_ROOT - %post update-desktop-database -q -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/eog.schemas > /dev/null || : +%gconf_schema_upgrade eog touch %{_datadir}/icons/hicolor >&/dev/null || : %pre -if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/eog.schemas > /dev/null || : -fi +%gconf_schema_prepare eog %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 +%gconf_schema_remove eog %postun update-desktop-database -q @@ -164,6 +152,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_datadir}/gtk-doc/html/eog %changelog +* Tue Apr 27 2010 Matthias Clasen 2.30.1-1 +- Update to 2.30.1 + * Mon Mar 29 2010 Matthias Clasen 2.30.0-1 - Update to 2.30.0 diff --git a/sources b/sources index ea82641..1d0a018 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0cd409d2b5de8f4981a89f4740febf47 eog-2.30.0.tar.bz2 +b9ea1f6e28c3f1890792d847f23ee82f eog-2.30.1.tar.bz2