rpms/eog/F-13 eog.spec,1.162,1.163 sources,1.94,1.95

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	eog.spec sources 
Log Message:
2.30.0



Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/F-13/eog.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- eog.spec	23 Feb 2010 03:55:47 -0000	1.162
+++ eog.spec	29 Mar 2010 23:47:46 -0000	1.163
@@ -11,10 +11,11 @@
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.29.91
+Version: 2.30.0
 Release: 1%{?dist}
 URL: http://projects.gnome.org/eog/
-Source: http://download.gnome.org/sources/eog/2.29/%{name}-%{version}.tar.bz2
+#VCS: git:git://git.gnome.org/eog
+Source: http://download.gnome.org/sources/eog/2.30/%{name}-%{version}.tar.bz2
 # The GFDL has an "or later version" clause embedded inside the license.
 # There is no need to add the + here.
 License: GPLv2+ and GFDL
@@ -39,13 +40,10 @@ BuildRequires: libXt-devel
 BuildRequires: libxml2-devel
 
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
-Requires(post): scrollkeeper
 Requires(post): GConf2
 Requires(pre): GConf2
 Requires(preun): GConf2
-
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
-Requires(postun): scrollkeeper
 
 %description
 The Eye of GNOME image viewer (eog) is the official image viewer for the
@@ -90,7 +88,7 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INST
 
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --remove-category Application				    \
+  --remove-category Application                             \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 %find_lang %{name} --with-gnome
@@ -122,13 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database -q
-scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/eog.schemas > /dev/null || :
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
+touch %{_datadir}/icons/hicolor >&/dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -144,12 +138,14 @@ fi
 
 %postun
 update-desktop-database -q
-scrollkeeper-update -q
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_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
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README
@@ -168,6 +164,9 @@ fi
 %{_datadir}/gtk-doc/html/eog
 
 %changelog
+* Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> 2.30.0-1
+- Update to 2.30.0
+
 * Mon Feb 22 2010 Matthias Clasen <mclasen at redhat.com> 2.29.91-1
 - Update to 2.29.91
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/F-13/sources,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- sources	23 Feb 2010 03:55:47 -0000	1.94
+++ sources	29 Mar 2010 23:47:46 -0000	1.95
@@ -1 +1 @@
-ce38a86f6863297677a9ca7a6f302e15  eog-2.29.91.tar.bz2
+0cd409d2b5de8f4981a89f4740febf47  eog-2.30.0.tar.bz2